Generated using ./scripts/tools/zap_regen_all.py

Author: gmarcosb

src/controller/data_model/controller-clusters.matter

@@ -10570,7 +10570,7 @@ provisional cluster TlsClientManagement = 2050 {
     octet_string hostname = 1;
     int16u port = 2;
     int16u caid = 3;
-    optional nullable int16u ccdid = 4;
+    nullable int16u ccdid = 4;
     TLSEndpointStatusEnum status = 5;
   }
 
@@ -10584,8 +10584,7 @@ provisional cluster TlsClientManagement = 2050 {
 
   readonly attribute int8u maxProvisioned = 0;
   readonly attribute int8u currentProvisioned = 1;
-  readonly attribute int8u maxInUse = 2;
-  readonly attribute int8u currentInUse = 3;
+  readonly attribute int8u currentInUse = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -10597,16 +10596,16 @@ provisional cluster TlsClientManagement = 2050 {
     octet_string hostname = 0;
     int16u port = 1;
     int16u caid = 2;
-    optional nullable int16u ccdid = 3;
-    optional nullable int16u endpointID = 4;
+    nullable int16u ccdid = 3;
+    nullable int16u endpointID = 4;
   }
 
   response struct ProvisionEndpointResponse = 1 {
     int16u endpointID = 0;
   }
 
   request struct FindEndpointRequest {
-    optional nullable int16u endpointID = 0;
+    nullable int16u endpointID = 0;
   }
 
   response struct FindEndpointResponse = 3 {
@@ -10619,7 +10618,7 @@ provisional cluster TlsClientManagement = 2050 {
 
   /** This command SHALL provision a TLS Endpoint for the provided HostName / Port combination. */
   command access(invoke: administer) ProvisionEndpoint(ProvisionEndpointRequest): ProvisionEndpointResponse = 0;
-  /** This command SHALL return the TLS Endpoint details for the passed in EndpointID. */
+  /** This command SHALL return the TLS Endpoint details for the passed in EndpointID, or all provisioned endpoints if nu */
   command FindEndpoint(FindEndpointRequest): FindEndpointResponse = 2;
   /** This command SHALL be generated to request the Node terminates the TLS Connection. */
   command access(invoke: administer) RemoveEndpoint(RemoveEndpointRequest): DefaultSuccess = 4;

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

@@ -64933,8 +64933,7 @@ public static class TlsClientManagementCluster extends BaseChipCluster {
 
     private static final long MAX_PROVISIONED_ATTRIBUTE_ID = 0L;
     private static final long CURRENT_PROVISIONED_ATTRIBUTE_ID = 1L;
-    private static final long MAX_IN_USE_ATTRIBUTE_ID = 2L;
-    private static final long CURRENT_IN_USE_ATTRIBUTE_ID = 3L;
+    private static final long CURRENT_IN_USE_ATTRIBUTE_ID = 2L;
     private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
     private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
     private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
@@ -64952,11 +64951,11 @@ public long initWithDevice(long devicePtr, int endpointId) {
       return 0L;
     }
 
-    public void provisionEndpoint(ProvisionEndpointResponseCallback callback, byte[] hostname, Integer port, Integer caid, @Nullable Optional<Integer> ccdid, @Nullable Optional<Integer> endpointID) {
+    public void provisionEndpoint(ProvisionEndpointResponseCallback callback, byte[] hostname, Integer port, Integer caid, @Nullable Integer ccdid, @Nullable Integer endpointID) {
       provisionEndpoint(callback, hostname, port, caid, ccdid, endpointID, 0);
     }
 
-    public void provisionEndpoint(ProvisionEndpointResponseCallback callback, byte[] hostname, Integer port, Integer caid, @Nullable Optional<Integer> ccdid, @Nullable Optional<Integer> endpointID, int timedInvokeTimeoutMs) {
+    public void provisionEndpoint(ProvisionEndpointResponseCallback callback, byte[] hostname, Integer port, Integer caid, @Nullable Integer ccdid, @Nullable Integer endpointID, int timedInvokeTimeoutMs) {
       final long commandId = 0L;
 
       ArrayList<StructElement> elements = new ArrayList<>();
@@ -64973,11 +64972,11 @@ public void provisionEndpoint(ProvisionEndpointResponseCallback callback, byte[]
       elements.add(new StructElement(caidFieldID, caidtlvValue));
 
       final long ccdidFieldID = 3L;
-      BaseTLVType ccdidtlvValue = ccdid != null ? ccdid.<BaseTLVType>map((nonOptionalccdid) -> new UIntType(nonOptionalccdid)).orElse(new EmptyType()) : new NullType();
+      BaseTLVType ccdidtlvValue = ccdid != null ? new UIntType(ccdid) : new NullType();
       elements.add(new StructElement(ccdidFieldID, ccdidtlvValue));
 
       final long endpointIDFieldID = 4L;
-      BaseTLVType endpointIDtlvValue = endpointID != null ? endpointID.<BaseTLVType>map((nonOptionalendpointID) -> new UIntType(nonOptionalendpointID)).orElse(new EmptyType()) : new NullType();
+      BaseTLVType endpointIDtlvValue = endpointID != null ? new UIntType(endpointID) : new NullType();
       elements.add(new StructElement(endpointIDFieldID, endpointIDtlvValue));
 
       StructType commandArgs = new StructType(elements);
@@ -64998,16 +64997,16 @@ public void onResponse(StructType invokeStructValue) {
         }}, commandId, commandArgs, timedInvokeTimeoutMs);
     }
 
-    public void findEndpoint(FindEndpointResponseCallback callback, @Nullable Optional<Integer> endpointID) {
+    public void findEndpoint(FindEndpointResponseCallback callback, @Nullable Integer endpointID) {
       findEndpoint(callback, endpointID, 0);
     }
 
-    public void findEndpoint(FindEndpointResponseCallback callback, @Nullable Optional<Integer> endpointID, int timedInvokeTimeoutMs) {
+    public void findEndpoint(FindEndpointResponseCallback callback, @Nullable Integer endpointID, int timedInvokeTimeoutMs) {
       final long commandId = 2L;
 
       ArrayList<StructElement> elements = new ArrayList<>();
       final long endpointIDFieldID = 0L;
-      BaseTLVType endpointIDtlvValue = endpointID != null ? endpointID.<BaseTLVType>map((nonOptionalendpointID) -> new UIntType(nonOptionalendpointID)).orElse(new EmptyType()) : new NullType();
+      BaseTLVType endpointIDtlvValue = endpointID != null ? new UIntType(endpointID) : new NullType();
       elements.add(new StructElement(endpointIDFieldID, endpointIDtlvValue));
 
       StructType commandArgs = new StructType(elements);
@@ -65124,32 +65123,6 @@ public void onSuccess(byte[] tlv) {
         }, CURRENT_PROVISIONED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxInUseAttribute(
-        IntegerAttributeCallback callback) {
-      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_IN_USE_ATTRIBUTE_ID);
-
-      readAttribute(new ReportCallbackImpl(callback, path) {
-          @Override
-          public void onSuccess(byte[] tlv) {
-            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
-            callback.onSuccess(value);
-          }
-        }, MAX_IN_USE_ATTRIBUTE_ID, true);
-    }
-
-    public void subscribeMaxInUseAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_IN_USE_ATTRIBUTE_ID);
-
-      subscribeAttribute(new ReportCallbackImpl(callback, path) {
-          @Override
-          public void onSuccess(byte[] tlv) {
-            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
-            callback.onSuccess(value);
-          }
-        }, MAX_IN_USE_ATTRIBUTE_ID, minInterval, maxInterval);
-    }
-
     public void readCurrentInUseAttribute(
         IntegerAttributeCallback callback) {
       ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_IN_USE_ATTRIBUTE_ID);

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

@@ -16109,7 +16109,7 @@ public static class TlsClientManagementClusterTLSEndpointStruct {
   public byte[] hostname;
   public Integer port;
   public Integer caid;
-  public @Nullable Optional<Integer> ccdid;
+  public @Nullable Integer ccdid;
   public Integer status;
   private static final long ENDPOINT_ID_ID = 0L;
   private static final long HOSTNAME_ID = 1L;
@@ -16123,7 +16123,7 @@ public TlsClientManagementClusterTLSEndpointStruct(
     byte[] hostname,
     Integer port,
     Integer caid,
-    @Nullable Optional<Integer> ccdid,
+    @Nullable Integer ccdid,
     Integer status
   ) {
     this.endpointID = endpointID;
@@ -16140,7 +16140,7 @@ public StructType encodeTlv() {
     values.add(new StructElement(HOSTNAME_ID, new ByteArrayType(hostname)));
     values.add(new StructElement(PORT_ID, new UIntType(port)));
     values.add(new StructElement(CAID_ID, new UIntType(caid)));
-    values.add(new StructElement(CCDID_ID, ccdid != null ? ccdid.<BaseTLVType>map((nonOptionalccdid) -> new UIntType(nonOptionalccdid)).orElse(new EmptyType()) : new NullType()));
+    values.add(new StructElement(CCDID_ID, ccdid != null ? new UIntType(ccdid) : new NullType()));
     values.add(new StructElement(STATUS_ID, new UIntType(status)));
 
     return new StructType(values);
@@ -16154,7 +16154,7 @@ public static TlsClientManagementClusterTLSEndpointStruct decodeTlv(BaseTLVType
     byte[] hostname = null;
     Integer port = null;
     Integer caid = null;
-    @Nullable Optional<Integer> ccdid = null;
+    @Nullable Integer ccdid = null;
     Integer status = null;
     for (StructElement element: ((StructType)tlvValue).value()) {
       if (element.contextTagNum() == ENDPOINT_ID_ID) {
@@ -16180,7 +16180,7 @@ public static TlsClientManagementClusterTLSEndpointStruct decodeTlv(BaseTLVType
       } else if (element.contextTagNum() == CCDID_ID) {
         if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
           UIntType castingValue = element.value(UIntType.class);
-          ccdid = Optional.of(castingValue.value(Integer.class));
+          ccdid = castingValue.value(Integer.class);
         }
       } else if (element.contextTagNum() == STATUS_ID) {
         if (element.value(BaseTLVType.class).type() == TLVType.UInt) {

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

@@ -18815,8 +18815,7 @@ public long getID() {
         public enum Attribute {
             MaxProvisioned(0L),
             CurrentProvisioned(1L),
-            MaxInUse(2L),
-            CurrentInUse(3L),
+            CurrentInUse(2L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),

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

@@ -31408,10 +31408,10 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     CommandParameterInfo tlsClientManagementprovisionEndpointcaidCommandParameterInfo = new CommandParameterInfo("caid", Integer.class, Integer.class);
     tlsClientManagementprovisionEndpointCommandParams.put("caid",tlsClientManagementprovisionEndpointcaidCommandParameterInfo);
 
-    CommandParameterInfo tlsClientManagementprovisionEndpointccdidCommandParameterInfo = new CommandParameterInfo("ccdid", Optional.class, Integer.class);
+    CommandParameterInfo tlsClientManagementprovisionEndpointccdidCommandParameterInfo = new CommandParameterInfo("ccdid", Integer.class, Integer.class);
     tlsClientManagementprovisionEndpointCommandParams.put("ccdid",tlsClientManagementprovisionEndpointccdidCommandParameterInfo);
 
-    CommandParameterInfo tlsClientManagementprovisionEndpointendpointIDCommandParameterInfo = new CommandParameterInfo("endpointID", Optional.class, Integer.class);
+    CommandParameterInfo tlsClientManagementprovisionEndpointendpointIDCommandParameterInfo = new CommandParameterInfo("endpointID", Integer.class, Integer.class);
     tlsClientManagementprovisionEndpointCommandParams.put("endpointID",tlsClientManagementprovisionEndpointendpointIDCommandParameterInfo);
     InteractionInfo tlsClientManagementprovisionEndpointInteractionInfo = new InteractionInfo(
       (cluster, callback, commandArguments) -> {
@@ -31426,10 +31426,10 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
            , (Integer)
              commandArguments.get("caid")
 
-           , (Optional<Integer>)
+           , (Integer)
              commandArguments.get("ccdid")
 
-           , (Optional<Integer>)
+           , (Integer)
              commandArguments.get("endpointID")
 
             );
@@ -31441,13 +31441,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
 
     Map<String, CommandParameterInfo> tlsClientManagementfindEndpointCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
 
-    CommandParameterInfo tlsClientManagementfindEndpointendpointIDCommandParameterInfo = new CommandParameterInfo("endpointID", Optional.class, Integer.class);
+    CommandParameterInfo tlsClientManagementfindEndpointendpointIDCommandParameterInfo = new CommandParameterInfo("endpointID", Integer.class, Integer.class);
     tlsClientManagementfindEndpointCommandParams.put("endpointID",tlsClientManagementfindEndpointendpointIDCommandParameterInfo);
     InteractionInfo tlsClientManagementfindEndpointInteractionInfo = new InteractionInfo(
       (cluster, callback, commandArguments) -> {
         ((ChipClusters.TlsClientManagementCluster) cluster)
           .findEndpoint((ChipClusters.TlsClientManagementCluster.FindEndpointResponseCallback) callback
-           , (Optional<Integer>)
+           , (Integer)
              commandArguments.get("endpointID")
 
             );

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

@@ -19597,17 +19597,6 @@ private static Map<String, InteractionInfo> readTlsClientManagementInteractionIn
           readTlsClientManagementCurrentProvisionedCommandParams
         );
         result.put("readCurrentProvisionedAttribute", readTlsClientManagementCurrentProvisionedAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readTlsClientManagementMaxInUseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readTlsClientManagementMaxInUseAttributeInteractionInfo = new InteractionInfo(
-          (cluster, callback, commandArguments) -> {
-            ((ChipClusters.TlsClientManagementCluster) cluster).readMaxInUseAttribute(
-              (ChipClusters.IntegerAttributeCallback) callback
-            );
-          },
-          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
-          readTlsClientManagementMaxInUseCommandParams
-        );
-        result.put("readMaxInUseAttribute", readTlsClientManagementMaxInUseAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readTlsClientManagementCurrentInUseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readTlsClientManagementCurrentInUseAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {

src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TlsClientManagementClusterTLSEndpointStruct.kt

@@ -17,7 +17,6 @@
 package chip.devicecontroller.cluster.structs
 
 import chip.devicecontroller.cluster.*
-import java.util.Optional
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -28,7 +27,7 @@ class TlsClientManagementClusterTLSEndpointStruct(
   val hostname: ByteArray,
   val port: UInt,
   val caid: UInt,
-  val ccdid: Optional<UInt>?,
+  val ccdid: UInt?,
   val status: UInt,
 ) {
   override fun toString(): String = buildString {
@@ -50,10 +49,7 @@ class TlsClientManagementClusterTLSEndpointStruct(
       put(ContextSpecificTag(TAG_PORT), port)
       put(ContextSpecificTag(TAG_CAID), caid)
       if (ccdid != null) {
-        if (ccdid.isPresent) {
-          val optccdid = ccdid.get()
-          put(ContextSpecificTag(TAG_CCDID), optccdid)
-        }
+        put(ContextSpecificTag(TAG_CCDID), ccdid)
       } else {
         putNull(ContextSpecificTag(TAG_CCDID))
       }
@@ -78,11 +74,7 @@ class TlsClientManagementClusterTLSEndpointStruct(
       val caid = tlvReader.getUInt(ContextSpecificTag(TAG_CAID))
       val ccdid =
         if (!tlvReader.isNull()) {
-          if (tlvReader.isNextTag(ContextSpecificTag(TAG_CCDID))) {
-            Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_CCDID)))
-          } else {
-            Optional.empty()
-          }
+          tlvReader.getUInt(ContextSpecificTag(TAG_CCDID))
         } else {
           tlvReader.getNull(ContextSpecificTag(TAG_CCDID))
           null

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

@@ -392,89 +392,8 @@ class TlsClientManagementCluster(
     }
   }
 
-  suspend fun readMaxInUseAttribute(): UByte {
-    val ATTRIBUTE_ID: UInt = 2u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Maxinuse attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte = tlvReader.getUByte(AnonymousTag)
-
-    return decodedValue
-  }
-
-  suspend fun subscribeMaxInUseAttribute(
-    minInterval: Int,
-    maxInterval: Int,
-  ): Flow<UByteSubscriptionState> {
-    val ATTRIBUTE_ID: UInt = 2u
-    val attributePaths =
-      listOf(
-        AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-      )
-
-    val subscribeRequest: SubscribeRequest =
-      SubscribeRequest(
-        eventPaths = emptyList(),
-        attributePaths = attributePaths,
-        minInterval = Duration.ofSeconds(minInterval.toLong()),
-        maxInterval = Duration.ofSeconds(maxInterval.toLong()),
-      )
-
-    return controller.subscribe(subscribeRequest).transform { subscriptionState ->
-      when (subscriptionState) {
-        is SubscriptionState.SubscriptionErrorNotification -> {
-          emit(
-            UByteSubscriptionState.Error(
-              Exception(
-                "Subscription terminated with error code: ${subscriptionState.terminationCause}"
-              )
-            )
-          )
-        }
-        is SubscriptionState.NodeStateUpdate -> {
-          val attributeData =
-            subscriptionState.updateState.successes
-              .filterIsInstance<ReadData.Attribute>()
-              .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
-
-          requireNotNull(attributeData) { "Maxinuse attribute not found in Node State update" }
-
-          // Decode the TLV data into the appropriate type
-          val tlvReader = TlvReader(attributeData.data)
-          val decodedValue: UByte = tlvReader.getUByte(AnonymousTag)
-
-          emit(UByteSubscriptionState.Success(decodedValue))
-        }
-        SubscriptionState.SubscriptionEstablished -> {
-          emit(UByteSubscriptionState.SubscriptionEstablished)
-        }
-      }
-    }
-  }
-
   suspend fun readCurrentInUseAttribute(): UByte {
-    val ATTRIBUTE_ID: UInt = 3u
+    val ATTRIBUTE_ID: UInt = 2u
 
     val attributePath =
       AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -508,7 +427,7 @@ class TlsClientManagementCluster(
     minInterval: Int,
     maxInterval: Int,
   ): Flow<UByteSubscriptionState> {
-    val ATTRIBUTE_ID: UInt = 3u
+    val ATTRIBUTE_ID: UInt = 2u
     val attributePaths =
       listOf(
         AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)