From 265977159cbd3a207991f9693308f949ba5b960e Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 19 May 2023 13:51:36 -0400 Subject: [PATCH] Remove usage of if_enabled_clusters (#26689) * Remove usage of if_enabled_clusters * Update unit tests * zap regen all * zap regen all --- .../all-clusters-app/app-templates/CHIPClientCallbacks.h | 1 - .../outputs/all-clusters-app/app-templates/CHIPClusters.h | 2 -- .../outputs/lighting-app/app-templates/CHIPClientCallbacks.h | 1 - .../tests/outputs/lighting-app/app-templates/CHIPClusters.h | 2 -- src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt | 3 --- src/app/zap-templates/templates/app/CHIPClusters.zapt | 4 ---- src/controller/java/templates/ChipClusters-java.zapt | 4 +--- src/controller/java/templates/ChipIdLookup-java.zapt | 4 +--- src/controller/java/templates/ClusterInfo-java.zapt | 3 --- .../zap-generated/chip/devicecontroller/ChipClusters.java | 1 - .../zap-generated/chip/devicecontroller/ChipIdLookup.java | 1 - .../chip/devicecontroller/ClusterInfoMapping.java | 1 - .../controller-clusters/zap-generated/CHIPClientCallbacks.h | 1 - .../darwin/controller-clusters/zap-generated/CHIPClusters.h | 2 -- 14 files changed, 2 insertions(+), 28 deletions(-) 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 index fba215552b81e7..0a04bdceb3d257 100644 --- 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 @@ -16,7 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - #pragma once #include diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h index 9af15232480836..8601882bb35715 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h @@ -16,8 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - -// Prevent multiple inclusion #pragma once #include 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 index fba215552b81e7..0a04bdceb3d257 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClientCallbacks.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClientCallbacks.h @@ -16,7 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - #pragma once #include diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h index 9af15232480836..8601882bb35715 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h @@ -16,8 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - -// Prevent multiple inclusion #pragma once #include diff --git a/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt b/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt index d28b45a8f2032d..f08c912d2ada25 100644 --- a/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt +++ b/src/app/zap-templates/templates/app/CHIPClientCallbacks.zapt @@ -1,6 +1,4 @@ {{> header}} - -{{#if_enabled_clusters side='client'}} #pragma once #include @@ -21,4 +19,3 @@ typedef void (*{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}ListAttr {{/zcl_attributes_server}} {{/all_user_clusters}} -{{/if_enabled_clusters}} \ No newline at end of file diff --git a/src/app/zap-templates/templates/app/CHIPClusters.zapt b/src/app/zap-templates/templates/app/CHIPClusters.zapt index 2bf93e2c728fe2..05fab685053834 100644 --- a/src/app/zap-templates/templates/app/CHIPClusters.zapt +++ b/src/app/zap-templates/templates/app/CHIPClusters.zapt @@ -1,7 +1,4 @@ {{> header}} - -{{#if_enabled_clusters side='client'}} -// Prevent multiple inclusion #pragma once #include @@ -25,4 +22,3 @@ public: {{/all_user_clusters}} } // namespace Controller } // namespace chip -{{/if_enabled_clusters}} diff --git a/src/controller/java/templates/ChipClusters-java.zapt b/src/controller/java/templates/ChipClusters-java.zapt index 92621720aba6b4..59cd477d802c89 100644 --- a/src/controller/java/templates/ChipClusters-java.zapt +++ b/src/controller/java/templates/ChipClusters-java.zapt @@ -1,6 +1,4 @@ {{> header}} -{{#if_enabled_clusters side='client'}} - package chip.devicecontroller; import javax.annotation.Nullable; @@ -247,4 +245,4 @@ public class ChipClusters { {{/not_last}} {{/zcl_clusters}} } -{{/if_enabled_clusters}} + diff --git a/src/controller/java/templates/ChipIdLookup-java.zapt b/src/controller/java/templates/ChipIdLookup-java.zapt index cd2475af515b1a..55cd007cf195f7 100644 --- a/src/controller/java/templates/ChipIdLookup-java.zapt +++ b/src/controller/java/templates/ChipIdLookup-java.zapt @@ -1,6 +1,4 @@ {{> header}} -{{#if_enabled_clusters side='client'}} - package chip.devicecontroller; public final class ChipIdLookup { @@ -53,4 +51,4 @@ public final class ChipIdLookup { return ""; } } -{{/if_enabled_clusters}} \ No newline at end of file + diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt index cb4c9893c55413..53666f7b68424c 100644 --- a/src/controller/java/templates/ClusterInfo-java.zapt +++ b/src/controller/java/templates/ClusterInfo-java.zapt @@ -1,6 +1,4 @@ {{> header}} -{{#if_enabled_clusters side='client'}} - package chip.devicecontroller; import javax.annotation.Nullable; @@ -373,4 +371,3 @@ public class ClusterInfoMapping { } -{{/if_enabled_clusters}} \ No newline at end of file diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 9509b55b339371..1337fd000a1edc 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -16,7 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - package chip.devicecontroller; import java.util.ArrayList; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index f1f239b8133f51..c550130d9c7f19 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -16,7 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - package chip.devicecontroller; public final class ChipIdLookup { diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 71e67245b8e6ab..474738799cb898 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -16,7 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - package chip.devicecontroller; import chip.clusterinfo.ClusterCommandCallback; diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h index 3da35cb736de71..8166cd647a3d19 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -16,7 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - #pragma once #include diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h index 3397e837abf11f..9dc22ecc288536 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h @@ -16,8 +16,6 @@ */ // THIS FILE IS GENERATED BY ZAP - -// Prevent multiple inclusion #pragma once #include