Updates based on comments

Author: hasty

examples/all-clusters-app/all-clusters-common/src/power-topology-stub.cpp

@@ -30,19 +30,18 @@ namespace PowerTopology {
 class PowerTopologyDelegate : public Delegate
 {
 public:
-    PowerTopologyDelegate(EndpointId aEndpointId) : Delegate(aEndpointId) {}
     ~PowerTopologyDelegate() = default;
 
-    const CHIP_ERROR GetAvailableEndpointAtIndex(size_t index, EndpointId & endpointId) override;
-    const CHIP_ERROR GetActiveEndpointAtIndex(size_t index, EndpointId & endpointId) override;
+    CHIP_ERROR GetAvailableEndpointAtIndex(size_t index, EndpointId & endpointId) override;
+    CHIP_ERROR GetActiveEndpointAtIndex(size_t index, EndpointId & endpointId) override;
 };
 
-const CHIP_ERROR PowerTopologyDelegate::GetAvailableEndpointAtIndex(size_t index, EndpointId & endpointId)
+CHIP_ERROR PowerTopologyDelegate::GetAvailableEndpointAtIndex(size_t index, EndpointId & endpointId)
 {
     return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
 }
 
-const CHIP_ERROR PowerTopologyDelegate::GetActiveEndpointAtIndex(size_t index, EndpointId & endpointId)
+CHIP_ERROR PowerTopologyDelegate::GetActiveEndpointAtIndex(size_t index, EndpointId & endpointId)
 {
     return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
 }
@@ -60,7 +59,7 @@ void emberAfPowerTopologyClusterInitCallback(chip::EndpointId endpointId)
     VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
     VerifyOrDie(!gInstance);
 
-    gDelegate = std::make_unique<PowerTopologyDelegate>(endpointId);
+    gDelegate = std::make_unique<PowerTopologyDelegate>();
     if (gDelegate)
     {
         gInstance = std::make_unique<Instance>(

src/app/clusters/power-topology-server/power-topology-server.h

@@ -28,21 +28,30 @@ namespace app {
 namespace Clusters {
 namespace PowerTopology {
 
-using namespace chip::app::Clusters::PowerTopology::Attributes;
-
 using chip::Protocols::InteractionModel::Status;
 
 class Delegate
 {
 public:
-    Delegate(EndpointId aEndpointId) : mEndpointId(aEndpointId) {}
     virtual ~Delegate() = default;
 
-    virtual CHIP_ERROR const GetAvailableEndpointAtIndex(size_t index, EndpointId & endpointId) = 0;
-    virtual CHIP_ERROR const GetActiveEndpointAtIndex(size_t index, EndpointId & endpointId)    = 0;
+    /**
+     * Get the Nth EndpointId in the list of available endpoints.
+     * @param index The index of the EndpointId to be returned.
+     * @param endpointId A reference to the EndpointId.
+     * @return Returns a CHIP_NO_ERROR if there was no error and the EndpointId was returned successfully.
+     * CHIP_ERROR_PROVIDER_LIST_EXHAUSTED if the index is greater than or equal to the length of the list of available endpoints.
+     */
+    virtual CHIP_ERROR GetAvailableEndpointAtIndex(size_t index, EndpointId & endpointId) = 0;
 
-protected:
-    EndpointId mEndpointId = 0;
+    /**
+     * Get the Nth EndpointId in the list of active endpoints.
+     * @param index The index of the EndpointId to be returned.
+     * @param endpointId A reference to the EndpointId.
+     * @return Returns a CHIP_NO_ERROR if there was no error and the EndpointId was returned successfully.
+     * CHIP_ERROR_PROVIDER_LIST_EXHAUSTED if the index is greater than or equal to the length of the list of active endpoints.
+     */
+    virtual CHIP_ERROR GetActiveEndpointAtIndex(size_t index, EndpointId & endpointId) = 0;
 };
 
 enum class OptionalAttributes : uint32_t