Updated after regen_all

Author: jamesharrow

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -4233,7 +4233,7 @@ provisional cluster DeviceEnergyManagement = 152 {
   readonly attribute ESAStateEnum ESAState = 2;
   readonly attribute power_mw absMinPower = 3;
   readonly attribute power_mw absMaxPower = 4;
-  readonly attribute optional nullable PowerAdjustCapabilityStruct powerAdjustmentCapability[] = 5;
+  readonly attribute optional nullable PowerAdjustCapabilityStruct powerAdjustmentCapability = 5;
   readonly attribute optional nullable ForecastStruct forecast = 6;
   readonly attribute optional OptOutStateEnum optOutState = 7;
   readonly attribute command_id generatedCommandList[] = 65528;

examples/energy-management-app/energy-management-common/energy-management-app.matter

@@ -1594,7 +1594,7 @@ provisional cluster DeviceEnergyManagement = 152 {
   readonly attribute ESAStateEnum ESAState = 2;
   readonly attribute power_mw absMinPower = 3;
   readonly attribute power_mw absMaxPower = 4;
-  readonly attribute optional nullable PowerAdjustCapabilityStruct powerAdjustmentCapability[] = 5;
+  readonly attribute optional nullable PowerAdjustCapabilityStruct powerAdjustmentCapability = 5;
   readonly attribute optional nullable ForecastStruct forecast = 6;
   readonly attribute optional OptOutStateEnum optOutState = 7;
   readonly attribute command_id generatedCommandList[] = 65528;

src/controller/data_model/controller-clusters.matter

@@ -4758,7 +4758,7 @@ provisional cluster DeviceEnergyManagement = 152 {
   readonly attribute ESAStateEnum ESAState = 2;
   readonly attribute power_mw absMinPower = 3;
   readonly attribute power_mw absMaxPower = 4;
-  readonly attribute optional nullable PowerAdjustCapabilityStruct powerAdjustmentCapability[] = 5;
+  readonly attribute optional nullable PowerAdjustCapabilityStruct powerAdjustmentCapability = 5;
   readonly attribute optional nullable ForecastStruct forecast = 6;
   readonly attribute optional OptOutStateEnum optOutState = 7;
   readonly attribute command_id generatedCommandList[] = 65528;

src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

@@ -31267,7 +31267,7 @@ public void onResponse(StructType invokeStructValue) {
     }
 
     public interface PowerAdjustmentCapabilityAttributeCallback extends BaseAttributeCallback {
-      void onSuccess(@Nullable List<ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct> value);
+      void onSuccess(@Nullable ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct value);
     }
 
     public interface ForecastAttributeCallback extends BaseAttributeCallback {
@@ -31427,7 +31427,7 @@ public void readPowerAdjustmentCapabilityAttribute(
       readAttribute(new ReportCallbackImpl(callback, path) {
           @Override
           public void onSuccess(byte[] tlv) {
-            @Nullable List<ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            @Nullable ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
             callback.onSuccess(value);
           }
         }, POWER_ADJUSTMENT_CAPABILITY_ATTRIBUTE_ID, true);
@@ -31440,7 +31440,7 @@ public void subscribePowerAdjustmentCapabilityAttribute(
       subscribeAttribute(new ReportCallbackImpl(callback, path) {
           @Override
           public void onSuccess(byte[] tlv) {
-            @Nullable List<ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            @Nullable ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
             callback.onSuccess(value);
           }
         }, POWER_ADJUSTMENT_CAPABILITY_ATTRIBUTE_ID, minInterval, maxInterval);

src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java

@@ -10882,10 +10882,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable List<ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct> valueList) {
+    public void onSuccess(@Nullable ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.DeviceEnergyManagementClusterPowerAdjustCapabilityStruct");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 

src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java

@@ -9619,17 +9619,6 @@ private static Map<String, InteractionInfo> readDeviceEnergyManagementInteractio
           readDeviceEnergyManagementAbsMaxPowerCommandParams
         );
         result.put("readAbsMaxPowerAttribute", readDeviceEnergyManagementAbsMaxPowerAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readDeviceEnergyManagementPowerAdjustmentCapabilityCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readDeviceEnergyManagementPowerAdjustmentCapabilityAttributeInteractionInfo = new InteractionInfo(
-          (cluster, callback, commandArguments) -> {
-            ((ChipClusters.DeviceEnergyManagementCluster) cluster).readPowerAdjustmentCapabilityAttribute(
-              (ChipClusters.DeviceEnergyManagementCluster.PowerAdjustmentCapabilityAttributeCallback) callback
-            );
-          },
-          () -> new ClusterInfoMapping.DelegatedDeviceEnergyManagementClusterPowerAdjustmentCapabilityAttributeCallback(),
-          readDeviceEnergyManagementPowerAdjustmentCapabilityCommandParams
-        );
-        result.put("readPowerAdjustmentCapabilityAttribute", readDeviceEnergyManagementPowerAdjustmentCapabilityAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readDeviceEnergyManagementOptOutStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readDeviceEnergyManagementOptOutStateAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {

src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt

@@ -47,11 +47,11 @@ class DeviceEnergyManagementCluster(
   private val endpointId: UShort
 ) {
   class PowerAdjustmentCapabilityAttribute(
-    val value: List<DeviceEnergyManagementClusterPowerAdjustCapabilityStruct>?
+    val value: DeviceEnergyManagementClusterPowerAdjustCapabilityStruct?
   )
 
   sealed class PowerAdjustmentCapabilityAttributeSubscriptionState {
-    data class Success(val value: List<DeviceEnergyManagementClusterPowerAdjustCapabilityStruct>?) :
+    data class Success(val value: DeviceEnergyManagementClusterPowerAdjustCapabilityStruct?) :
       PowerAdjustmentCapabilityAttributeSubscriptionState()
 
     data class Error(val exception: Exception) :
@@ -750,21 +750,10 @@ class DeviceEnergyManagementCluster(
 
     // Decode the TLV data into the appropriate type
     val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<DeviceEnergyManagementClusterPowerAdjustCapabilityStruct>? =
+    val decodedValue: DeviceEnergyManagementClusterPowerAdjustCapabilityStruct? =
       if (!tlvReader.isNull()) {
         if (tlvReader.isNextTag(AnonymousTag)) {
-          buildList<DeviceEnergyManagementClusterPowerAdjustCapabilityStruct> {
-            tlvReader.enterArray(AnonymousTag)
-            while (!tlvReader.isEndOfContainer()) {
-              add(
-                DeviceEnergyManagementClusterPowerAdjustCapabilityStruct.fromTlv(
-                  AnonymousTag,
-                  tlvReader
-                )
-              )
-            }
-            tlvReader.exitContainer()
-          }
+          DeviceEnergyManagementClusterPowerAdjustCapabilityStruct.fromTlv(AnonymousTag, tlvReader)
         } else {
           null
         }
@@ -817,21 +806,13 @@ class DeviceEnergyManagementCluster(
 
           // Decode the TLV data into the appropriate type
           val tlvReader = TlvReader(attributeData.data)
-          val decodedValue: List<DeviceEnergyManagementClusterPowerAdjustCapabilityStruct>? =
+          val decodedValue: DeviceEnergyManagementClusterPowerAdjustCapabilityStruct? =
             if (!tlvReader.isNull()) {
               if (tlvReader.isNextTag(AnonymousTag)) {
-                buildList<DeviceEnergyManagementClusterPowerAdjustCapabilityStruct> {
-                  tlvReader.enterArray(AnonymousTag)
-                  while (!tlvReader.isEndOfContainer()) {
-                    add(
-                      DeviceEnergyManagementClusterPowerAdjustCapabilityStruct.fromTlv(
-                        AnonymousTag,
-                        tlvReader
-                      )
-                    )
-                  }
-                  tlvReader.exitContainer()
-                }
+                DeviceEnergyManagementClusterPowerAdjustCapabilityStruct.fromTlv(
+                  AnonymousTag,
+                  tlvReader
+                )
               } else {
                 null
               }