Use zcl cluster for chip client callbacks (#26952)

* Use zcl_clusters instead of all_user_clusters * zap regen all * Move CHIPClientCallbacks.zapt into src/controller/java/templates * Remove one more instance from CHIPClientCallbacks.h * Remove more referencese to CHIPClientCallbacks.h * Move file to the right location and regen-all * update a LOT of paths to the new java-generated path * Test regen * Restyled by clang-format --------- Co-authored-by: Andrei Litvin <[email protected]> Co-authored-by: Restyled.io <[email protected]>
project-chip · Aug 8, 2023 · 1077202 · 1077202
1 parent a04d23e
commit 1077202
Show file tree

Hide file tree

Showing 33 changed files with 1,215 additions and 112 deletions.
diff --git a/build/chip/chip_codegen.cmake b/build/chip/chip_codegen.cmake
@@ -108,7 +108,6 @@ endfunction()
 #      GENERATOR "app-templates"
 #      OUTPUTS
 #            "zap-generated/access.h",
-#            "zap-generated/CHIPClientCallbacks.h",
 #            "zap-generated/CHIPClusters.h"
 #            "zap-generated/endpoint_config.h",
 #            "zap-generated/gen_config.h",
@@ -164,7 +163,6 @@ function(chip_zapgen TARGET_NAME)
                 "${CHIP_ROOT}/src/app/zap-templates/partials/header.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/access.zapt"
-                "${CHIP_ROOT}/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/CHIPClusters.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/endpoint_config.zapt"
                 "${CHIP_ROOT}/src/app/zap-templates/templates/app/gen_config.zapt"

diff --git a/build/chip/chip_codegen.gni b/build/chip/chip_codegen.gni
@@ -135,7 +135,6 @@ template("_chip_build_time_zapgen") {
 
       # Application templates, actually generating files
       "${_template_dir}/access.zapt",
-      "${_template_dir}/CHIPClientCallbacks.zapt",
       "${_template_dir}/CHIPClusters.zapt",
       "${_template_dir}/endpoint_config.zapt",
       "${_template_dir}/gen_config.zapt",

diff --git a/build/chip/esp32/esp32_codegen.cmake b/build/chip/esp32/esp32_codegen.cmake
@@ -60,7 +60,6 @@ macro(chip_app_component_zapgen ZAP_NAME)
       GENERATOR "app-templates"
       OUTPUTS
             "zap-generated/access.h"
-            "zap-generated/CHIPClientCallbacks.h"
             "zap-generated/CHIPClusters.h"
             "zap-generated/endpoint_config.h"
             "zap-generated/gen_config.h"

diff --git a/scripts/py_matter_idl/matter_idl/generators/java/CHIPReadCallbacks_h.jinja b/scripts/py_matter_idl/matter_idl/generators/java/CHIPReadCallbacks_h.jinja
@@ -20,7 +20,7 @@
 #include <jni.h>
 #include <lib/support/ErrorStr.h>
 #include <lib/support/JniReferences.h>
-#include <zap-generated/CHIPClientCallbacks.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 
 {% for type in globalTypes -%}
 class CHIP{{type.name}}AttributeCallback : public chip::Callback::Callback<{{type.name}}AttributeCallback>

diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ChipClustersCpp.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ChipClustersCpp.jinja
@@ -92,8 +92,8 @@
 #include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>
 #include <controller/java/CHIPDefaultCallbacks.h>

diff --git a/..._matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/jni/CHIPReadReadCallbacks.h b/..._matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/jni/CHIPReadReadCallbacks.h
@@ -20,7 +20,7 @@
 #include <jni.h>
 #include <lib/support/ErrorStr.h>
 #include <lib/support/JniReferences.h>
-#include <zap-generated/CHIPClientCallbacks.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 
 class CHIPBooleanAttributeCallback : public chip::Callback::Callback<BooleanAttributeCallback>
 {

diff --git a/..._idl/tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp b/..._idl/tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp
@@ -4,8 +4,8 @@
 #include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>
 #include <controller/java/CHIPDefaultCallbacks.h>

diff --git a/...y_matter_idl/matter_idl/tests/outputs/global_struct_attribute/jni/CHIPReadReadCallbacks.h b/...y_matter_idl/matter_idl/tests/outputs/global_struct_attribute/jni/CHIPReadReadCallbacks.h
@@ -20,7 +20,7 @@
 #include <jni.h>
 #include <lib/support/ErrorStr.h>
 #include <lib/support/JniReferences.h>
-#include <zap-generated/CHIPClientCallbacks.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 
 class CHIPBooleanAttributeCallback : public chip::Callback::Callback<BooleanAttributeCallback>
 {

diff --git a/...r_idl/tests/outputs/global_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp b/...r_idl/tests/outputs/global_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp
@@ -4,8 +4,8 @@
 #include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>
 #include <controller/java/CHIPDefaultCallbacks.h>

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/optional_argument/jni/CHIPReadReadCallbacks.h b/scripts/py_matter_idl/matter_idl/tests/outputs/optional_argument/jni/CHIPReadReadCallbacks.h
@@ -20,7 +20,7 @@
 #include <jni.h>
 #include <lib/support/ErrorStr.h>
 #include <lib/support/JniReferences.h>
-#include <zap-generated/CHIPClientCallbacks.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 
 class CHIPBooleanAttributeCallback : public chip::Callback::Callback<BooleanAttributeCallback>
 {

diff --git a/...dl/matter_idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp b/...dl/matter_idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp
@@ -4,8 +4,8 @@
 #include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>
 #include <controller/java/CHIPDefaultCallbacks.h>

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/jni/CHIPReadReadCallbacks.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/jni/CHIPReadReadCallbacks.h
@@ -20,7 +20,7 @@
 #include <jni.h>
 #include <lib/support/ErrorStr.h>
 #include <lib/support/JniReferences.h>
-#include <zap-generated/CHIPClientCallbacks.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 
 class CHIPBooleanAttributeCallback : public chip::Callback::Callback<BooleanAttributeCallback>
 {

diff --git a/...ter_idl/matter_idl/tests/outputs/several_clusters/jni/FirstClient-InvokeSubscribeImpl.cpp b/...ter_idl/matter_idl/tests/outputs/several_clusters/jni/FirstClient-InvokeSubscribeImpl.cpp
@@ -4,8 +4,8 @@
 #include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>
 #include <controller/java/CHIPDefaultCallbacks.h>

diff --git a/...er_idl/matter_idl/tests/outputs/several_clusters/jni/SecondClient-InvokeSubscribeImpl.cpp b/...er_idl/matter_idl/tests/outputs/several_clusters/jni/SecondClient-InvokeSubscribeImpl.cpp
@@ -4,8 +4,8 @@
 #include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>
 #include <controller/java/CHIPDefaultCallbacks.h>

diff --git a/...ter_idl/matter_idl/tests/outputs/several_clusters/jni/ThirdClient-InvokeSubscribeImpl.cpp b/...ter_idl/matter_idl/tests/outputs/several_clusters/jni/ThirdClient-InvokeSubscribeImpl.cpp
@@ -4,8 +4,8 @@
 #include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>
 #include <controller/java/CHIPDefaultCallbacks.h>

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/jni/CHIPReadReadCallbacks.h b/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/jni/CHIPReadReadCallbacks.h
@@ -20,7 +20,7 @@
 #include <jni.h>
 #include <lib/support/ErrorStr.h>
 #include <lib/support/JniReferences.h>
-#include <zap-generated/CHIPClientCallbacks.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 
 class CHIPBooleanAttributeCallback : public chip::Callback::Callback<BooleanAttributeCallback>
 {

diff --git a/...idl/matter_idl/tests/outputs/simple_attribute/jni/MyClusterClient-InvokeSubscribeImpl.cpp b/...idl/matter_idl/tests/outputs/simple_attribute/jni/MyClusterClient-InvokeSubscribeImpl.cpp
@@ -4,8 +4,8 @@
 #include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>
 #include <controller/java/CHIPDefaultCallbacks.h>

diff --git a/scripts/tools/zap/tests/available_tests.yaml b/scripts/tools/zap/tests/available_tests.yaml
@@ -15,7 +15,6 @@ inputs/all-clusters-app.zap:
         CHIPClusters.h: outputs/all-clusters-app/app-templates/CHIPClusters.h
         endpoint_config.h: outputs/all-clusters-app/app-templates/endpoint_config.h
         gen_config.h: outputs/all-clusters-app/app-templates/gen_config.h
-        CHIPClientCallbacks.h: outputs/all-clusters-app/app-templates/CHIPClientCallbacks.h
         access.h: outputs/all-clusters-app/app-templates/access.h
         IMClusterCommandHandler.cpp: outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp
 
@@ -24,6 +23,5 @@ inputs/lighting-app.zap:
         CHIPClusters.h: outputs/lighting-app/app-templates/CHIPClusters.h
         endpoint_config.h: outputs/lighting-app/app-templates/endpoint_config.h
         gen_config.h: outputs/lighting-app/app-templates/gen_config.h
-        CHIPClientCallbacks.h: outputs/lighting-app/app-templates/CHIPClientCallbacks.h
         access.h: outputs/lighting-app/app-templates/access.h
         IMClusterCommandHandler.cpp: outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClientCallbacks.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClientCallbacks.h
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClientCallbacks.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClientCallbacks.h
diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake
@@ -116,7 +116,6 @@ function(chip_configure_data_model APP_TARGET)
         GENERATOR "app-templates"
         OUTPUTS
               "zap-generated/access.h"
-              "zap-generated/CHIPClientCallbacks.h"
               "zap-generated/CHIPClusters.h"
               "zap-generated/endpoint_config.h"
               "zap-generated/gen_config.h"

diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
@@ -69,7 +69,6 @@ template("chip_data_model") {
       "zap-generated/access.h",
       "zap-generated/gen_config.h",
       "zap-generated/endpoint_config.h",
-      "zap-generated/CHIPClientCallbacks.h",
     ]
 
     if (chip_code_pre_generated_directory == "") {

diff --git a/src/app/zap-templates/app-templates.json b/src/app/zap-templates/app-templates.json
@@ -34,11 +34,6 @@
             "name": "ZCL gen_config header",
             "output": "gen_config.h"
         },
-        {
-            "path": "templates/app/CHIPClientCallbacks.zapt",
-            "name": "CHIP Client Callbacks header",
-            "output": "CHIPClientCallbacks.h"
-        },
         {
             "path": "templates/app/im-cluster-command-handler.zapt",
             "name": "CHIP Client Callbacks for Interaction Model",

diff --git a/src/controller/java/CHIPDefaultCallbacks.h b/src/controller/java/CHIPDefaultCallbacks.h
@@ -1,7 +1,7 @@
 #include <jni.h>
 
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <lib/core/CHIPError.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
 #include <jni/CHIPCallbackTypes.h>
 

diff --git a/...es/templates/app/CHIPClientCallbacks.zapt → ...r/java/templates/CHIPClientCallbacks.zapt b/...es/templates/app/CHIPClientCallbacks.zapt → ...r/java/templates/CHIPClientCallbacks.zapt
@@ -11,11 +11,11 @@
 #include <lib/support/Span.h>
 
 // List specific responses
-{{#all_user_clusters side='client'}}
+{{#zcl_clusters}}
 {{#zcl_attributes_server removeKeys='isOptional'}}
 {{#if isArray}}
 typedef void (*{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}ListAttributeCallback)(void * context, {{zapTypeToDecodableClusterObjectType type ns=parent.name isArgument=true}} data);
 {{/if}}
 {{/zcl_attributes_server}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
diff --git a/src/controller/java/templates/CHIPClustersWrite-JNI.zapt b/src/controller/java/templates/CHIPClustersWrite-JNI.zapt
@@ -4,8 +4,8 @@
 #include "CHIPInvokeCallbacks.h"
 
 #include <app-common/zap-generated/cluster-objects.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 #include <zap-generated/CHIPClusters.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 
 #include <controller/java/AndroidCallbacks.h>
 #include <controller/java/AndroidClusterExceptions.h>

diff --git a/src/controller/java/templates/CHIPInvokeCallbacks.zapt b/src/controller/java/templates/CHIPInvokeCallbacks.zapt
@@ -3,7 +3,7 @@
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <jni.h>
-#include <zap-generated/CHIPClientCallbacks.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 
 namespace chip {
 

diff --git a/src/controller/java/templates/CHIPReadCallbacks-src.zapt b/src/controller/java/templates/CHIPReadCallbacks-src.zapt
@@ -1,7 +1,7 @@
 {{> header}}
 #include <jni/CHIPReadCallbacks.h>
 
-#include <zap-generated/CHIPClientCallbacks.h>
+#include <controller/java/zap-generated/CHIPClientCallbacks.h>
 
 #include <jni.h>
 #include <lib/support/JniReferences.h>

diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json
@@ -49,6 +49,11 @@
             "name": "CHIP cluster invoke callbacks for Java (native code)",
             "output": "src/controller/java/zap-generated/CHIPInvokeCallbacks.h"
         },
+        {
+            "path": "CHIPClientCallbacks.zapt",
+            "name": "CHIP Client Callbacks header",
+            "output": "src/controller/java/zap-generated/CHIPClientCallbacks.h"
+        },
         {
             "path": "CHIPInvokeCallbacks-src.zapt",
             "name": "CHIP cluster invoke callbacks for Java (native code)",