Regenerate generated code.

bzbarsky-apple · bzbarsky-apple · commit 8624c36aee06 · 2024-09-23T15:48:20.000-04:00
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -3464,6 +3464,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -2301,6 +2301,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -2728,6 +2728,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
@@ -2304,6 +2304,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
@@ -2401,6 +2401,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -4098,6 +4098,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
@@ -4749,6 +4750,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -4055,6 +4055,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
@@ -4706,6 +4707,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -2939,6 +2939,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -6263,6 +6263,7 @@ cluster DoorLock = 257 {
     nullable fabric_idx creatorFabricIndex = 2;
     nullable fabric_idx lastModifiedFabricIndex = 3;
     nullable int16u nextCredentialIndex = 4;
+    optional nullable octet_string credentialData = 5;
   }
 
   request struct ClearCredentialRequest {
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -35125,6 +35125,8 @@ public void onResponse(StructType invokeStructValue) {
           @Nullable Integer lastModifiedFabricIndex = null;
           final long nextCredentialIndexFieldID = 4L;
           @Nullable Integer nextCredentialIndex = null;
+          final long credentialDataFieldID = 5L;
+          @Nullable Optional<byte[]> credentialData = null;
           for (StructElement element: invokeStructValue.value()) {
             if (element.contextTagNum() == credentialExistsFieldID) {
               if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {
@@ -35151,9 +35153,14 @@ public void onResponse(StructType invokeStructValue) {
                 UIntType castingValue = element.value(UIntType.class);
                 nextCredentialIndex = castingValue.value(Integer.class);
               }
+            } else if (element.contextTagNum() == credentialDataFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
+                ByteArrayType castingValue = element.value(ByteArrayType.class);
+                credentialData = Optional.of(castingValue.value(byte[].class));
+              }
             }
           }
-          callback.onSuccess(credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex, nextCredentialIndex);
+          callback.onSuccess(credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex, nextCredentialIndex, credentialData);
         }}, commandId, commandArgs, timedInvokeTimeoutMs);
     }
 
@@ -35254,7 +35261,7 @@ public interface SetCredentialResponseCallback extends BaseClusterCallback {
     }
 
     public interface GetCredentialStatusResponseCallback extends BaseClusterCallback {
-      void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex);
+      void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex, @Nullable Optional<byte[]> credentialData);
     }
 
     public interface LockStateAttributeCallback extends BaseAttributeCallback {
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
@@ -12382,7 +12382,7 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex) {
+    public void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex, @Nullable Optional<byte[]> credentialData) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
 
       CommandResponseInfo credentialExistsResponseValue = new CommandResponseInfo("credentialExists", "Boolean");
@@ -12395,6 +12395,8 @@ public void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nu
       responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
       CommandResponseInfo nextCredentialIndexResponseValue = new CommandResponseInfo("nextCredentialIndex", "Integer");
       responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
+      CommandResponseInfo credentialDataResponseValue = new CommandResponseInfo("credentialData", "Optional<byte[]>");
+      responseValues.put(credentialDataResponseValue, credentialData);
       callback.onSuccess(responseValues);
     }
 
diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt
@@ -99,6 +99,7 @@ class DoorLockCluster(private val controller: MatterController, private val endp
     val creatorFabricIndex: UByte?,
     val lastModifiedFabricIndex: UByte?,
     val nextCredentialIndex: UShort?,
+    val credentialData: ByteArray?,
   )
 
   class LockStateAttribute(val value: UByte?)
@@ -1320,6 +1321,9 @@ class DoorLockCluster(private val controller: MatterController, private val endp
     val TAG_NEXT_CREDENTIAL_INDEX: Int = 4
     var nextCredentialIndex_decoded: UShort? = null
 
+    val TAG_CREDENTIAL_DATA: Int = 5
+    var credentialData_decoded: ByteArray? = null
+
     while (!tlvReader.isEndOfContainer()) {
       val tag = tlvReader.peekElement().tag
 
@@ -1385,6 +1389,25 @@ class DoorLockCluster(private val controller: MatterController, private val endp
               null
             }
           }
+      }
+
+      if (tag == ContextSpecificTag(TAG_CREDENTIAL_DATA)) {
+        credentialData_decoded =
+          if (tlvReader.isNull()) {
+            tlvReader.getNull(tag)
+            null
+          } else {
+            if (!tlvReader.isNull()) {
+              if (tlvReader.isNextTag(tag)) {
+                tlvReader.getByteArray(tag)
+              } else {
+                null
+              }
+            } else {
+              tlvReader.getNull(tag)
+              null
+            }
+          }
       } else {
         tlvReader.skipElement()
       }
@@ -1402,6 +1425,7 @@ class DoorLockCluster(private val controller: MatterController, private val endp
       creatorFabricIndex_decoded,
       lastModifiedFabricIndex_decoded,
       nextCredentialIndex_decoded,
+      credentialData_decoded,
     )
   }
 
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp

Original file line number	Diff line number	Diff line change
`@@ -3464,6 +3464,7 @@ cluster DoorLock = 257 {`
`3464`	`3464`	`nullable fabric_idx creatorFabricIndex = 2;`
`3465`	`3465`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`3466`	`3466`	`nullable int16u nextCredentialIndex = 4;`
	`3467`	`+ optional nullable octet_string credentialData = 5;`
`3467`	`3468`	`}`
`3468`	`3469`
`3469`	`3470`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -2301,6 +2301,7 @@ cluster DoorLock = 257 {`
`2301`	`2301`	`nullable fabric_idx creatorFabricIndex = 2;`
`2302`	`2302`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`2303`	`2303`	`nullable int16u nextCredentialIndex = 4;`
	`2304`	`+ optional nullable octet_string credentialData = 5;`
`2304`	`2305`	`}`
`2305`	`2306`
`2306`	`2307`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -2728,6 +2728,7 @@ cluster DoorLock = 257 {`
`2728`	`2728`	`nullable fabric_idx creatorFabricIndex = 2;`
`2729`	`2729`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`2730`	`2730`	`nullable int16u nextCredentialIndex = 4;`
	`2731`	`+ optional nullable octet_string credentialData = 5;`
`2731`	`2732`	`}`
`2732`	`2733`
`2733`	`2734`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -2304,6 +2304,7 @@ cluster DoorLock = 257 {`
`2304`	`2304`	`nullable fabric_idx creatorFabricIndex = 2;`
`2305`	`2305`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`2306`	`2306`	`nullable int16u nextCredentialIndex = 4;`
	`2307`	`+ optional nullable octet_string credentialData = 5;`
`2307`	`2308`	`}`
`2308`	`2309`
`2309`	`2310`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -2401,6 +2401,7 @@ cluster DoorLock = 257 {`
`2401`	`2401`	`nullable fabric_idx creatorFabricIndex = 2;`
`2402`	`2402`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`2403`	`2403`	`nullable int16u nextCredentialIndex = 4;`
	`2404`	`+ optional nullable octet_string credentialData = 5;`
