Replaced the use of ->Decode with DataModel::Decode.

Author: hicklin

src/app/clusters/basic-information/basic-information-cluster-objects.h

@@ -10,10 +10,10 @@ namespace Clusters {
 namespace BasicInformation {
 
 const uint32_t kMaxDeviceLocationNameLength = 128;
-using DeviceLocatioType = Attributes::DeviceLocation::TypeInfo::Type;
+using DeviceLocationType                    = Attributes::DeviceLocation::TypeInfo::Type;
 
 
-struct MutableDeviceLocation : public DeviceLocatioType
+struct MutableDeviceLocation : public DeviceLocationType
 {
     MutableDeviceLocation() {
         MutableDeviceLocation(CharSpan(mLocationNameBuffer, 0), DataModel::NullNullable, DataModel::NullNullable);
@@ -24,6 +24,12 @@ struct MutableDeviceLocation : public DeviceLocatioType
     }
 
     MutableDeviceLocation & operator = (const MutableDeviceLocation & other) {
+        if (other.IsNull())
+        {
+            this->SetNull();
+            return *this;
+        }
+
         Set(other->locationName, other->floorNumber, other->areaType);
         return *this;
     }
@@ -32,8 +38,7 @@ struct MutableDeviceLocation : public DeviceLocatioType
         *this = other;
     }
 
-    // todo is this needed?
-    MutableDeviceLocation & operator = (const DeviceLocatioType & other) {
+    MutableDeviceLocation & operator = (const DeviceLocationType & other) {
         if (other.IsNull())
         {
             this->SetNull();
@@ -45,7 +50,9 @@ struct MutableDeviceLocation : public DeviceLocatioType
     }
 
     /**
-     * @brief Set the location name, floor number, and area type tag. The location name is truncated to kMaxDeviceLocationNameLength. The location name is deep copied.
+     * @brief Set the location name, floor number, and area type tag.
+     * The location name is truncated to kMaxDeviceLocationNameLength.
+     * The location name is deep copied.
     */
     void Set(CharSpan aLocationName, DataModel::Nullable<int16_t> aFloorNumber, DataModel::Nullable<AreaTypeTag> aAreaTypeTag) {
 
@@ -64,8 +71,6 @@ struct MutableDeviceLocation : public DeviceLocatioType
         this->Value().areaType = aAreaTypeTag;
     }
 
-    // todo add setters and getters for all the attributes
-
 private:
     char mLocationNameBuffer[kMaxDeviceLocationNameLength] = { 0 };
 };

src/app/clusters/basic-information/basic-information.cpp

@@ -433,7 +433,7 @@ CHIP_ERROR BasicAttrAccess::ReadDeviceLocation(AttributeValueEncoder & aEncoder)
 
 CHIP_ERROR BasicAttrAccess::WriteDeviceLocation(AttributeValueDecoder & aDecoder)
 {
-    DeviceLocatioType deviceLocation;
+    DeviceLocationType deviceLocation;
 
     ReturnErrorOnFailure(aDecoder.Decode(deviceLocation));
 

src/include/platform/ConfigurationManager.h

@@ -40,7 +40,7 @@
 #include <platform/PersistedStorage.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
-using DeviceLocatioType = chip::app::Clusters::BasicInformation::Attributes::DeviceLocation::TypeInfo::Type;
+using DeviceLocationType    = chip::app::Clusters::BasicInformation::Attributes::DeviceLocation::TypeInfo::Type;
 using MutableDeviceLocation = chip::app::Clusters::BasicInformation::MutableDeviceLocation;
 
 namespace chip {
@@ -138,7 +138,7 @@ class ConfigurationManager
     virtual CHIP_ERROR GetFailSafeArmed(bool & val)                                    = 0;
     virtual CHIP_ERROR SetFailSafeArmed(bool val)                                      = 0;
     virtual CHIP_ERROR GetDeviceLocation(MutableDeviceLocation & location)             = 0;
-    virtual CHIP_ERROR SetDeviceLocation(DeviceLocatioType location)                   = 0;
+    virtual CHIP_ERROR SetDeviceLocation(DeviceLocationType location)                  = 0;
 
     virtual CHIP_ERROR GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo) = 0;
 

src/include/platform/internal/GenericConfigurationManagerImpl.h

@@ -87,7 +87,7 @@ class GenericConfigurationManagerImpl : public ConfigurationManager
      * Expects that location is initialised with a locationName CharSpan pointing to a buffer of size kMaxDeviceLocationNameLength.
      */
     CHIP_ERROR GetDeviceLocation(MutableDeviceLocation & location) override;
-    CHIP_ERROR SetDeviceLocation(DeviceLocatioType location) override;
+    CHIP_ERROR SetDeviceLocation(DeviceLocationType location) override;
     CHIP_ERROR GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo) override;
     bool IsCommissionableDeviceTypeEnabled() override;
     CHIP_ERROR GetDeviceTypeId(uint32_t & deviceType) override;

src/include/platform/internal/GenericConfigurationManagerImpl.ipp

@@ -589,9 +589,10 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::SetFailSafeArmed(bool v
 template <class ConfigClass>
 CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetDeviceLocation(MutableDeviceLocation & location)
 {
-    uint8_t locationData[app::Clusters::BasicInformation::kMaxDeviceLocationNameLength + sizeof(DeviceLocatioType)];
+    uint8_t locationData[app::Clusters::BasicInformation::kMaxDeviceLocationNameLength + sizeof(DeviceLocationType)];
     MutableByteSpan locationSpan(locationData);
 
+    // If the location key is not found, assume a null location.
     size_t outLen = 0;
     auto err = ReadConfigValueBin(ConfigClass::kConfigKey_DeviceLocation, locationSpan.data(), locationSpan.size(), outLen);
     if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
@@ -604,34 +605,26 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetDeviceLocation(Mutab
     TLV::TLVReader tlvReader;
     tlvReader.Init(locationSpan);
 
-    char locationNameBuffer[1] = { 0 };
-    DeviceLocatioType loc({
-        .locationName = CharSpan(locationNameBuffer, 0),
-    });
+    DeviceLocationType loc;
 
     ReturnErrorOnFailure(tlvReader.Next(TLV::AnonymousTag()));
-    ReturnErrorOnFailure(loc->Decode(tlvReader));
-
-    // This would not be needed if the Decode methed proprly decodes a null value.
-    if (loc.Value().locationName.empty() && loc.Value().floorNumber.IsNull() && loc.Value().areaType.IsNull())
-    {
-        loc.SetNull();
-    }
+    ReturnErrorOnFailure(app::DataModel::Decode(tlvReader, loc));
 
     location = loc;
-
+ 
     return CHIP_NO_ERROR;
 }
+
 template <class ConfigClass>
-CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::SetDeviceLocation(DeviceLocatioType location)
+CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::SetDeviceLocation(DeviceLocationType location)
 {
-    uint8_t locationData[app::Clusters::BasicInformation::kMaxDeviceLocationNameLength + sizeof(DeviceLocatioType)];
+    uint8_t locationData[app::Clusters::BasicInformation::kMaxDeviceLocationNameLength + sizeof(DeviceLocationType)];
     MutableByteSpan locationSpan(locationData);
 
     TLV::TLVWriter tlvWriter;
     tlvWriter.Init(locationSpan);
 
-    ReturnErrorOnFailure(location->Encode(tlvWriter, TLV::AnonymousTag()));
+    ReturnErrorOnFailure(app::DataModel::Encode(tlvWriter, TLV::AnonymousTag(), location));
 
     ReturnErrorOnFailure(WriteConfigValueBin(ConfigClass::kConfigKey_DeviceLocation,
                                              static_cast<const uint8_t *>(locationSpan.data()), tlvWriter.GetLengthWritten()));