Reduce type character size of SceneTableImpl types

project-chip · Aug 2, 2023 · f499b5e · f499b5e
1 parent ed545c4
commit f499b5e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 22 deletions.
diff --git a/src/app/clusters/scenes-server/SceneTableImpl.cpp b/src/app/clusters/scenes-server/SceneTableImpl.cpp
@@ -19,13 +19,22 @@
 #include <lib/support/DefaultStorageKeyAllocator.h>
 #include <stdlib.h>
 
+template <typename T>
+using List = chip::app::DataModel::List<T>;
+
+template <typename T>
+using DecodableList = chip::app::DataModel::DecodableList<T>;
+
+using AttributeValuePairType          = chip::app::Clusters::Scenes::Structs::AttributeValuePair::Type;
+using AttributeValuePairDecodableType = chip::app::Clusters::Scenes::Structs::AttributeValuePair::DecodableType;
+using ExtensionFieldSetDecodableType  = chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType;
+using ExtensionFieldSetType           = chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type;
+
 namespace chip {
 namespace scenes {
 
 CHIP_ERROR
-DefaultSceneHandlerImpl::EncodeAttributeValueList(
-    const app::DataModel::List<app::Clusters::Scenes::Structs::AttributeValuePair::Type> & aVlist,
-    MutableByteSpan & serializedBytes)
+DefaultSceneHandlerImpl::EncodeAttributeValueList(const List<AttributeValuePairType> & aVlist, MutableByteSpan & serializedBytes)
 {
     TLV::TLVWriter writer;
     writer.Init(serializedBytes);
@@ -35,9 +44,8 @@ DefaultSceneHandlerImpl::EncodeAttributeValueList(
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DefaultSceneHandlerImpl::DecodeAttributeValueList(
-    const ByteSpan & serializedBytes,
-    app::DataModel::DecodableList<app::Clusters::Scenes::Structs::AttributeValuePair::DecodableType> & aVlist)
+CHIP_ERROR DefaultSceneHandlerImpl::DecodeAttributeValueList(const ByteSpan & serializedBytes,
+                                                             DecodableList<AttributeValuePairDecodableType> & aVlist)
 {
     TLV::TLVReader reader;
 
@@ -49,11 +57,10 @@ CHIP_ERROR DefaultSceneHandlerImpl::DecodeAttributeValueList(
 }
 
 CHIP_ERROR
-DefaultSceneHandlerImpl::SerializeAdd(EndpointId endpoint,
-                                      const app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType & extensionFieldSet,
+DefaultSceneHandlerImpl::SerializeAdd(EndpointId endpoint, const ExtensionFieldSetDecodableType & extensionFieldSet,
                                       MutableByteSpan & serializedBytes)
 {
-    app::Clusters::Scenes::Structs::AttributeValuePair::Type aVPairs[kMaxAvPair];
+    AttributeValuePairType aVPairs[kMaxAvPair];
 
     size_t pairTotal = 0;
     // Verify size of list
@@ -68,15 +75,15 @@ DefaultSceneHandlerImpl::SerializeAdd(EndpointId endpoint,
         pairCount++;
     }
     ReturnErrorOnFailure(pair_iterator.GetStatus());
-    app::DataModel::List<app::Clusters::Scenes::Structs::AttributeValuePair::Type> attributeValueList(aVPairs, pairCount);
+    List<AttributeValuePairType> attributeValueList(aVPairs, pairCount);
 
     return EncodeAttributeValueList(attributeValueList, serializedBytes);
 }
 
 CHIP_ERROR DefaultSceneHandlerImpl::Deserialize(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes,
-                                                app::Clusters::Scenes::Structs::ExtensionFieldSet::Type & extensionFieldSet)
+                                                ExtensionFieldSetType & extensionFieldSet)
 {
-    app::DataModel::DecodableList<app::Clusters::Scenes::Structs::AttributeValuePair::DecodableType> attributeValueList;
+    DecodableList<AttributeValuePairDecodableType> attributeValueList;
 
     ReturnErrorOnFailure(DecodeAttributeValueList(serializedBytes, attributeValueList));
 

diff --git a/src/app/clusters/scenes-server/SceneTableImpl.h b/src/app/clusters/scenes-server/SceneTableImpl.h
@@ -39,6 +39,18 @@ using clusterId = chip::ClusterId;
 ///        (Color control cluster), the Extension Field Set's value pair list TLV occupies 99 bytes of memory
 class DefaultSceneHandlerImpl : public scenes::SceneHandler
 {
+
+    template <typename T>
+    using List = chip::app::DataModel::List<T>;
+
+    template <typename T>
+    using DecodableList = chip::app::DataModel::DecodableList<T>;
+
+    using AttributeValuePairType          = chip::app::Clusters::Scenes::Structs::AttributeValuePair::Type;
+    using AttributeValuePairDecodableType = chip::app::Clusters::Scenes::Structs::AttributeValuePair::DecodableType;
+    using ExtensionFieldSetDecodableType  = chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType;
+    using ExtensionFieldSetType           = chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type;
+
 public:
     static constexpr uint8_t kMaxAvPair = CHIP_CONFIG_SCENES_MAX_AV_PAIRS_EFS;
 
@@ -49,27 +61,23 @@ class DefaultSceneHandlerImpl : public scenes::SceneHandler
     /// @param aVlist[in] Attribute value list to encode
     /// @param serializedBytes[out] Buffer to fill from the Attribute value list in a TLV format
     /// @return CHIP_ERROR
-    virtual CHIP_ERROR
-    EncodeAttributeValueList(const app::DataModel::List<app::Clusters::Scenes::Structs::AttributeValuePair::Type> & aVlist,
-                             MutableByteSpan & serializedBytes);
+    virtual CHIP_ERROR EncodeAttributeValueList(const List<AttributeValuePairType> & aVlist, MutableByteSpan & serializedBytes);
 
     /// @brief Decodes an attribute value list from a TLV structure and ensure it fits the member pair buffer
     /// @param serializedBytes [in] Buffer to read from
     /// @param aVlist [out] Attribute value list to fill from the TLV structure.  Only valid while the buffer backing
     /// serializedBytes exists and its contents are not modified.
     /// @return CHIP_ERROR
-    virtual CHIP_ERROR DecodeAttributeValueList(
-        const ByteSpan & serializedBytes,
-        app::DataModel::DecodableList<app::Clusters::Scenes::Structs::AttributeValuePair::DecodableType> & aVlist);
+    virtual CHIP_ERROR DecodeAttributeValueList(const ByteSpan & serializedBytes,
+                                                DecodableList<AttributeValuePairDecodableType> & aVlist);
 
     /// @brief From command AddScene, allows handler to filter through clusters in command to serialize only the supported ones.
     /// @param endpoint[in] Endpoint ID
     /// @param extensionFieldSet[in] ExtensionFieldSets provided by the AddScene Command, pre initialized
     /// @param serializedBytes[out] Buffer to fill from the ExtensionFieldSet in command
     /// @return CHIP_NO_ERROR if successful, CHIP_ERROR_INVALID_ARGUMENT if the cluster is not supported, CHIP_ERROR value
     /// otherwise
-    virtual CHIP_ERROR SerializeAdd(EndpointId endpoint,
-                                    const app::Clusters::Scenes::Structs::ExtensionFieldSet::DecodableType & extensionFieldSet,
+    virtual CHIP_ERROR SerializeAdd(EndpointId endpoint, const ExtensionFieldSetDecodableType & extensionFieldSet,
                                     MutableByteSpan & serializedBytes) override;
 
     /// @brief Simulates taking data from nvm and loading it in a command object if the cluster is supported by the endpoint
@@ -79,10 +87,10 @@ class DefaultSceneHandlerImpl : public scenes::SceneHandler
     /// @return CHIP_NO_ERROR if Extension Field Set was successfully populated, CHIP_ERROR_INVALID_ARGUMENT if the cluster is not
     /// supported, specific CHIP_ERROR otherwise
     virtual CHIP_ERROR Deserialize(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes,
-                                   app::Clusters::Scenes::Structs::ExtensionFieldSet::Type & extensionFieldSet) override;
+                                   ExtensionFieldSetType & extensionFieldSet) override;
 
 private:
-    app::Clusters::Scenes::Structs::AttributeValuePair::Type mAVPairs[kMaxAvPair];
+    AttributeValuePairType mAVPairs[kMaxAvPair];
 };
 
 /**