`2404`	`2405`	`}`
`2405`	`2406`
`2406`	`2407`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -4098,6 +4098,7 @@ cluster DoorLock = 257 {`
`4098`	`4098`	`nullable fabric_idx creatorFabricIndex = 2;`
`4099`	`4099`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`4100`	`4100`	`nullable int16u nextCredentialIndex = 4;`
	`4101`	`+ optional nullable octet_string credentialData = 5;`
`4101`	`4102`	`}`
`4102`	`4103`
`4103`	`4104`	`request struct ClearCredentialRequest {`
`@@ -4749,6 +4750,7 @@ cluster DoorLock = 257 {`
`4749`	`4750`	`nullable fabric_idx creatorFabricIndex = 2;`
`4750`	`4751`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`4751`	`4752`	`nullable int16u nextCredentialIndex = 4;`
	`4753`	`+ optional nullable octet_string credentialData = 5;`
`4752`	`4754`	`}`
`4753`	`4755`
`4754`	`4756`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -4055,6 +4055,7 @@ cluster DoorLock = 257 {`
`4055`	`4055`	`nullable fabric_idx creatorFabricIndex = 2;`
`4056`	`4056`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`4057`	`4057`	`nullable int16u nextCredentialIndex = 4;`
	`4058`	`+ optional nullable octet_string credentialData = 5;`
`4058`	`4059`	`}`
`4059`	`4060`
`4060`	`4061`	`request struct ClearCredentialRequest {`
`@@ -4706,6 +4707,7 @@ cluster DoorLock = 257 {`
`4706`	`4707`	`nullable fabric_idx creatorFabricIndex = 2;`
`4707`	`4708`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`4708`	`4709`	`nullable int16u nextCredentialIndex = 4;`
	`4710`	`+ optional nullable octet_string credentialData = 5;`
`4709`	`4711`	`}`
`4710`	`4712`
`4711`	`4713`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -2939,6 +2939,7 @@ cluster DoorLock = 257 {`
`2939`	`2939`	`nullable fabric_idx creatorFabricIndex = 2;`
`2940`	`2940`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`2941`	`2941`	`nullable int16u nextCredentialIndex = 4;`
	`2942`	`+ optional nullable octet_string credentialData = 5;`
`2942`	`2943`	`}`
`2943`	`2944`
`2944`	`2945`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -6263,6 +6263,7 @@ cluster DoorLock = 257 {`
`6263`	`6263`	`nullable fabric_idx creatorFabricIndex = 2;`
`6264`	`6264`	`nullable fabric_idx lastModifiedFabricIndex = 3;`
`6265`	`6265`	`nullable int16u nextCredentialIndex = 4;`
	`6266`	`+ optional nullable octet_string credentialData = 5;`
`6266`	`6267`	`}`
`6267`	`6268`
`6268`	`6269`	`request struct ClearCredentialRequest {`
Original file line number	Diff line number	Diff line change
`@@ -35125,6 +35125,8 @@ public void onResponse(StructType invokeStructValue) {`
`35125`	`35125`	`@Nullable Integer lastModifiedFabricIndex = null;`
`35126`	`35126`	`final long nextCredentialIndexFieldID = 4L;`
`35127`	`35127`	`@Nullable Integer nextCredentialIndex = null;`
	`35128`	`+ final long credentialDataFieldID = 5L;`
	`35129`	`+ @Nullable Optional<byte[]> credentialData = null;`
`35128`	`35130`	`for (StructElement element: invokeStructValue.value()) {`
`35129`	`35131`	`if (element.contextTagNum() == credentialExistsFieldID) {`
`35130`	`35132`	`if (element.value(BaseTLVType.class).type() == TLVType.Boolean) {`
`@@ -35151,9 +35153,14 @@ public void onResponse(StructType invokeStructValue) {`
`35151`	`35153`	`UIntType castingValue = element.value(UIntType.class);`
`35152`	`35154`	`nextCredentialIndex = castingValue.value(Integer.class);`
`35153`	`35155`	`}`
	`35156`	`+ } else if (element.contextTagNum() == credentialDataFieldID) {`
	`35157`	`+ if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {`
	`35158`	`+ ByteArrayType castingValue = element.value(ByteArrayType.class);`
	`35159`	`+ credentialData = Optional.of(castingValue.value(byte[].class));`
	`35160`	`+ }`
`35154`	`35161`	`}`
`35155`	`35162`	`}`
`35156`		`- callback.onSuccess(credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex, nextCredentialIndex);`
	`35163`	`+ callback.onSuccess(credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex, nextCredentialIndex, credentialData);`
`35157`	`35164`	`}}, commandId, commandArgs, timedInvokeTimeoutMs);`
`35158`	`35165`	`}`
`35159`	`35166`
`@@ -35254,7 +35261,7 @@ public interface SetCredentialResponseCallback extends BaseClusterCallback {`
`35254`	`35261`	`}`
`35255`	`35262`
`35256`	`35263`	`public interface GetCredentialStatusResponseCallback extends BaseClusterCallback {`
`35257`		`- void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex);`
	`35264`	`+ void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex, @Nullable Optional<byte[]> credentialData);`
`35258`	`35265`	`}`
`35259`	`35266`
`35260`	`35267`	`public interface LockStateAttributeCallback extends BaseAttributeCallback {`