Skip to content

sparse trait codegen for nested collections #3756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kai-ion merged 2 commits into from
Mar 23, 2026
Merged

sparse trait codegen for nested collections #3756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dec16bb
Fix sparse trait codegen for nested collections in JSON and CBOR dese…
kai-ion Mar 20, 2026
c763e82
Merge branch 'main' into nullObj
pulimsr Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .../resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborDecodeListValue.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@ if(peekType_${recursionDepth}.has_value()){
#end
#elseif($shapeMember.list)
#set($template.nestedShapeMember = $shapeMember.listMember.shape)
#if($shapeMember.sparse)
auto nestedList_${recursionDepth} = Vector<Aws::Crt::Optional<$CppViewHelper.computeCppType($template.nestedShapeMember)>>();
#else
auto nestedList_${recursionDepth} = Vector<$CppViewHelper.computeCppType($template.nestedShapeMember)>();
#end
auto peekType_${recursionDepth} = decoder->PeekType();
if (peekType_${recursionDepth}.has_value() && (peekType_${recursionDepth}.value() == CborType::ArrayStart || peekType_${recursionDepth}.value() == CborType::IndefArrayStart))
{
Expand Down Expand Up @@ -213,7 +217,11 @@ if(peekType_${recursionDepth}.has_value()){
}
#elseif($shapeMember.map)
#set($template.nestedShapeMember = $shapeMember.mapValue.shape)
#if($shapeMember.sparse)
auto nestedMap_${recursionDepth} = Map<Aws::String, Aws::Crt::Optional<$CppViewHelper.computeCppType($template.nestedShapeMember)>>();
#else
auto nestedMap_${recursionDepth} = Map<Aws::String, $CppViewHelper.computeCppType($template.nestedShapeMember)>();
#end
auto peekType_${recursionDepth} = decoder->PeekType();
if (peekType_${recursionDepth}.has_value() && (peekType_${recursionDepth}.value() == CborType::MapStart || peekType_${recursionDepth}.value() == CborType::IndefMapStart))
{
Expand Down
8 changes: 8 additions & 0 deletions ...n/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborDecodeMapValue.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,11 @@ if(peekType_${recursionDepth}){
#end
#elseif($shapeMember.map)
#set($template.nestedShapeMember = $shapeMember.mapValue.shape)
#if($shapeMember.sparse)
auto nestedMap_${recursionDepth} = Map<Aws::String, Aws::Crt::Optional<$CppViewHelper.computeCppType($template.nestedShapeMember)>>();
#else
auto nestedMap_${recursionDepth} = Map<Aws::String, $CppViewHelper.computeCppType($template.nestedShapeMember)>();
#end
auto peekType_${recursionDepth} = decoder->PeekType();
if (peekType_${recursionDepth}.has_value() && (peekType_${recursionDepth}.value() == CborType::MapStart || peekType_${recursionDepth}.value() == CborType::IndefMapStart))
{
Expand Down Expand Up @@ -214,7 +218,11 @@ if(peekType_${recursionDepth}){
}
#elseif($shapeMember.list)
#set($template.nestedShapeMember = $shapeMember.listMember.shape)
#if($shapeMember.sparse)
auto nestedList_${recursionDepth} = Vector<Aws::Crt::Optional<$CppViewHelper.computeCppType($template.nestedShapeMember)>>();
#else
auto nestedList_${recursionDepth} = Vector<$CppViewHelper.computeCppType($template.nestedShapeMember)>();
#end
auto peekType_${recursionDepth} = decoder->PeekType();
if (peekType_${recursionDepth}.has_value() && (peekType_${recursionDepth}.value() == CborType::ArrayStart || peekType_${recursionDepth}.value() == CborType::IndefArrayStart))
{
Expand Down
8 changes: 8 additions & 0 deletions ...onaws/util/awsclientgenerator/velocity/cpp/json/ModelInternalMapOrListJsonDeserializer.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
#end
#if($template.recursionDepth > 1)
#set($template.containerVar = ${template.lowerCaseVarName} + "Map")
#if($template.currentShape.sparse)
${template.currentSpaces}Aws::Map<${CppViewHelper.computeCppType($template.currentShape.mapKey.shape)}, Aws::Crt::Optional<${CppViewHelper.computeCppType($template.currentShape.mapValue.shape)}>> ${template.lowerCaseVarName}Map;
#else
${template.currentSpaces}Aws::Map<${CppViewHelper.computeCppType($template.currentShape.mapKey.shape)}, ${CppViewHelper.computeCppType($template.currentShape.mapValue.shape)}> ${template.lowerCaseVarName}Map;
#end
#end
${template.currentSpaces}for(auto& ${template.lowerCaseVarName}Item : ${template.lowerCaseVarName}JsonMap)
${template.currentSpaces}{
Expand Down Expand Up @@ -84,7 +88,11 @@
#end
#if($template.recursionDepth > 1)
#set($template.containerVar = ${template.lowerCaseVarName} + "List")
#if($template.currentShape.sparse)
${template.currentSpaces}Aws::Vector<Aws::Crt::Optional<${CppViewHelper.computeCppType($template.currentShape.listMember.shape)}>> ${template.lowerCaseVarName}List;
#else
${template.currentSpaces}Aws::Vector<${CppViewHelper.computeCppType($template.currentShape.listMember.shape)}> ${template.lowerCaseVarName}List;
#end
${template.currentSpaces}${template.lowerCaseVarName}List.reserve((size_t)${template.lowerCaseVarName}JsonList.GetLength());
#end
${template.currentSpaces}for(unsigned ${template.lowerCaseVarName}Index = 0; ${template.lowerCaseVarName}Index < ${template.lowerCaseVarName}JsonList.GetLength(); ++${template.lowerCaseVarName}Index)
Expand Down
Loading