Address suggestion re: optionality conversion

Author: robszewczyk

examples/all-clusters-app/all-clusters-common/src/energy-preference-delegate.cpp

@@ -30,10 +30,10 @@ struct EPrefDelegate : public Delegate
     virtual ~EPrefDelegate();
 
     CHIP_ERROR GetEnergyBalanceAtIndex(chip::EndpointId aEndpoint, size_t aIndex, chip::Percent & aOutStep,
-                                       chip::MutableCharSpan & aOutLabel) override;
+                                       chip::Optional<chip::MutableCharSpan> & aOutLabel) override;
     CHIP_ERROR GetEnergyPriorityAtIndex(chip::EndpointId aEndpoint, size_t aIndex, EnergyPriorityEnum & priority) override;
     CHIP_ERROR GetLowPowerModeSensitivityAtIndex(chip::EndpointId aEndpoint, size_t aIndex, chip::Percent & aOutStep,
-                                                 chip::MutableCharSpan & aOutLabel) override;
+                                                 chip::Optional<chip::MutableCharSpan> & aOutLabel) override;
 
     size_t GetNumEnergyBalances(chip::EndpointId aEndpoint) override;
     size_t GetNumLowPowerModeSensitivities(chip::EndpointId aEndpoint) override;
@@ -63,12 +63,19 @@ size_t EPrefDelegate::GetNumLowPowerModeSensitivities(chip::EndpointId aEndpoint
 
 CHIP_ERROR
 EPrefDelegate::GetEnergyBalanceAtIndex(chip::EndpointId aEndpoint, size_t aIndex, chip::Percent & aOutStep,
-                                       chip::MutableCharSpan & aOutLabel)
+                                       chip::Optional<chip::MutableCharSpan> & aOutLabel)
 {
     if (aIndex < GetNumEnergyBalances(aEndpoint))
     {
         aOutStep = gsEnergyBalances[aIndex].step;
-        chip::CopyCharSpanToMutableCharSpan(gsEnergyBalances[aIndex].label.ValueOr(""_span), aOutLabel);
+        if (gsEnergyBalances[aIndex].HasValue())
+        {
+            chip::CopyCharSpanToMutableCharSpan(gsEnergyBalances[aIndex].label.Value(), aOutLabel.Value());
+        }
+        else
+        {
+            aOutLabel.ClearValue();
+        }
         return CHIP_NO_ERROR;
     }
     return CHIP_ERROR_NOT_FOUND;
@@ -90,12 +97,19 @@ EPrefDelegate::GetEnergyPriorityAtIndex(chip::EndpointId aEndpoint, size_t aInde
 
 CHIP_ERROR
 EPrefDelegate::GetLowPowerModeSensitivityAtIndex(chip::EndpointId aEndpoint, size_t aIndex, chip::Percent & aOutStep,
-                                                 chip::MutableCharSpan & aOutLabel)
+                                                 chip::Optional<chip::MutableCharSpan> & aOutLabel)
 {
     if (aIndex < GetNumLowPowerModeSensitivities(aEndpoint))
     {
         aOutStep = gsPowerBalances[aIndex].step;
-        chip::CopyCharSpanToMutableCharSpan(gsPowerBalances[aIndex].label.ValueOr(""_span), aOutLabel);
+        if (gsPowerBalances[aIndex])
+        {
+            chip::CopyCharSpanToMutableCharSpan(gsPowerBalances[aIndex].label.Value(), aOutLabel.Value());
+        }
+        else
+        {
+            aOutLabel.ClearValue();
+        }
         return CHIP_NO_ERROR;
     }
 

src/app/clusters/energy-preference-server/energy-preference-server.cpp

@@ -71,12 +71,12 @@ CHIP_ERROR EnergyPrefAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
             return aEncoder.EncodeList([endpoint](const auto & encoder) -> CHIP_ERROR {
                 chip::Percent step;
                 char buffer[64];
-                chip::MutableCharSpan label(buffer);
+                chip::Optional<chip::MutableCharSpan> label{chip::MutableCharSpan(buffer)};
                 size_t index   = 0;
                 CHIP_ERROR err = CHIP_NO_ERROR;
                 while ((err = gsDelegate->GetEnergyBalanceAtIndex(endpoint, index, step, label)) == CHIP_NO_ERROR)
                 {
-                    BalanceStruct::Type balance = { step, Optional<CharSpan>(label) };
+                    BalanceStruct::Type balance = { step, label.HasValue() ? Optional<CharSpan>(label.Value()) : Optional<CharSpan>() };
                     ReturnErrorOnFailure(encoder.Encode(balance));
                     index++;
                 }
@@ -124,12 +124,12 @@ CHIP_ERROR EnergyPrefAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
             return aEncoder.EncodeList([endpoint](const auto & encoder) -> CHIP_ERROR {
                 chip::Percent step;
                 char buffer[64];
-                chip::MutableCharSpan label(buffer);
+                chip::Optional<chip::MutableCharSpan> label{chip::MutableCharSpan(buffer)};
                 size_t index   = 0;
                 CHIP_ERROR err = CHIP_NO_ERROR;
                 while ((err = gsDelegate->GetLowPowerModeSensitivityAtIndex(endpoint, index, step, label)) == CHIP_NO_ERROR)
                 {
-                    BalanceStruct::Type balance = { step, Optional<CharSpan>(label) };
+                    BalanceStruct::Type balance = { step, label.HasValue() ? Optional<CharSpan>(label.Value()) : Optional<CharSpan>() };
                     ReturnErrorOnFailure(encoder.Encode(balance));
                     index++;
                 }

src/app/clusters/energy-preference-server/energy-preference-server.h

@@ -53,7 +53,7 @@ struct Delegate
      * @return CHIP_ERROR_NOT_FOUND if the index is out of range.
      */
     virtual CHIP_ERROR GetEnergyBalanceAtIndex(chip::EndpointId aEndpoint, size_t aIndex, chip::Percent & aOutStep,
-                                               chip::MutableCharSpan & aOutLabel) = 0;
+                                               chip::Optional<chip::MutableCharSpan> & aOutLabel) = 0;
 
     /**
      * Get an Energy Priority.
@@ -84,7 +84,7 @@ struct Delegate
      * @return CHIP_ERROR_NOT_FOUND if the index is out of range.
      */
     virtual CHIP_ERROR GetLowPowerModeSensitivityAtIndex(chip::EndpointId aEndpoint, size_t aIndex, chip::Percent & aOutStep,
-                                                         chip::MutableCharSpan & aOutLabel) = 0;
+                                                         chip::Optional<chip::MutableCharSpan> & aOutLabel) = 0;
 
     /**
      * Get the number of energy balances this endpoint has.