Fixed the issues with ambiguous base methods

Author: nivi-apple

src/app/clusters/thermostat-server/apple-thermostat-extension-delegate.h

@@ -8,13 +8,9 @@
 
 #pragma once
 
-#include "apple-thermostat-extension-server.h"
-
 #include <app-common/zap-generated/cluster-objects.h>
 #include <protocols/interaction_model/StatusCode.h>
 
-//using ApplePresetInternalStruct = chip::app::Clusters::Thermostat::ApplePresetInternalStruct;
-
 namespace chip {
 namespace app {
 namespace Clusters {
@@ -68,7 +64,7 @@ class Delegate
      * @param[out] presetType The preset type  at the given index in the list.
      * @return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED if the index is out of range for the preset types list.
      */
-    virtual CHIP_ERROR GetApplePresetTypeAtIndex(size_t index, Structs::ApplePresetTypeStruct::Type & presetType) = 0;
+    virtual CHIP_ERROR GetApplePresetTypeAtIndex(size_t index, ApplePresetInternalStruct & presetType) = 0;
 
     /**
      * @brief Get the AppleNumberOfPresets attribute value.
@@ -84,7 +80,7 @@ class Delegate
      * @param[out] preset The preset at the given index in the list.
      * @return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED if the index is out of range for the presets list.
      */
-    virtual CHIP_ERROR GetApplePresetAtIndex(size_t index, Structs::ApplePresetStruct::Type & preset) = 0;
+    virtual CHIP_ERROR GetApplePresetAtIndex(size_t index, ApplePresetInternalStruct & preset) = 0;
 
     /**
      * @brief Get the Apple active preset handle.
@@ -119,7 +115,7 @@ class Delegate
      * @return CHIP_NO_ERROR if the preset was appended to the list successfully.
      * @return CHIP_ERROR if there was an error adding the preset to the list.
      */
-    virtual CHIP_ERROR AppendToPendingPresetList(Structs::ApplePresetStruct::Type & preset) = 0;
+    virtual CHIP_ERROR AppendToPendingPresetList(ApplePresetInternalStruct & preset) = 0;
 
     /**
      * @brief Get the Preset at a given index in the pending presets list. The callee needs to copy the
@@ -129,7 +125,7 @@ class Delegate
      * @param[out] preset The preset at the given index in the list.
      * @return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED if the index is out of range for the pending presets list.
      */
-    virtual CHIP_ERROR GetPendingPresetAtIndex(size_t index, Structs::ApplePresetStruct::Type & preset) = 0;
+    virtual CHIP_ERROR GetPendingPresetAtIndex(size_t index, ApplePresetInternalStruct & preset) = 0;
 
     /**
      * @brief Returns the count of preset entries in the pending presets list that have the matching presetHandle.

src/app/clusters/thermostat-server/apple-thermostat-extension-server.cpp

@@ -59,16 +59,16 @@ void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate)
  * @return true If the preset is valid i.e the PresetHandle if not null fits within size constraints and the presetScenario enum
  *         value is valid. Otherwise, return false.
  */
-bool IsValidPresetEntry(ApplePresetInternalStruct & preset)
+bool IsValidPresetEntry(ApplePresetStruct::Type & preset)
 {
     // If the presetHandle is not null, the size of the handle should not exceed 16 bytes.
-    if (!preset.GetPresetHandleData().IsNull() && preset.GetPresetHandleData().Value().size() > kAppleActivePresetHandleSize)
+    if (!preset.presetHandle.IsNull() && preset.presetHandle.Value().size() > kAppleActivePresetHandleSize)
     {
         return false;
     }
 
     // Return true if the preset scenario is valid, false otherwise.
-    return (preset.GetPresetScenario() != ApplePresetScenarioEnum::kUnknownEnumValue);
+    return (preset.presetScenario != ApplePresetScenarioEnum::kUnknownEnumValue);
 }
 
 void AppleThermostatExtAttrAccess::SetThermostatAttrAccess(ThermostatAttrAccess * thermostatAttrAccessPtr)
@@ -249,7 +249,7 @@ CHIP_ERROR AppleThermostatExtAttrAccess::Write(const ConcreteDataAttributePath &
             auto iter = newPresets.begin();
             while (iter.Next())
             {
-                ApplePresetInternalStruct preset = ApplePresetInternalStruct(iter.GetValue());
+                ApplePresetStruct::Type preset = iter.GetValue();
                 if (IsValidPresetEntry(preset))
                 {
                     ReturnErrorOnFailure(delegate->AppendToPendingPresetList(preset));
@@ -266,7 +266,7 @@ CHIP_ERROR AppleThermostatExtAttrAccess::Write(const ConcreteDataAttributePath &
         // If the list operation is AppendItem, call the delegate to append to the list of pending presets.
         if (aPath.mListOp == ConcreteDataAttributePath::ListOperation::AppendItem)
         {
-            ApplePresetInternalStruct preset;
+            ApplePresetStruct::Type preset;
             ReturnErrorOnFailure(aDecoder.Decode(preset));
             if (IsValidPresetEntry(preset))
             {
@@ -437,9 +437,9 @@ void ExtendTimer(EndpointId endpoint, uint16_t timeoutSeconds)
  *
  * @return true If the preset is built-in, false otherwise.
  */
-bool IsBuiltIn(const ApplePresetInternalStruct preset)
+bool IsBuiltIn(ApplePresetInternalStruct preset)
 {
-    return preset.builtIn.ValueOr(false);
+    return preset.GetBuiltIn().ValueOr(false);
 }
 
 /**
@@ -854,7 +854,7 @@ bool emberAfThermostatClusterAppleCommitPresetsSchedulesRequestCallback(
 
         // #8. Find the number of presets in the pending preset list that match the preset handle. If there are more than 2
         // entries, return CONSTRAINT_ERROR.
-        uint8_t count = delegate->CountPresetInPendingListWithPresetHandle(pendingPreset.presetHandle.Value());
+        uint8_t count = delegate->CountPresetInPendingListWithPresetHandle(pendingPreset.GetPresetHandleData().Value());
         if (count >= 2)
         {
             return sendResponseAndCleanUp(delegate, endpoint, commandObj, commandPath, Status::ConstraintError);

src/app/clusters/thermostat-server/apple-thermostat-extension-server.h

@@ -25,7 +25,7 @@ namespace app {
 namespace Clusters {
 namespace Thermostat {
 
-struct ApplePresetInternalStruct : public Structs::ApplePresetStruct::Type
+struct ApplePresetInternalStruct :  protected Structs::ApplePresetStruct::Type
 {
 public:
     ApplePresetInternalStruct() = default;
@@ -44,6 +44,8 @@ struct ApplePresetInternalStruct : public Structs::ApplePresetStruct::Type
     int16_t GetHeatingSetpoint();
     DataModel::Nullable<bool> GetBuiltIn();
 
+    using Structs::ApplePresetStruct::Type::Encode;
+
 private:
     ByteSpan presetHandleData;
 };