Skip to content

Fix codegen for sparse collection JSON serialization #3757

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

Open
kai-ion wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −0
Open

Fix codegen for sparse collection JSON serialization #3757

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
dddb38e
Fix codegen for sparse collection JSON serialization
kai-ion Mar 23, 2026
9ce6e6e
Fix codegen for sparse collection JSON serialization
kai-ion 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
5 changes: 5 additions & 0 deletions src/aws-cpp-sdk-core/include/aws/core/utils/json/JsonSerializer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ namespace Aws
JsonValue& WithNull(const Aws::String& key);
JsonValue& WithNull(const char* key);

/**
* Converts the current JSON node to null.
*/
JsonValue& AsNull();

/**
* Converts the current JSON node to a string.
*/
Expand Down
7 changes: 7 additions & 0 deletions src/aws-cpp-sdk-core/source/utils/json/JsonSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,13 @@ JsonValue& JsonValue::WithNull(const Aws::String& key)
return WithNull(key.c_str());
}

JsonValue& JsonValue::AsNull()
{
Destroy();
m_value = cJSON_AS4CPP_CreateNull();
return *this;
}

JsonValue& JsonValue::AsString(const Aws::String& value)
{
Destroy();
Expand Down
7 changes: 7 additions & 0 deletions .../com/amazonaws/util/awsclientgenerator/velocity/cpp/json/ModelInternalMapOrListJsonize.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
#if($template.currentShape.sparse)
#set($key = "${template.lowerCaseVarName}Item.first")
#set($value = "*${template.lowerCaseVarName}Item.second${CppViewHelper.computeJsonizeString($template.currentShape.mapValue.shape)}")
#if($template.currentShape.mapValue.shape.isStructure() || $template.currentShape.mapValue.shape.isTimeStamp() || $template.currentShape.mapValue.shape.isDocument())
#set($value = "${template.lowerCaseVarName}Item.second${CppViewHelper.computeJsonizeString($template.currentShape.mapValue.shape, true)}")
#end
#if($template.currentShape.mapValue.shape.isBlob())
#set($value = "HashingUtils::Base64Encode(*${template.lowerCaseVarName}Item.second${CppViewHelper.computeJsonizeString($template.currentShape.mapValue.shape)})")
#end
Expand Down Expand Up @@ -107,7 +110,11 @@
#end
#else
#if($template.currentShape.sparse)
#if($template.currentShape.listMember.shape.isStructure() || $template.currentShape.listMember.shape.isTimeStamp() || $template.currentShape.listMember.shape.isDocument())
${template.currentSpaces} ${template.lowerCaseVarName}JsonList[${template.lowerCaseVarName}Index].As${CppViewHelper.computeJsonCppType($template.currentShape.listMember.shape)}(${template.containerVar}[${template.lowerCaseVarName}Index]${CppViewHelper.computeJsonizeString($template.currentShape.listMember.shape, true)});
#else
${template.currentSpaces} ${template.lowerCaseVarName}JsonList[${template.lowerCaseVarName}Index].As${CppViewHelper.computeJsonCppType($template.currentShape.listMember.shape)}(*${template.containerVar}[${template.lowerCaseVarName}Index]${CppViewHelper.computeJsonizeString($template.currentShape.listMember.shape)});
#end
#else
${template.currentSpaces} ${template.lowerCaseVarName}JsonList[${template.lowerCaseVarName}Index].As${CppViewHelper.computeJsonCppType($template.currentShape.listMember.shape)}(${template.containerVar}[${template.lowerCaseVarName}Index]${CppViewHelper.computeJsonizeString($template.currentShape.listMember.shape)});
#end
Expand Down
Loading