Apply suggestions from code review

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
project-chip · Oct 13, 2021 · 2dafbf1 · 2dafbf1
1 parent 9142fd2
commit 2dafbf1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt
@@ -123,23 +123,18 @@ namespace Attributes {
 {{/first}}
 {{#if clusterRef}}
 namespace {{asUpperCamelCase label}} {
-    {{#if entryType}}
     struct TypeInfo {
+    {{#if entryType}}
         using Type = DataModel::List<{{zapTypeToEncodableClusterObjectType entryType}}>;
         using DecodableType = DataModel::DecodableList<{{zapTypeToDecodableClusterObjectType entryType}}>;
-
-        static constexpr ClusterId GetClusterId() { return {{asUpperCamelCase parent.name}}::Id; }
-        static constexpr AttributeId GetAttributeId() { return Attributes::{{asUpperCamelCase label}}::Id; }
-    };
     {{else}}
-    struct TypeInfo {
         using Type = {{zapTypeToEncodableClusterObjectType type}};
-        using DecodableType = Type;
+        using DecodableType = {{zapTypeToDecodableClusterObjectType type}};;
+    {{/if}}
 
         static constexpr ClusterId GetClusterId() { return {{asUpperCamelCase parent.name}}::Id; }
         static constexpr AttributeId GetAttributeId() { return Attributes::{{asUpperCamelCase label}}::Id; }
     };
-    {{/if}}
 } // namespace {{asUpperCamelCase label}}
 {{/if}}
 {{#last}}

diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js
@@ -380,7 +380,9 @@ async function zapTypeToClusterObjectType(type, isDecodable, options)
 {
   if (StringHelper.isCharString(type)) {
     return 'chip::Span<const char>';
-  } else if (type == 'single') {
+  }
+
+  if (type == 'single') {
     return 'float';
   }