EnergyPreference: Simplify logic around interaction with delegate (#32271)

robszewczyk · web-flow · commit f2bdd1fc34b6 · 2024-02-22T20:58:26.000Z
`Optional&lt;CharSpan&gt;` is directly constructible from `Optional&lt;MutableCharSpan&gt;`
diff --git a/src/app/clusters/energy-preference-server/energy-preference-server.cpp b/src/app/clusters/energy-preference-server/energy-preference-server.cpp
@@ -78,9 +78,7 @@ CHIP_ERROR EnergyPrefAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
                     Optional<MutableCharSpan> label{ MutableCharSpan(buffer) };
                     if ((err = gsDelegate->GetEnergyBalanceAtIndex(endpoint, index, step, label)) == CHIP_NO_ERROR)
                     {
-                        BalanceStruct::Type balance = { step,
-                                                        label.HasValue() ? Optional<CharSpan>(label.Value())
-                                                                         : Optional<CharSpan>() };
+                        BalanceStruct::Type balance = { step, Optional<CharSpan>(label) };
                         ReturnErrorOnFailure(encoder.Encode(balance));
                         index++;
                     }
@@ -137,9 +135,7 @@ CHIP_ERROR EnergyPrefAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
                     Optional<MutableCharSpan> label{ MutableCharSpan(buffer) };
                     if ((err = gsDelegate->GetLowPowerModeSensitivityAtIndex(endpoint, index, step, label)) == CHIP_NO_ERROR)
                     {
-                        BalanceStruct::Type balance = { step,
-                                                        label.HasValue() ? Optional<CharSpan>(label.Value())
-                                                                         : Optional<CharSpan>() };
+                        BalanceStruct::Type balance = { step, Optional<CharSpan>(label) };
                         ReturnErrorOnFailure(encoder.Encode(balance));
                         index++;
                     }

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,7 @@ CHIP_ERROR EnergyPrefAttrAccess::Read(const ConcreteReadAttributePath & aPath, A`
`78`	`78`	`Optional<MutableCharSpan> label{ MutableCharSpan(buffer) };`
`79`	`79`	`if ((err = gsDelegate->GetEnergyBalanceAtIndex(endpoint, index, step, label)) == CHIP_NO_ERROR)`
`80`	`80`	`{`
`81`		`- BalanceStruct::Type balance = { step,`
`82`		`- label.HasValue() ? Optional<CharSpan>(label.Value())`
`83`		`- : Optional<CharSpan>() };`
	`81`	`+ BalanceStruct::Type balance = { step, Optional<CharSpan>(label) };`
`84`	`82`	`ReturnErrorOnFailure(encoder.Encode(balance));`
`85`	`83`	`index++;`
`86`	`84`	`}`
`@@ -137,9 +135,7 @@ CHIP_ERROR EnergyPrefAttrAccess::Read(const ConcreteReadAttributePath & aPath, A`
`137`	`135`	`Optional<MutableCharSpan> label{ MutableCharSpan(buffer) };`
`138`	`136`	`if ((err = gsDelegate->GetLowPowerModeSensitivityAtIndex(endpoint, index, step, label)) == CHIP_NO_ERROR)`
`139`	`137`	`{`
`140`		`- BalanceStruct::Type balance = { step,`
`141`		`- label.HasValue() ? Optional<CharSpan>(label.Value())`
`142`		`- : Optional<CharSpan>() };`
	`138`	`+ BalanceStruct::Type balance = { step, Optional<CharSpan>(label) };`
`143`	`139`	`ReturnErrorOnFailure(encoder.Encode(balance));`
`144`	`140`	`index++;`
`145`	`141`	`}`