Skip to content

Commit fd2c277

Browse files
lazarkovlazarkov
committed
ZAP tool correction
1 parent 35b3975 commit fd2c277

File tree

536 files changed

+111249
-122413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

536 files changed

+111249
-122413
lines changed

‎src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt

+55-44
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,20 @@
1717
package chip.devicecontroller.cluster.eventstructs
1818

1919
import chip.devicecontroller.cluster.*
20-
import matter.tlv.AnonymousTag
2120
import matter.tlv.ContextSpecificTag
2221
import matter.tlv.Tag
23-
import matter.tlv.TlvParsingException
2422
import matter.tlv.TlvReader
2523
import matter.tlv.TlvWriter
2624

27-
import java.util.Optional
28-
29-
class AccessControlClusterAccessControlEntryChangedEvent (
30-
val adminNodeID: ULong?,
31-
val adminPasscodeID: UInt?,
32-
val changeType: UInt,
33-
val latestValue: chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
34-
val fabricIndex: UInt) {
35-
override fun toString(): String = buildString {
25+
class AccessControlClusterAccessControlEntryChangedEvent(
26+
val adminNodeID: ULong?,
27+
val adminPasscodeID: UInt?,
28+
val changeType: UInt,
29+
val latestValue:
30+
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
31+
val fabricIndex: UInt
32+
) {
33+
override fun toString(): String = buildString {
3634
append("AccessControlClusterAccessControlEntryChangedEvent {\n")
3735
append("\tadminNodeID : $adminNodeID\n")
3836
append("\tadminPasscodeID : $adminPasscodeID\n")
@@ -46,21 +44,21 @@ class AccessControlClusterAccessControlEntryChangedEvent (
4644
tlvWriter.apply {
4745
startStructure(tlvTag)
4846
if (adminNodeID != null) {
49-
put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
50-
} else {
51-
putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
52-
}
47+
put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
48+
} else {
49+
putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
50+
}
5351
if (adminPasscodeID != null) {
54-
put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
55-
} else {
56-
putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
57-
}
52+
put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
53+
} else {
54+
putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
55+
}
5856
put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType)
5957
if (latestValue != null) {
60-
latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
61-
} else {
62-
putNull(ContextSpecificTag(TAG_LATEST_VALUE))
63-
}
58+
latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
59+
} else {
60+
putNull(ContextSpecificTag(TAG_LATEST_VALUE))
61+
}
6462
put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
6563
endStructure()
6664
}
@@ -73,32 +71,45 @@ class AccessControlClusterAccessControlEntryChangedEvent (
7371
private const val TAG_LATEST_VALUE = 4
7472
private const val TAG_FABRIC_INDEX = 254
7573

76-
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : AccessControlClusterAccessControlEntryChangedEvent {
74+
fun fromTlv(
75+
tlvTag: Tag,
76+
tlvReader: TlvReader
77+
): AccessControlClusterAccessControlEntryChangedEvent {
7778
tlvReader.enterStructure(tlvTag)
78-
val adminNodeID = if (!tlvReader.isNull()) {
79-
tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
80-
} else {
81-
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
82-
null
83-
}
84-
val adminPasscodeID = if (!tlvReader.isNull()) {
85-
tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
86-
} else {
87-
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
88-
null
89-
}
79+
val adminNodeID =
80+
if (!tlvReader.isNull()) {
81+
tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
82+
} else {
83+
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
84+
null
85+
}
86+
val adminPasscodeID =
87+
if (!tlvReader.isNull()) {
88+
tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
89+
} else {
90+
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
91+
null
92+
}
9093
val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE))
91-
val latestValue = if (!tlvReader.isNull()) {
92-
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct.fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
93-
} else {
94-
tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
95-
null
96-
}
94+
val latestValue =
95+
if (!tlvReader.isNull()) {
96+
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct
97+
.fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
98+
} else {
99+
tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
100+
null
101+
}
97102
val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
98-
103+
99104
tlvReader.exitContainer()
100105

101-
return AccessControlClusterAccessControlEntryChangedEvent(adminNodeID, adminPasscodeID, changeType, latestValue, fabricIndex)
106+
return AccessControlClusterAccessControlEntryChangedEvent(
107+
adminNodeID,
108+
adminPasscodeID,
109+
changeType,
110+
latestValue,
111+
fabricIndex
112+
)
102113
}
103114
}
104115
}

