Skip to content

Commit 9b64072

Browse files
yufengwangcayufengwangca
authored
[Kotlin] Make timedInvokeTimeoutMs field non-optional if mustUseTimed attribute is set (#30206)
1 parent 6b60c62 commit 9b64072

File tree

102 files changed

+2455
-1649
lines changed

Some content is hidden

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

102 files changed

+2455
-1649
lines changed

‎kotlin-detect-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ style:
4646
- "**/src/controller/java/tests/matter/tlv/TlvReaderTest.kt"
4747
- "**/src/controller/java/tests/matter/tlv/TlvReadWriteTest.kt"
4848
- "**/src/controller/java/tests/matter/tlv/TlvWriterTest.kt"
49+
- "**/src/controller/java/generated/java/**/*"
4950
WildcardImport:
5051
excludes:
5152
- "**/examples/android/CHIPTest/app/src/androidTest/java/com/tcl/chip/chiptest/ExampleInstrumentedTest.kt"

‎scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja

+30-11
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@
5858

5959
package matter.devicecontroller.cluster.clusters
6060

61+
import matter.controller.MatterController
6162
import matter.devicecontroller.cluster.structs.*
6263
{% set typeLookup = idl | createLookupContext(cluster) %}
63-
class {{cluster.name}}Cluster(private val endpointId: UShort) {
64+
class {{cluster.name}}Cluster(private val controller: MatterController, private val endpointId: UShort) {
6465

6566
{%- set already_handled_command = [] -%}
6667
{%- for command in cluster.commands | sort(attribute='code') -%}
@@ -101,19 +102,32 @@ class {{cluster.name}}Cluster(private val endpointId: UShort) {
101102
{{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}
102103
{%- if not loop.last -%}, {% endif %}
103104
{%- endfor -%}
105+
{%- if command.is_timed_invoke -%}
106+
, timedInvokeTimeoutMs: Int)
107+
{%- else -%}
104108
, timedInvokeTimeoutMs: Int? = null)
109+
{%- endif -%}
110+
{%- else -%}
111+
{%- if command.is_timed_invoke -%}
112+
timedInvokeTimeoutMs: Int)
105113
{%- else -%}
106114
timedInvokeTimeoutMs: Int? = null)
107115
{%- endif -%}
116+
{%- endif -%}
108117
{%- if command | hasResponse -%}
109118
: {{callbackName}} {
110119
{%- else %} {
111-
{%- endif %}
120+
{%- endif %}
121+
val commandId = {{command.code}}L
122+
{% if command.is_timed_invoke %}
123+
// Implementation needs to be added here
124+
{%- else %}
112125
if (timedInvokeTimeoutMs != null) {
113126
// Do the action with timedInvokeTimeoutMs
114127
} else {
115128
// Do the action without timedInvokeTimeoutMs
116-
}
129+
}
130+
{%- endif %}
117131
}
118132
{% endfor -%}
119133

@@ -132,19 +146,24 @@ class {{cluster.name}}Cluster(private val endpointId: UShort) {
132146
{% endif -%}
133147
{%- if attribute.is_writable %}
134148
{%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
135-
{%- set encodable2 = attribute.definition | asEncodable(typeLookup) -%}
136-
{%- if not attribute.requires_timed_write %}
137-
suspend fun write{{ attribute.definition.name | upfirst }}Attribute(
138-
value: {{ encode_value_without_optional_nullable(cluster, encodable, 0) }}
139-
) {
140-
// Implementation needs to be added here
141-
}
142-
{% endif %}
149+
{%- set encodable2 = attribute.definition | asEncodable(typeLookup) %}
143150
suspend fun write{{ attribute.definition.name | upfirst }}Attribute(
144151
value: {{ encode_value_without_optional_nullable(cluster, encodable2, 0) }},
152+
{%- if attribute.requires_timed_write -%}
145153
timedWriteTimeoutMs: Int
154+
{%- else %}
155+
timedWriteTimeoutMs: Int? = null
156+
{%- endif %}
146157
) {
158+
{%- if attribute.requires_timed_write %}
147159
// Implementation needs to be added here
160+
{%- else %}
161+
if (timedWriteTimeoutMs != null) {
162+
// Do the action with timedWriteTimeoutMs
163+
} else {
164+
// Do the action without timedWriteTimeoutMs
165+
}
166+
{%- endif %}
148167
}
149168
{% endif %}
150169
{%- if attribute.is_subscribable %}

‎src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt

+17-15
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717

1818
package matter.devicecontroller.cluster.clusters
1919

20+
import matter.controller.MatterController
2021
import matter.devicecontroller.cluster.structs.*
2122

22-
class AccessControlCluster(private val endpointId: UShort) {
23+
class AccessControlCluster(
24+
private val controller: MatterController,
25+
private val endpointId: UShort
26+
) {
2327
class AclAttribute(val value: List<AccessControlClusterAccessControlEntryStruct>)
2428

2529
class ExtensionAttribute(val value: List<AccessControlClusterAccessControlExtensionStruct>?)
@@ -40,15 +44,15 @@ class AccessControlCluster(private val endpointId: UShort) {
4044
// Implementation needs to be added here
4145
}
4246

43-
suspend fun writeAclAttribute(value: List<AccessControlClusterAccessControlEntryStruct>) {
44-
// Implementation needs to be added here
45-
}
46-
4747
suspend fun writeAclAttribute(
4848
value: List<AccessControlClusterAccessControlEntryStruct>,
49-
timedWriteTimeoutMs: Int
49+
timedWriteTimeoutMs: Int? = null
5050
) {
51-
// Implementation needs to be added here
51+
if (timedWriteTimeoutMs != null) {
52+
// Do the action with timedWriteTimeoutMs
53+
} else {
54+
// Do the action without timedWriteTimeoutMs
55+
}
5256
}
5357

5458
suspend fun subscribeAclAttribute(minInterval: Int, maxInterval: Int): AclAttribute {
@@ -65,17 +69,15 @@ class AccessControlCluster(private val endpointId: UShort) {
6569
// Implementation needs to be added here
6670
}
6771

68-
suspend fun writeExtensionAttribute(
69-
value: List<AccessControlClusterAccessControlExtensionStruct>
70-
) {
71-
// Implementation needs to be added here
72-
}
73-
7472
suspend fun writeExtensionAttribute(
7573
value: List<AccessControlClusterAccessControlExtensionStruct>,
76-
timedWriteTimeoutMs: Int
74+
timedWriteTimeoutMs: Int? = null
7775
) {
78-
// Implementation needs to be added here
76+
if (timedWriteTimeoutMs != null) {
77+
// Do the action with timedWriteTimeoutMs
78+
} else {
79+
// Do the action without timedWriteTimeoutMs
80+
}
7981
}
8082

8183
suspend fun subscribeExtensionAttribute(minInterval: Int, maxInterval: Int): ExtensionAttribute {

‎src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt

+19-25
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717

1818
package matter.devicecontroller.cluster.clusters
1919

20+
import matter.controller.MatterController
2021
import matter.devicecontroller.cluster.structs.*
2122

22-
class AccountLoginCluster(private val endpointId: UShort) {
23+
class AccountLoginCluster(
24+
private val controller: MatterController,
25+
private val endpointId: UShort
26+
) {
2327
class GetSetupPINResponse(val setupPIN: String)
2428

2529
class GeneratedCommandListAttribute(val value: List<UInt>)
@@ -32,33 +36,23 @@ class AccountLoginCluster(private val endpointId: UShort) {
3236

3337
suspend fun getSetupPIN(
3438
tempAccountIdentifier: String,
35-
timedInvokeTimeoutMs: Int? = null
39+
timedInvokeTimeoutMs: Int
3640
): GetSetupPINResponse {
37-
if (timedInvokeTimeoutMs != null) {
38-
// Do the action with timedInvokeTimeoutMs
39-
} else {
40-
// Do the action without timedInvokeTimeoutMs
41-
}
41+
val commandId = 0L
42+
43+
// Implementation needs to be added here
4244
}
4345

44-
suspend fun login(
45-
tempAccountIdentifier: String,
46-
setupPIN: String,
47-
timedInvokeTimeoutMs: Int? = null
48-
) {
49-
if (timedInvokeTimeoutMs != null) {
50-
// Do the action with timedInvokeTimeoutMs
51-
} else {
52-
// Do the action without timedInvokeTimeoutMs
53-
}
54-
}
55-
56-
suspend fun logout(timedInvokeTimeoutMs: Int? = null) {
57-
if (timedInvokeTimeoutMs != null) {
58-
// Do the action with timedInvokeTimeoutMs
59-
} else {
60-
// Do the action without timedInvokeTimeoutMs
61-
}
46+
suspend fun login(tempAccountIdentifier: String, setupPIN: String, timedInvokeTimeoutMs: Int) {
47+
val commandId = 2L
48+
49+
// Implementation needs to be added here
50+
}
51+
52+
suspend fun logout(timedInvokeTimeoutMs: Int) {
53+
val commandId = 3L
54+
55+
// Implementation needs to be added here
6256
}
6357

6458
suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {

‎src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt

+26-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717

1818
package matter.devicecontroller.cluster.clusters
1919

20+
import matter.controller.MatterController
2021
import matter.devicecontroller.cluster.structs.*
2122

22-
class ActionsCluster(private val endpointId: UShort) {
23+
class ActionsCluster(private val controller: MatterController, private val endpointId: UShort) {
2324
class ActionListAttribute(val value: List<ActionsClusterActionStruct>)
2425

2526
class EndpointListsAttribute(val value: List<ActionsClusterEndpointListStruct>)
@@ -33,6 +34,8 @@ class ActionsCluster(private val endpointId: UShort) {
3334
class AttributeListAttribute(val value: List<UInt>)
3435

3536
suspend fun instantAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
37+
val commandId = 0L
38+
3639
if (timedInvokeTimeoutMs != null) {
3740
// Do the action with timedInvokeTimeoutMs
3841
} else {
@@ -46,6 +49,8 @@ class ActionsCluster(private val endpointId: UShort) {
4649
transitionTime: UShort,
4750
timedInvokeTimeoutMs: Int? = null
4851
) {
52+
val commandId = 1L
53+
4954
if (timedInvokeTimeoutMs != null) {
5055
// Do the action with timedInvokeTimeoutMs
5156
} else {
@@ -54,6 +59,8 @@ class ActionsCluster(private val endpointId: UShort) {
5459
}
5560

5661
suspend fun startAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
62+
val commandId = 2L
63+
5764
if (timedInvokeTimeoutMs != null) {
5865
// Do the action with timedInvokeTimeoutMs
5966
} else {
@@ -67,6 +74,8 @@ class ActionsCluster(private val endpointId: UShort) {
6774
duration: UInt,
6875
timedInvokeTimeoutMs: Int? = null
6976
) {
77+
val commandId = 3L
78+
7079
if (timedInvokeTimeoutMs != null) {
7180
// Do the action with timedInvokeTimeoutMs
7281
} else {
@@ -75,6 +84,8 @@ class ActionsCluster(private val endpointId: UShort) {
7584
}
7685

7786
suspend fun stopAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
87+
val commandId = 4L
88+
7889
if (timedInvokeTimeoutMs != null) {
7990
// Do the action with timedInvokeTimeoutMs
8091
} else {
@@ -83,6 +94,8 @@ class ActionsCluster(private val endpointId: UShort) {
8394
}
8495

8596
suspend fun pauseAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
97+
val commandId = 5L
98+
8699
if (timedInvokeTimeoutMs != null) {
87100
// Do the action with timedInvokeTimeoutMs
88101
} else {
@@ -96,6 +109,8 @@ class ActionsCluster(private val endpointId: UShort) {
96109
duration: UInt,
97110
timedInvokeTimeoutMs: Int? = null
98111
) {
112+
val commandId = 6L
113+
99114
if (timedInvokeTimeoutMs != null) {
100115
// Do the action with timedInvokeTimeoutMs
101116
} else {
@@ -104,6 +119,8 @@ class ActionsCluster(private val endpointId: UShort) {
104119
}
105120

106121
suspend fun resumeAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
122+
val commandId = 7L
123+
107124
if (timedInvokeTimeoutMs != null) {
108125
// Do the action with timedInvokeTimeoutMs
109126
} else {
@@ -112,6 +129,8 @@ class ActionsCluster(private val endpointId: UShort) {
112129
}
113130

114131
suspend fun enableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
132+
val commandId = 8L
133+
115134
if (timedInvokeTimeoutMs != null) {
116135
// Do the action with timedInvokeTimeoutMs
117136
} else {
@@ -125,6 +144,8 @@ class ActionsCluster(private val endpointId: UShort) {
125144
duration: UInt,
126145
timedInvokeTimeoutMs: Int? = null
127146
) {
147+
val commandId = 9L
148+
128149
if (timedInvokeTimeoutMs != null) {
129150
// Do the action with timedInvokeTimeoutMs
130151
} else {
@@ -133,6 +154,8 @@ class ActionsCluster(private val endpointId: UShort) {
133154
}
134155

135156
suspend fun disableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
157+
val commandId = 10L
158+
136159
if (timedInvokeTimeoutMs != null) {
137160
// Do the action with timedInvokeTimeoutMs
138161
} else {
@@ -146,6 +169,8 @@ class ActionsCluster(private val endpointId: UShort) {
146169
duration: UInt,
147170
timedInvokeTimeoutMs: Int? = null
148171
) {
172+
val commandId = 11L
173+
149174
if (timedInvokeTimeoutMs != null) {
150175
// Do the action with timedInvokeTimeoutMs
151176
} else {

‎src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt

+13-7
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717

1818
package matter.devicecontroller.cluster.clusters
1919

20+
import matter.controller.MatterController
2021
import matter.devicecontroller.cluster.structs.*
2122

22-
class ActivatedCarbonFilterMonitoringCluster(private val endpointId: UShort) {
23+
class ActivatedCarbonFilterMonitoringCluster(
24+
private val controller: MatterController,
25+
private val endpointId: UShort
26+
) {
2327
class LastChangedTimeAttribute(val value: UInt?)
2428

2529
class ReplacementProductListAttribute(
@@ -35,6 +39,8 @@ class ActivatedCarbonFilterMonitoringCluster(private val endpointId: UShort) {
3539
class AttributeListAttribute(val value: List<UInt>)
3640

3741
suspend fun resetCondition(timedInvokeTimeoutMs: Int? = null) {
42+
val commandId = 0L
43+
3844
if (timedInvokeTimeoutMs != null) {
3945
// Do the action with timedInvokeTimeoutMs
4046
} else {
@@ -78,12 +84,12 @@ class ActivatedCarbonFilterMonitoringCluster(private val endpointId: UShort) {
7884
// Implementation needs to be added here
7985
}
8086

81-
suspend fun writeLastChangedTimeAttribute(value: UInt) {
82-
// Implementation needs to be added here
83-
}
84-
85-
suspend fun writeLastChangedTimeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
86-
// Implementation needs to be added here
87+
suspend fun writeLastChangedTimeAttribute(value: UInt, timedWriteTimeoutMs: Int? = null) {
88+
if (timedWriteTimeoutMs != null) {
89+
// Do the action with timedWriteTimeoutMs
90+
} else {
91+
// Do the action without timedWriteTimeoutMs
92+
}
8793
}
8894

8995
suspend fun subscribeLastChangedTimeAttribute(

0 commit comments

Comments
 (0)