Update metadata-tree from MetadaList Foo(path) to CHIP_ERROR Foo(path, ListBuilder &)

src/app/InteractionModelEngine.cpp

@@ -1790,9 +1790,9 @@ Protocols::InteractionModel::Status InteractionModelEngine::CheckCommandExistenc
 {
     auto provider = GetDataModelProvider();
 
-    DataModel::ListBuilder<DataModel::AcceptedCommandEntry> builder;
-    (void) provider->AcceptedCommands(aCommandPath, builder);
-    for (auto & existing : builder.TakeBuffer())
+    DataModel::ListBuilder<DataModel::AcceptedCommandEntry> acceptedCommands;
+    (void) provider->AcceptedCommands(aCommandPath, acceptedCommands);
+    for (auto & existing : acceptedCommands.TakeBuffer())
     {
         if (existing.commandId == aCommandPath.mCommandId)
         {

src/app/clusters/descriptor/descriptor.cpp

@@ -106,11 +106,11 @@ CHIP_ERROR DescriptorAttrAccess::ReadFeatureMap(EndpointId endpoint, AttributeVa
 
 CHIP_ERROR DescriptorAttrAccess::ReadTagListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
-    DataModel::ListBuilder<DataModel::Provider::SemanticTag> builder;
-    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->GetDataModelProvider()->SemanticTags(endpoint, builder));
+    DataModel::ListBuilder<DataModel::Provider::SemanticTag> semanticTagsList;
+    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->GetDataModelProvider()->SemanticTags(endpoint, semanticTagsList));
 
-    return aEncoder.EncodeList([&builder](const auto & encoder) -> CHIP_ERROR {
-        for (const auto & tag : builder.TakeBuffer())
+    return aEncoder.EncodeList([&semanticTagsList](const auto & encoder) -> CHIP_ERROR {
+        for (const auto & tag : semanticTagsList.TakeBuffer())
         {
             ReturnErrorOnFailure(encoder.Encode(tag));
         }
@@ -120,10 +120,9 @@ CHIP_ERROR DescriptorAttrAccess::ReadTagListAttribute(EndpointId endpoint, Attri
 
 CHIP_ERROR DescriptorAttrAccess::ReadPartsAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
-    DataModel::ListBuilder<DataModel::EndpointEntry> builder;
-    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->GetDataModelProvider()->Endpoints(builder));
-
-    auto endpoints = builder.TakeBuffer();
+    DataModel::ListBuilder<DataModel::EndpointEntry> endpointsList;
+    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->GetDataModelProvider()->Endpoints(endpointsList));
+    auto endpoints = endpointsList.TakeBuffer();
     if (endpoint == 0x00)
     {
         return aEncoder.EncodeList([&endpoints](const auto & encoder) -> CHIP_ERROR {
@@ -192,14 +191,14 @@ CHIP_ERROR DescriptorAttrAccess::ReadPartsAttribute(EndpointId endpoint, Attribu
 
 CHIP_ERROR DescriptorAttrAccess::ReadDeviceAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
-    DataModel::ListBuilder<DataModel::DeviceTypeEntry> builder;
-    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->GetDataModelProvider()->DeviceTypes(endpoint, builder));
+    DataModel::ListBuilder<DataModel::DeviceTypeEntry> deviceTypesList;
+    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->GetDataModelProvider()->DeviceTypes(endpoint, deviceTypesList));
 
-    auto span = builder.TakeBuffer();
+    auto deviceTypes = deviceTypesList.TakeBuffer();
 
-    CHIP_ERROR err = aEncoder.EncodeList([&span](const auto & encoder) -> CHIP_ERROR {
+    CHIP_ERROR err = aEncoder.EncodeList([&deviceTypes](const auto & encoder) -> CHIP_ERROR {
         Descriptor::Structs::DeviceTypeStruct::Type deviceStruct;
-        for (const auto & type : span)
+        for (const auto & type : deviceTypes)
         {
             deviceStruct.deviceType = type.deviceTypeId;
             deviceStruct.revision   = type.deviceTypeRevision;
@@ -227,10 +226,10 @@ CHIP_ERROR DescriptorAttrAccess::ReadServerClusters(EndpointId endpoint, Attribu
 
 CHIP_ERROR DescriptorAttrAccess::ReadClientClusters(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
-    DataModel::ListBuilder<ClusterId> builder;
-    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->GetDataModelProvider()->ClientClusters(endpoint, builder));
-    return aEncoder.EncodeList([&builder](const auto & encoder) -> CHIP_ERROR {
-        for (const auto & id : builder.TakeBuffer())
+    DataModel::ListBuilder<ClusterId> clusterIdList;
+    ReturnErrorOnFailure(InteractionModelEngine::GetInstance()->GetDataModelProvider()->ClientClusters(endpoint, clusterIdList));
+    return aEncoder.EncodeList([&clusterIdList](const auto & encoder) -> CHIP_ERROR {
+        for (const auto & id : clusterIdList.TakeBuffer())
         {
             ReturnErrorOnFailure(encoder.Encode(id));
         }

src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp

@@ -255,7 +255,7 @@ void Instance::HandleSetCookingParameters(HandlerContext & ctx, const Commands::
 
         InteractionModelEngine::GetInstance()->GetDataModelProvider()->AcceptedCommands(
             ConcreteClusterPath(mEndpointId, OperationalState::Id), builder);
-        auto acceptedCommands = builder.Build();
+        auto acceptedCommands = acceptedCommandsList.TakeBuffer();
 
         bool commandExists =
             std::find_if(acceptedCommands.begin(), acceptedCommands.end(), [](const DataModel::AcceptedCommandEntry & entry) {

src/app/data-model-provider/MetadataList.cpp

@@ -90,7 +90,7 @@ CHIP_ERROR GenericAppendOnlyBuffer::EnsureAppendCapacity(size_t numElements)
 
     // we already have the data in buffer. we have two choices:
     //   - allocated buffer needs to be extended
-    //   - re-used const buffer neext to be copied over
+    //   - re-used const buffer needs to be copied over
     if (mBufferIsAllocated)
     {
         auto new_buffer = static_cast<uint8_t *>(Platform::MemoryRealloc(mBuffer, (mElementCount + numElements) * mElementSize));