‎src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt

+55-44
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,20 @@
1717
package chip.devicecontroller.cluster.eventstructs
1818

1919
import chip.devicecontroller.cluster.*
20-
import matter.tlv.AnonymousTag
2120
import matter.tlv.ContextSpecificTag
2221
import matter.tlv.Tag
23-
import matter.tlv.TlvParsingException
2422
import matter.tlv.TlvReader
2523
import matter.tlv.TlvWriter
2624

27-
import java.util.Optional
28-
29-
class AccessControlClusterAccessControlExtensionChangedEvent (
30-
val adminNodeID: ULong?,
31-
val adminPasscodeID: UInt?,
32-
val changeType: UInt,
33-
val latestValue: chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct?,
34-
val fabricIndex: UInt) {
35-
override fun toString(): String = buildString {
25+
class AccessControlClusterAccessControlExtensionChangedEvent(
26+
val adminNodeID: ULong?,
27+
val adminPasscodeID: UInt?,
28+
val changeType: UInt,
29+
val latestValue:
30+
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct?,
31+
val fabricIndex: UInt
32+
) {
33+
override fun toString(): String = buildString {
3634
append("AccessControlClusterAccessControlExtensionChangedEvent {\n")
3735
append("\tadminNodeID : $adminNodeID\n")
3836
append("\tadminPasscodeID : $adminPasscodeID\n")
@@ -46,21 +44,21 @@ class AccessControlClusterAccessControlExtensionChangedEvent (
4644
tlvWriter.apply {
4745
startStructure(tlvTag)
4846
if (adminNodeID != null) {
49-
put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
50-
} else {
51-
putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
52-
}
47+
put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
48+
} else {
49+
putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
50+
}
5351
if (adminPasscodeID != null) {
54-
put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
55-
} else {
56-
putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
57-
}
52+
put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
53+
} else {
54+
putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
55+
}
5856
put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType)
5957
if (latestValue != null) {
60-
latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
61-
} else {
62-
putNull(ContextSpecificTag(TAG_LATEST_VALUE))
63-
}
58+
latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
59+
} else {
60+
putNull(ContextSpecificTag(TAG_LATEST_VALUE))
61+
}
6462
put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
6563
endStructure()
6664
}
@@ -73,32 +71,45 @@ class AccessControlClusterAccessControlExtensionChangedEvent (
7371
private const val TAG_LATEST_VALUE = 4
7472
private const val TAG_FABRIC_INDEX = 254
7573

76-
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : AccessControlClusterAccessControlExtensionChangedEvent {
74+
fun fromTlv(
75+
tlvTag: Tag,
76+
tlvReader: TlvReader
77+
): AccessControlClusterAccessControlExtensionChangedEvent {
7778
tlvReader.enterStructure(tlvTag)
78-
val adminNodeID = if (!tlvReader.isNull()) {
79-
tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
80-
} else {
81-
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
82-
null
83-
}
84-
val adminPasscodeID = if (!tlvReader.isNull()) {
85-
tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
86-
} else {
87-
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
88-
null
89-
}
79+
val adminNodeID =
80+
if (!tlvReader.isNull()) {
81+
tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
82+
} else {
83+
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
84+
null
85+
}
86+
val adminPasscodeID =
87+
if (!tlvReader.isNull()) {
88+
tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
89+
} else {
90+
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
91+
null
92+
}
9093
val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE))
91-
val latestValue = if (!tlvReader.isNull()) {
92-
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct.fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
93-
} else {
94-
tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
95-
null
96-
}
94+
val latestValue =
95+
if (!tlvReader.isNull()) {
96+
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct
97+
.fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
98+
} else {
99+
tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
100+
null
101+
}
97102
val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
98-
103+
99104
tlvReader.exitContainer()
100105

101-
return AccessControlClusterAccessControlExtensionChangedEvent(adminNodeID, adminPasscodeID, changeType, latestValue, fabricIndex)
106+
return AccessControlClusterAccessControlExtensionChangedEvent(
107+
adminNodeID,
108+
adminPasscodeID,
109+
changeType,
110+
latestValue,
111+
fabricIndex
112+
)
102113
}
103114
}
104115
}

