Change the package of Kotlin cluster lib to package matter.controller…

….cluster.clusters
project-chip · Dec 12, 2023 · 37e25d9 · 37e25d9
1 parent bc746ae
commit 37e25d9
Show file tree

Hide file tree

Showing 313 changed files with 2,075 additions and 1,182 deletions.
diff --git a/...oller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt b/...oller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
@@ -22,7 +22,7 @@ import java.util.logging.Level
 import java.util.logging.Logger
 import kotlinx.coroutines.runBlocking
 import matter.controller.MatterController
-import matter.devicecontroller.cluster.clusters.IdentifyCluster
+import matter.controller.cluster.clusters.IdentifyCluster
 
 class PairOnNetworkLongImInvokeCommand(
   controller: MatterController,

diff --git a/...troller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt b/...troller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
@@ -5,7 +5,7 @@ import java.util.logging.Level
 import java.util.logging.Logger
 import kotlinx.coroutines.runBlocking
 import matter.controller.MatterController
-import matter.devicecontroller.cluster.clusters.BasicInformationCluster
+import matter.controller.cluster.clusters.BasicInformationCluster
 
 class PairOnNetworkLongImReadCommand(controller: MatterController, credsIssue: CredentialsIssuer?) :
   PairingCommand(

diff --git a/...roller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt b/...roller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
@@ -22,7 +22,7 @@ import java.util.logging.Level
 import java.util.logging.Logger
 import kotlinx.coroutines.runBlocking
 import matter.controller.MatterController
-import matter.devicecontroller.cluster.clusters.BasicInformationCluster
+import matter.controller.cluster.clusters.BasicInformationCluster
 
 class PairOnNetworkLongImWriteCommand(
   controller: MatterController,

diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
@@ -121,15 +121,27 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
 import java.time.Duration
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadRequest
+import matter.controller.ReadData
+import matter.controller.ReadFailure
+import matter.controller.ReadResponse
+import matter.controller.SubscribeRequest
+import matter.controller.SubscriptionState
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.AttributeWriteError
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
+import matter.controller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag

diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
@@ -7,7 +7,7 @@
     List<{{encode_value(source, encodable.without_list(), depth + 1)}}>
   {%- elif encodable.is_struct -%}
     {%- set struct = encodable.get_underlying_struct() -%}
-    matter.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}}
+    matter.controller.cluster.structs.{{source.name}}Cluster{{struct.name}}
   {%- else -%}
     {{encodable.kotlin_type}}
   {%- endif -%}
@@ -63,7 +63,7 @@
       }
   {%- elif encodable.is_struct -%}
       {%- set struct = encodable.get_underlying_struct() -%}
-      matter.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}}.fromTlv({{tag}}, tlvReader)
+      matter.controller.cluster.structs.{{source.name}}Cluster{{struct.name}}.fromTlv({{tag}}, tlvReader)
   {%- else -%}
       tlvReader.get{{encodable.kotlin_type}}({{tag}})
   {%- endif -%}
@@ -89,10 +89,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag

diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
@@ -6,7 +6,7 @@ matter_structs_sources = [
 {%- set typeLookup = idl | createLookupContext(cluster) %}
 {%- for struct in cluster.structs | sort(attribute='name') %}
 {%- if not struct.tag %}
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/{{cluster.name}}Cluster{{struct.name}}.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/{{cluster.name}}Cluster{{struct.name}}.kt",
 {%- endif %}
 {%- endfor %}
 {%- endfor %}
@@ -17,7 +17,7 @@ matter_eventstructs_sources = [
 {%- set typeLookup = idl | createLookupContext(cluster) %}
 {%- for event in cluster.events | sort(attribute='name') %}
 {%- if event.fields %}
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/{{cluster.name}}Cluster{{event.name}}Event.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/{{cluster.name}}Cluster{{event.name}}Event.kt",
 {%- endif %}
 {%- endfor %}
 {%- endfor %}
@@ -26,6 +26,6 @@ matter_eventstructs_sources = [
 matter_clusters_sources = [
 {%- for cluster in clientClusters | sort(attribute='name') %}
 {%- set typeLookup = idl | createLookupContext(cluster) %}
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/{{cluster.name}}Cluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/{{cluster.name}}Cluster.kt",
 {%- endfor %}
 ]
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
@@ -89,10 +89,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag

diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
@@ -542,7 +542,7 @@ def boxed_java_signature(self):
             else:
                 return "Ljava/lang/Integer;"
         else:
-            return "Lchip/devicecontroller/ChipStructs${}Cluster{};".format(self.context.cluster.name, self.data_type.name)
+            return "Lchip/controller/ChipStructs${}Cluster{};".format(self.context.cluster.name, self.data_type.name)
 
 
 def GlobalEncodableValueFrom(typeName: str, context: TypeLookupContext) -> EncodableValue:
@@ -669,7 +669,7 @@ def internal_render_all(self):
 
         self.internal_render_one_output(
             template_path="MatterFiles_gni.jinja",
-            output_file_name="java/matter/devicecontroller/cluster/files.gni",
+            output_file_name="java/matter/controller/cluster/files.gni",
             vars={
                 'idl': self.idl,
                 'clientClusters': clientClusters,
@@ -678,7 +678,7 @@ def internal_render_all(self):
 
         # Generate a `.kt` file for each cluster.
         for cluster in clientClusters:
-            output_name = f"java/matter/devicecontroller/cluster/clusters/{cluster.name}Cluster.kt"
+            output_name = f"java/matter/controller/cluster/clusters/{cluster.name}Cluster.kt"
             self.internal_render_one_output(
                 template_path="MatterClusters.jinja",
                 output_file_name=output_name,
@@ -695,7 +695,7 @@ def internal_render_all(self):
                 if struct.tag:
                     continue
 
-                output_name = "java/matter/devicecontroller/cluster/structs/{cluster_name}Cluster{struct_name}.kt"
+                output_name = "java/matter/controller/cluster/structs/{cluster_name}Cluster{struct_name}.kt"
                 self.internal_render_one_output(
                     template_path="MatterStructs.jinja",
                     output_file_name=output_name.format(
@@ -712,7 +712,7 @@ def internal_render_all(self):
                 if not event.fields:
                     continue
 
-                output_name = "java/matter/devicecontroller/cluster/eventstructs/{cluster_name}Cluster{event_name}Event.kt"
+                output_name = "java/matter/controller/cluster/eventstructs/{cluster_name}Cluster{event_name}Event.kt"
                 self.internal_render_one_output(
                     template_path="MatterEventStructs.jinja",
                     output_file_name=output_name.format(

diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -352,7 +352,7 @@ kotlin_library("chipcluster_test") {
 
 kotlin_library("kotlin_matter_controller") {
   import(
-      "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni")
+      "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/files.gni")
 
   output_name = "KotlinMatterController.jar"
 

diff --git a/.../cluster/clusters/AccessControlCluster.kt → .../cluster/clusters/AccessControlCluster.kt b/.../cluster/clusters/AccessControlCluster.kt → .../cluster/clusters/AccessControlCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter

diff --git a/...r/cluster/clusters/AccountLoginCluster.kt → ...r/cluster/clusters/AccountLoginCluster.kt b/...r/cluster/clusters/AccountLoginCluster.kt → ...r/cluster/clusters/AccountLoginCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader

diff --git a/...roller/cluster/clusters/ActionsCluster.kt → ...roller/cluster/clusters/ActionsCluster.kt b/...roller/cluster/clusters/ActionsCluster.kt → ...roller/cluster/clusters/ActionsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader

diff --git a/...ActivatedCarbonFilterMonitoringCluster.kt → ...ActivatedCarbonFilterMonitoringCluster.kt b/...ActivatedCarbonFilterMonitoringCluster.kt → ...ActivatedCarbonFilterMonitoringCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter

diff --git a/...ters/AdministratorCommissioningCluster.kt → ...ters/AdministratorCommissioningCluster.kt b/...ters/AdministratorCommissioningCluster.kt → ...ters/AdministratorCommissioningCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader

diff --git a/...ler/cluster/clusters/AirQualityCluster.kt → ...ler/cluster/clusters/AirQualityCluster.kt b/...ler/cluster/clusters/AirQualityCluster.kt → ...ler/cluster/clusters/AirQualityCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 

diff --git a/...uster/clusters/ApplicationBasicCluster.kt → ...uster/clusters/ApplicationBasicCluster.kt b/...uster/clusters/ApplicationBasicCluster.kt → ...uster/clusters/ApplicationBasicCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 

diff --git a/...er/clusters/ApplicationLauncherCluster.kt → ...er/clusters/ApplicationLauncherCluster.kt b/...er/clusters/ApplicationLauncherCluster.kt → ...er/clusters/ApplicationLauncherCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader

diff --git a/...er/cluster/clusters/AudioOutputCluster.kt → ...er/cluster/clusters/AudioOutputCluster.kt b/...er/cluster/clusters/AudioOutputCluster.kt → ...er/cluster/clusters/AudioOutputCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader