Remove usage of if_enabled_clusters (#26689)

* Remove usage of if_enabled_clusters * Update unit tests * zap regen all * zap regen all
project-chip · Sep 1, 2023 · 2659771 · 2659771
1 parent 151a5a5
commit 2659771
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 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
@@ -16,7 +16,6 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
-
 #pragma once
 
 #include <app-common/zap-generated/cluster-objects.h>

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
@@ -16,8 +16,6 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
-
-// Prevent multiple inclusion
 #pragma once
 
 #include <app-common/zap-generated/ids/Clusters.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
@@ -16,7 +16,6 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
-
 #pragma once
 
 #include <app-common/zap-generated/cluster-objects.h>

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
@@ -16,8 +16,6 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
-
-// Prevent multiple inclusion
 #pragma once
 
 #include <app-common/zap-generated/ids/Clusters.h>

diff --git 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 <app/InteractionModelEngine.h>
@@ -21,4 +19,3 @@ typedef void (*{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}ListAttr
 {{/zcl_attributes_server}}
 {{/all_user_clusters}}
 
-{{/if_enabled_clusters}}
diff --git 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 <app-common/zap-generated/ids/Clusters.h>
@@ -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
@@ -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
@@ -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}}
+
diff --git 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}}
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h
diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
      */
     // THIS FILE IS GENERATED BY ZAP
     #pragma once
     #include <app-common/zap-generated/cluster-objects.h>
@@ Expand Down @@