‎src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt

+14-17
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,14 @@
1717
package chip.devicecontroller.cluster.eventstructs
1818

1919
import chip.devicecontroller.cluster.*
20-
import matter.tlv.AnonymousTag
20+
import java.util.Optional
2121
import matter.tlv.ContextSpecificTag
2222
import matter.tlv.Tag
23-
import matter.tlv.TlvParsingException
2423
import matter.tlv.TlvReader
2524
import matter.tlv.TlvWriter
2625

27-
import java.util.Optional
28-
29-
class AccountLoginClusterLoggedOutEvent (
30-
val node: Optional<ULong>) {
31-
override fun toString(): String = buildString {
26+
class AccountLoginClusterLoggedOutEvent(val node: Optional<ULong>) {
27+
override fun toString(): String = buildString {
3228
append("AccountLoginClusterLoggedOutEvent {\n")
3329
append("\tnode : $node\n")
3430
append("}\n")
@@ -38,24 +34,25 @@ class AccountLoginClusterLoggedOutEvent (
3834
tlvWriter.apply {
3935
startStructure(tlvTag)
4036
if (node.isPresent) {
41-
val optnode = node.get()
42-
put(ContextSpecificTag(TAG_NODE), optnode)
43-
}
37+
val optnode = node.get()
38+
put(ContextSpecificTag(TAG_NODE), optnode)
39+
}
4440
endStructure()
4541
}
4642
}
4743

4844
companion object {
4945
private const val TAG_NODE = 0
5046

51-
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : AccountLoginClusterLoggedOutEvent {
47+
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): AccountLoginClusterLoggedOutEvent {
5248
tlvReader.enterStructure(tlvTag)
53-
val node = if (tlvReader.isNextTag(ContextSpecificTag(TAG_NODE))) {
54-
Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_NODE)))
55-
} else {
56-
Optional.empty()
57-
}
58-
49+
val node =
50+
if (tlvReader.isNextTag(ContextSpecificTag(TAG_NODE))) {
51+
Optional.of(tlvReader.getULong(ContextSpecificTag(TAG_NODE)))
52+
} else {
53+
Optional.empty()
54+
}
55+
5956
tlvReader.exitContainer()
6057

6158
return AccountLoginClusterLoggedOutEvent(node)

‎src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt

+9-12
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,18 @@
1717
package chip.devicecontroller.cluster.eventstructs
1818

1919
import chip.devicecontroller.cluster.*
20-
import matter.tlv.AnonymousTag
2120
import matter.tlv.ContextSpecificTag
2221
import matter.tlv.Tag
23-
import matter.tlv.TlvParsingException
2422
import matter.tlv.TlvReader
2523
import matter.tlv.TlvWriter
2624

27-
import java.util.Optional
28-
29-
class ActionsClusterActionFailedEvent (
30-
val actionID: UInt,
31-
val invokeID: ULong,
32-
val newState: UInt,
33-
val error: UInt) {
34-
override fun toString(): String = buildString {
25+
class ActionsClusterActionFailedEvent(
26+
val actionID: UInt,
27+
val invokeID: ULong,
28+
val newState: UInt,
29+
val error: UInt
30+
) {
31+
override fun toString(): String = buildString {
3532
append("ActionsClusterActionFailedEvent {\n")
3633
append("\tactionID : $actionID\n")
3734
append("\tinvokeID : $invokeID\n")
@@ -57,13 +54,13 @@ class ActionsClusterActionFailedEvent (
5754
private const val TAG_NEW_STATE = 2
5855
private const val TAG_ERROR = 3
5956

60-
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : ActionsClusterActionFailedEvent {
57+
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionFailedEvent {
6158
tlvReader.enterStructure(tlvTag)
6259
val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_I_D))
6360
val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_I_D))
6461
val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE))
6562
val error = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR))
66-
63+
6764
tlvReader.exitContainer()
6865

6966
return ActionsClusterActionFailedEvent(actionID, invokeID, newState, error)

0 commit comments

Comments
 (0)