Update Struct Class for avoiding build error

project-chip · Sep 21, 2023 · dd04aa0 · dd04aa0
1 parent 8b99f32
commit dd04aa0
Show file tree

Hide file tree

Showing 138 changed files with 591 additions and 549 deletions.
diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ChipEventStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ChipEventStructs.jinja
@@ -115,9 +115,9 @@ class {{cluster.name}}Cluster{{event.name}}Event (
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       {% for field in event.fields %}
         {%- set encodable = field | asEncodable(typeLookup) %}
         {%- set tag = contextSpecificTag(field) -%}
@@ -132,8 +132,8 @@ class {{cluster.name}}Cluster{{event.name}}Event (
     private const val TAG_{{field.name | constcase}} = {{field.code}}
     {%- endfor %}
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader) : {{cluster.name}}Cluster{{event.name}}Event {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : {{cluster.name}}Cluster{{event.name}}Event {
+      tlvReader.enterStructure(tlvTag)
       {% for field in event.fields %}
         {%- set decodable = field | asEncodable(typeLookup) %}
         {%- set tag = contextSpecificTag(field) -%}

diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ChipStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ChipStructs.jinja
@@ -115,9 +115,9 @@ class {{cluster.name}}Cluster{{struct.name}} (
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       {% for field in struct.fields %}
         {%- set encodable = field | asEncodable(typeLookup) %}
         {%- set tag = contextSpecificTag(field) -%}
@@ -132,8 +132,8 @@ class {{cluster.name}}Cluster{{struct.name}} (
     private const val TAG_{{field.name | constcase}} = {{field.code}}
     {%- endfor %}
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader) : {{cluster.name}}Cluster{{struct.name}} {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : {{cluster.name}}Cluster{{struct.name}} {
+      tlvReader.enterStructure(tlvTag)
       {% for field in struct.fields %}
         {%- set decodable = field | asEncodable(typeLookup) %}
         {%- set tag = contextSpecificTag(field) -%}

diff --git a/...idl/matter_idl/tests/outputs/several_clusters/java/SecondClusterFabricDescriptorStruct.kt b/...idl/matter_idl/tests/outputs/several_clusters/java/SecondClusterFabricDescriptorStruct.kt
@@ -44,9 +44,9 @@ class SecondClusterFabricDescriptorStruct (
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY), rootPublicKey)
       put(ContextSpecificTag(TAG_VENDOR_I_D), vendorID)
       put(ContextSpecificTag(TAG_FABRIC_I_D), fabricID)
@@ -65,8 +65,8 @@ class SecondClusterFabricDescriptorStruct (
     private const val TAG_LABEL = 5
     private const val TAG_FABRIC_INDEX = 254
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader) : SecondClusterFabricDescriptorStruct {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : SecondClusterFabricDescriptorStruct {
+      tlvReader.enterStructure(tlvTag)
       val rootPublicKey = tlvReader.getByteArray(ContextSpecificTag(TAG_ROOT_PUBLIC_KEY))
       val vendorID = tlvReader.getInt(ContextSpecificTag(TAG_VENDOR_I_D))
       val fabricID = tlvReader.getLong(ContextSpecificTag(TAG_FABRIC_I_D))

diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -314,7 +314,7 @@ kotlin_library("onboardingpayload_qr_code_test") {
 
 kotlin_library("chipcluster") {
   import(
-      "${chip_root}/src/controller/java/src/chip/devicecontroller/cluster/files.gni")
+      "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni")
 
   output_name = "CHIPClusters.jar"
 

diff --git a/...vicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt b/...vicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
@@ -40,9 +40,9 @@ class AccessControlClusterAccessControlEntryChangedEvent(
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       if (adminNodeID != null) {
         put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
       } else {
@@ -72,10 +72,10 @@ class AccessControlClusterAccessControlEntryChangedEvent(
     private const val TAG_FABRIC_INDEX = 254
 
     fun fromTlv(
-      tag: Tag,
+      tlvTag: Tag,
       tlvReader: TlvReader
     ): AccessControlClusterAccessControlEntryChangedEvent {
-      tlvReader.enterStructure(tag)
+      tlvReader.enterStructure(tlvTag)
       val adminNodeID =
         if (!tlvReader.isNull()) {
           tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))

diff --git a/...controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt b/...controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
@@ -40,9 +40,9 @@ class AccessControlClusterAccessControlExtensionChangedEvent(
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       if (adminNodeID != null) {
         put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
       } else {
@@ -72,10 +72,10 @@ class AccessControlClusterAccessControlExtensionChangedEvent(
     private const val TAG_FABRIC_INDEX = 254
 
     fun fromTlv(
-      tag: Tag,
+      tlvTag: Tag,
       tlvReader: TlvReader
     ): AccessControlClusterAccessControlExtensionChangedEvent {
-      tlvReader.enterStructure(tag)
+      tlvReader.enterStructure(tlvTag)
       val adminNodeID =
         if (!tlvReader.isNull()) {
           tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))

diff --git a/...erated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt b/...erated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
@@ -37,9 +37,9 @@ class ActionsClusterActionFailedEvent(
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_ACTION_I_D), actionID)
       put(ContextSpecificTag(TAG_INVOKE_I_D), invokeID)
       put(ContextSpecificTag(TAG_NEW_STATE), newState)
@@ -54,8 +54,8 @@ class ActionsClusterActionFailedEvent(
     private const val TAG_NEW_STATE = 2
     private const val TAG_ERROR = 3
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): ActionsClusterActionFailedEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionFailedEvent {
+      tlvReader.enterStructure(tlvTag)
       val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_I_D))
       val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_I_D))
       val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE))

diff --git a/...erated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt b/...erated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
@@ -31,9 +31,9 @@ class ActionsClusterStateChangedEvent(val actionID: UInt, val invokeID: ULong, v
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_ACTION_I_D), actionID)
       put(ContextSpecificTag(TAG_INVOKE_I_D), invokeID)
       put(ContextSpecificTag(TAG_NEW_STATE), newState)
@@ -46,8 +46,8 @@ class ActionsClusterStateChangedEvent(val actionID: UInt, val invokeID: ULong, v
     private const val TAG_INVOKE_I_D = 1
     private const val TAG_NEW_STATE = 2
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): ActionsClusterStateChangedEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterStateChangedEvent {
+      tlvReader.enterStructure(tlvTag)
       val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_I_D))
       val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_I_D))
       val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE))

diff --git a/...ated/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt b/...ated/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt
@@ -29,9 +29,9 @@ class BasicInformationClusterLeaveEvent(val fabricIndex: UInt) {
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
       endStructure()
     }
@@ -40,8 +40,8 @@ class BasicInformationClusterLeaveEvent(val fabricIndex: UInt) {
   companion object {
     private const val TAG_FABRIC_INDEX = 0
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): BasicInformationClusterLeaveEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BasicInformationClusterLeaveEvent {
+      tlvReader.enterStructure(tlvTag)
       val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
 
       tlvReader.exitContainer()

diff --git a/...hip/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt b/...hip/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt
@@ -29,9 +29,9 @@ class BasicInformationClusterReachableChangedEvent(val reachableNewValue: Boolea
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_REACHABLE_NEW_VALUE), reachableNewValue)
       endStructure()
     }
@@ -40,8 +40,8 @@ class BasicInformationClusterReachableChangedEvent(val reachableNewValue: Boolea
   companion object {
     private const val TAG_REACHABLE_NEW_VALUE = 0
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): BasicInformationClusterReachableChangedEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BasicInformationClusterReachableChangedEvent {
+      tlvReader.enterStructure(tlvTag)
       val reachableNewValue = tlvReader.getBoolean(ContextSpecificTag(TAG_REACHABLE_NEW_VALUE))
 
       tlvReader.exitContainer()

diff --git a/...ed/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt b/...ed/java/chip/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt
@@ -29,9 +29,9 @@ class BasicInformationClusterStartUpEvent(val softwareVersion: ULong) {
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_SOFTWARE_VERSION), softwareVersion)
       endStructure()
     }
@@ -40,8 +40,8 @@ class BasicInformationClusterStartUpEvent(val softwareVersion: ULong) {
   companion object {
     private const val TAG_SOFTWARE_VERSION = 0
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): BasicInformationClusterStartUpEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BasicInformationClusterStartUpEvent {
+      tlvReader.enterStructure(tlvTag)
       val softwareVersion = tlvReader.getULong(ContextSpecificTag(TAG_SOFTWARE_VERSION))
 
       tlvReader.exitContainer()

diff --git a/...ed/java/chip/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt b/...ed/java/chip/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt
@@ -29,9 +29,9 @@ class BooleanStateClusterStateChangeEvent(val stateValue: Boolean) {
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_STATE_VALUE), stateValue)
       endStructure()
     }
@@ -40,8 +40,8 @@ class BooleanStateClusterStateChangeEvent(val stateValue: Boolean) {
   companion object {
     private const val TAG_STATE_VALUE = 0
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): BooleanStateClusterStateChangeEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): BooleanStateClusterStateChangeEvent {
+      tlvReader.enterStructure(tlvTag)
       val stateValue = tlvReader.getBoolean(ContextSpecificTag(TAG_STATE_VALUE))
 
       tlvReader.exitContainer()

diff --git a/...troller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt b/...troller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt
@@ -29,9 +29,9 @@ class BridgedDeviceBasicInformationClusterReachableChangedEvent(val reachableNew
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_REACHABLE_NEW_VALUE), reachableNewValue)
       endStructure()
     }
@@ -41,10 +41,10 @@ class BridgedDeviceBasicInformationClusterReachableChangedEvent(val reachableNew
     private const val TAG_REACHABLE_NEW_VALUE = 0
 
     fun fromTlv(
-      tag: Tag,
+      tlvTag: Tag,
       tlvReader: TlvReader
     ): BridgedDeviceBasicInformationClusterReachableChangedEvent {
-      tlvReader.enterStructure(tag)
+      tlvReader.enterStructure(tlvTag)
       val reachableNewValue = tlvReader.getBoolean(ContextSpecificTag(TAG_REACHABLE_NEW_VALUE))
 
       tlvReader.exitContainer()

diff --git a/...devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt b/...devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt
@@ -29,9 +29,9 @@ class BridgedDeviceBasicInformationClusterStartUpEvent(val softwareVersion: ULon
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_SOFTWARE_VERSION), softwareVersion)
       endStructure()
     }
@@ -40,8 +40,11 @@ class BridgedDeviceBasicInformationClusterStartUpEvent(val softwareVersion: ULon
   companion object {
     private const val TAG_SOFTWARE_VERSION = 0
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): BridgedDeviceBasicInformationClusterStartUpEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(
+      tlvTag: Tag,
+      tlvReader: TlvReader
+    ): BridgedDeviceBasicInformationClusterStartUpEvent {
+      tlvReader.enterStructure(tlvTag)
       val softwareVersion = tlvReader.getULong(ContextSpecificTag(TAG_SOFTWARE_VERSION))
 
       tlvReader.exitContainer()

diff --git a/...ated/java/chip/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt b/...ated/java/chip/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt
@@ -37,9 +37,9 @@ class DishwasherAlarmClusterNotifyEvent(
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_ACTIVE), active)
       put(ContextSpecificTag(TAG_INACTIVE), inactive)
       put(ContextSpecificTag(TAG_STATE), state)
@@ -54,8 +54,8 @@ class DishwasherAlarmClusterNotifyEvent(
     private const val TAG_STATE = 2
     private const val TAG_MASK = 3
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): DishwasherAlarmClusterNotifyEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DishwasherAlarmClusterNotifyEvent {
+      tlvReader.enterStructure(tlvTag)
       val active = tlvReader.getULong(ContextSpecificTag(TAG_ACTIVE))
       val inactive = tlvReader.getULong(ContextSpecificTag(TAG_INACTIVE))
       val state = tlvReader.getULong(ContextSpecificTag(TAG_STATE))

diff --git a/...ated/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt b/...ated/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt
@@ -29,9 +29,9 @@ class DoorLockClusterDoorLockAlarmEvent(val alarmCode: UInt) {
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_ALARM_CODE), alarmCode)
       endStructure()
     }
@@ -40,8 +40,8 @@ class DoorLockClusterDoorLockAlarmEvent(val alarmCode: UInt) {
   companion object {
     private const val TAG_ALARM_CODE = 0
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): DoorLockClusterDoorLockAlarmEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DoorLockClusterDoorLockAlarmEvent {
+      tlvReader.enterStructure(tlvTag)
       val alarmCode = tlvReader.getUInt(ContextSpecificTag(TAG_ALARM_CODE))
 
       tlvReader.exitContainer()

diff --git a/...ed/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt b/...ed/java/chip/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt
@@ -29,9 +29,9 @@ class DoorLockClusterDoorStateChangeEvent(val doorState: UInt) {
     append("}\n")
   }
 
-  fun toTlv(tag: Tag, tlvWriter: TlvWriter) {
+  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
     tlvWriter.apply {
-      startStructure(tag)
+      startStructure(tlvTag)
       put(ContextSpecificTag(TAG_DOOR_STATE), doorState)
       endStructure()
     }
@@ -40,8 +40,8 @@ class DoorLockClusterDoorStateChangeEvent(val doorState: UInt) {
   companion object {
     private const val TAG_DOOR_STATE = 0
 
-    fun fromTlv(tag: Tag, tlvReader: TlvReader): DoorLockClusterDoorStateChangeEvent {
-      tlvReader.enterStructure(tag)
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): DoorLockClusterDoorStateChangeEvent {
+      tlvReader.enterStructure(tlvTag)
       val doorState = tlvReader.getUInt(ContextSpecificTag(TAG_DOOR_STATE))
 
       tlvReader.exitContainer()