Skip to content

Commit 31900c8

Browse files
SergeyRyabininSergeyRyabinin
committed
codegen for #3275 
1 parent f93616d commit 31900c8

File tree

53 files changed

+304
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+304
-182
lines changed

‎generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/model/RecursiveXmlShapesOutputNested1.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RecursiveXmlShapesOutputNested1& RecursiveXmlShapesOutputNested1::operator =(con
4848
XmlNode nestedNode = resultNode.FirstChild("nested");
4949
if(!nestedNode.IsNull())
5050
{
51-
m_nested = nestedNode;
51+
m_nested = Aws::MakeShared<RecursiveXmlShapesOutputNested2>("RecursiveXmlShapesOutputNested1", nestedNode);
5252
m_nestedHasBeenSet = true;
5353
}
5454
}

‎generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/model/RecursiveXmlShapesOutputNested2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RecursiveXmlShapesOutputNested2& RecursiveXmlShapesOutputNested2::operator =(con
4848
XmlNode recursiveMemberNode = resultNode.FirstChild("recursiveMember");
4949
if(!recursiveMemberNode.IsNull())
5050
{
51-
m_recursiveMember = recursiveMemberNode;
51+
m_recursiveMember = Aws::MakeShared<RecursiveXmlShapesOutputNested1>("RecursiveXmlShapesOutputNested2", recursiveMemberNode);
5252
m_recursiveMemberHasBeenSet = true;
5353
}
5454
}

‎generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/model/XmlEmptyListsResponse.cpp‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ XmlEmptyListsResponse& XmlEmptyListsResponse::operator =(const Aws::AmazonWebSer
6666
XmlNode integerListMember = integerListNode.FirstChild("member");
6767
while(!integerListMember.IsNull())
6868
{
69-
m_integerList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(integerListMember.GetText().c_str()).c_str()));
69+
m_integerList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(integerListMember.GetText().c_str()).c_str()));
7070
integerListMember = integerListMember.NextNode("member");
7171
}
7272

@@ -77,7 +77,7 @@ XmlEmptyListsResponse& XmlEmptyListsResponse::operator =(const Aws::AmazonWebSer
7777
XmlNode booleanListMember = booleanListNode.FirstChild("member");
7878
while(!booleanListMember.IsNull())
7979
{
80-
m_booleanList.push_back(StringUtils::ConvertToBool(StringUtils::Trim(booleanListMember.GetText().c_str()).c_str()));
80+
m_booleanList.push_back(StringUtils::ConvertToBool(StringUtils::Trim(booleanListMember.GetText().c_str()).c_str()));
8181
booleanListMember = booleanListMember.NextNode("member");
8282
}
8383

@@ -110,7 +110,7 @@ XmlEmptyListsResponse& XmlEmptyListsResponse::operator =(const Aws::AmazonWebSer
110110
XmlNode intEnumListMember = intEnumListNode.FirstChild("member");
111111
while(!intEnumListMember.IsNull())
112112
{
113-
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
113+
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
114114
intEnumListMember = intEnumListMember.NextNode("member");
115115
}
116116

@@ -121,6 +121,16 @@ XmlEmptyListsResponse& XmlEmptyListsResponse::operator =(const Aws::AmazonWebSer
121121
XmlNode nestedStringListMember = nestedStringListNode.FirstChild("member");
122122
while(!nestedStringListMember.IsNull())
123123
{
124+
m_nestedStringList.push_back([&nestedStringListMember]() -> Aws::Vector<Aws::String> {
125+
Aws::Vector<Aws::String> nestedListNestedStringList;
126+
if(nestedStringListMember.IsNull()) { return nestedListNestedStringList; }
127+
XmlNode nestedListNestedStringListMemberNode = nestedStringListMember.FirstChild("member");
128+
while(!nestedListNestedStringListMemberNode.IsNull()) {
129+
nestedListNestedStringList.push_back(nestedListNestedStringListMemberNode.GetText());
130+
nestedListNestedStringListMemberNode = nestedListNestedStringListMemberNode.NextNode("member");
131+
}
132+
return nestedListNestedStringList;
133+
} (/*IIFE*/));
124134
nestedStringListMember = nestedStringListMember.NextNode("member");
125135
}
126136

‎generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/model/XmlIntEnumsResponse.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ XmlIntEnumsResponse& XmlIntEnumsResponse::operator =(const Aws::AmazonWebService
6363
XmlNode intEnumListMember = intEnumListNode.FirstChild("member");
6464
while(!intEnumListMember.IsNull())
6565
{
66-
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
66+
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
6767
intEnumListMember = intEnumListMember.NextNode("member");
6868
}
6969

@@ -74,7 +74,7 @@ XmlIntEnumsResponse& XmlIntEnumsResponse::operator =(const Aws::AmazonWebService
7474
XmlNode intEnumSetMember = intEnumSetNode.FirstChild("member");
7575
while(!intEnumSetMember.IsNull())
7676
{
77-
m_intEnumSet.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumSetMember.GetText().c_str()).c_str()));
77+
m_intEnumSet.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumSetMember.GetText().c_str()).c_str()));
7878
intEnumSetMember = intEnumSetMember.NextNode("member");
7979
}
8080

@@ -89,7 +89,7 @@ XmlIntEnumsResponse& XmlIntEnumsResponse::operator =(const Aws::AmazonWebService
8989
XmlNode keyNode = intEnumMapEntry.FirstChild("key");
9090
XmlNode valueNode = intEnumMapEntry.FirstChild("value");
9191
m_intEnumMap[keyNode.GetText()] =
92-
StringUtils::ConvertToInt32(StringUtils::Trim(valueNode.GetText().c_str()).c_str());
92+
StringUtils::ConvertToInt32(StringUtils::Trim(valueNode.GetText().c_str()).c_str());
9393
intEnumMapEntry = intEnumMapEntry.NextNode("entry");
9494
}
9595

‎generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/model/XmlListsResponse.cpp‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ XmlListsResponse& XmlListsResponse::operator =(const Aws::AmazonWebServiceResult
6666
XmlNode integerListMember = integerListNode.FirstChild("member");
6767
while(!integerListMember.IsNull())
6868
{
69-
m_integerList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(integerListMember.GetText().c_str()).c_str()));
69+
m_integerList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(integerListMember.GetText().c_str()).c_str()));
7070
integerListMember = integerListMember.NextNode("member");
7171
}
7272

@@ -77,7 +77,7 @@ XmlListsResponse& XmlListsResponse::operator =(const Aws::AmazonWebServiceResult
7777
XmlNode booleanListMember = booleanListNode.FirstChild("member");
7878
while(!booleanListMember.IsNull())
7979
{
80-
m_booleanList.push_back(StringUtils::ConvertToBool(StringUtils::Trim(booleanListMember.GetText().c_str()).c_str()));
80+
m_booleanList.push_back(StringUtils::ConvertToBool(StringUtils::Trim(booleanListMember.GetText().c_str()).c_str()));
8181
booleanListMember = booleanListMember.NextNode("member");
8282
}
8383

@@ -110,7 +110,7 @@ XmlListsResponse& XmlListsResponse::operator =(const Aws::AmazonWebServiceResult
110110
XmlNode intEnumListMember = intEnumListNode.FirstChild("member");
111111
while(!intEnumListMember.IsNull())
112112
{
113-
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
113+
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
114114
intEnumListMember = intEnumListMember.NextNode("member");
115115
}
116116

@@ -121,6 +121,16 @@ XmlListsResponse& XmlListsResponse::operator =(const Aws::AmazonWebServiceResult
121121
XmlNode nestedStringListMember = nestedStringListNode.FirstChild("member");
122122
while(!nestedStringListMember.IsNull())
123123
{
124+
m_nestedStringList.push_back([&nestedStringListMember]() -> Aws::Vector<Aws::String> {
125+
Aws::Vector<Aws::String> nestedListNestedStringList;
126+
if(nestedStringListMember.IsNull()) { return nestedListNestedStringList; }
127+
XmlNode nestedListNestedStringListMemberNode = nestedStringListMember.FirstChild("member");
128+
while(!nestedListNestedStringListMemberNode.IsNull()) {
129+
nestedListNestedStringList.push_back(nestedListNestedStringListMemberNode.GetText());
130+
nestedListNestedStringListMemberNode = nestedListNestedStringListMemberNode.NextNode("member");
131+
}
132+
return nestedListNestedStringList;
133+
} (/*IIFE*/));
124134
nestedStringListMember = nestedStringListMember.NextNode("member");
125135
}
126136

‎generated/protocol-tests/test-clients/aws-cpp-sdk-query-protocol/source/model/RecursiveXmlShapesOutputNested1.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RecursiveXmlShapesOutputNested1& RecursiveXmlShapesOutputNested1::operator =(con
4848
XmlNode nestedNode = resultNode.FirstChild("nested");
4949
if(!nestedNode.IsNull())
5050
{
51-
m_nested = nestedNode;
51+
m_nested = Aws::MakeShared<RecursiveXmlShapesOutputNested2>("RecursiveXmlShapesOutputNested1", nestedNode);
5252
m_nestedHasBeenSet = true;
5353
}
5454
}

‎generated/protocol-tests/test-clients/aws-cpp-sdk-query-protocol/source/model/RecursiveXmlShapesOutputNested2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RecursiveXmlShapesOutputNested2& RecursiveXmlShapesOutputNested2::operator =(con
4848
XmlNode recursiveMemberNode = resultNode.FirstChild("recursiveMember");
4949
if(!recursiveMemberNode.IsNull())
5050
{
51-
m_recursiveMember = recursiveMemberNode;
51+
m_recursiveMember = Aws::MakeShared<RecursiveXmlShapesOutputNested1>("RecursiveXmlShapesOutputNested2", recursiveMemberNode);
5252
m_recursiveMemberHasBeenSet = true;
5353
}
5454
}

‎generated/protocol-tests/test-clients/aws-cpp-sdk-query-protocol/source/model/XmlEmptyListsResult.cpp‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ XmlEmptyListsResult& XmlEmptyListsResult::operator =(const Aws::AmazonWebService
6666
XmlNode integerListMember = integerListNode.FirstChild("member");
6767
while(!integerListMember.IsNull())
6868
{
69-
m_integerList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(integerListMember.GetText().c_str()).c_str()));
69+
m_integerList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(integerListMember.GetText().c_str()).c_str()));
7070
integerListMember = integerListMember.NextNode("member");
7171
}
7272

@@ -77,7 +77,7 @@ XmlEmptyListsResult& XmlEmptyListsResult::operator =(const Aws::AmazonWebService
7777
XmlNode booleanListMember = booleanListNode.FirstChild("member");
7878
while(!booleanListMember.IsNull())
7979
{
80-
m_booleanList.push_back(StringUtils::ConvertToBool(StringUtils::Trim(booleanListMember.GetText().c_str()).c_str()));
80+
m_booleanList.push_back(StringUtils::ConvertToBool(StringUtils::Trim(booleanListMember.GetText().c_str()).c_str()));
8181
booleanListMember = booleanListMember.NextNode("member");
8282
}
8383

@@ -110,7 +110,7 @@ XmlEmptyListsResult& XmlEmptyListsResult::operator =(const Aws::AmazonWebService
110110
XmlNode intEnumListMember = intEnumListNode.FirstChild("member");
111111
while(!intEnumListMember.IsNull())
112112
{
113-
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
113+
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
114114
intEnumListMember = intEnumListMember.NextNode("member");
115115
}
116116

@@ -121,6 +121,16 @@ XmlEmptyListsResult& XmlEmptyListsResult::operator =(const Aws::AmazonWebService
121121
XmlNode nestedStringListMember = nestedStringListNode.FirstChild("member");
122122
while(!nestedStringListMember.IsNull())
123123
{
124+
m_nestedStringList.push_back([&nestedStringListMember]() -> Aws::Vector<Aws::String> {
125+
Aws::Vector<Aws::String> nestedListNestedStringList;
126+
if(nestedStringListMember.IsNull()) { return nestedListNestedStringList; }
127+
XmlNode nestedListNestedStringListMemberNode = nestedStringListMember.FirstChild("member");
128+
while(!nestedListNestedStringListMemberNode.IsNull()) {
129+
nestedListNestedStringList.push_back(nestedListNestedStringListMemberNode.GetText());
130+
nestedListNestedStringListMemberNode = nestedListNestedStringListMemberNode.NextNode("member");
131+
}
132+
return nestedListNestedStringList;
133+
} (/*IIFE*/));
124134
nestedStringListMember = nestedStringListMember.NextNode("member");
125135
}
126136

‎generated/protocol-tests/test-clients/aws-cpp-sdk-query-protocol/source/model/XmlIntEnumsResult.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ XmlIntEnumsResult& XmlIntEnumsResult::operator =(const Aws::AmazonWebServiceResu
6363
XmlNode intEnumListMember = intEnumListNode.FirstChild("member");
6464
while(!intEnumListMember.IsNull())
6565
{
66-
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
66+
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
6767
intEnumListMember = intEnumListMember.NextNode("member");
6868
}
6969

@@ -74,7 +74,7 @@ XmlIntEnumsResult& XmlIntEnumsResult::operator =(const Aws::AmazonWebServiceResu
7474
XmlNode intEnumSetMember = intEnumSetNode.FirstChild("member");
7575
while(!intEnumSetMember.IsNull())
7676
{
77-
m_intEnumSet.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumSetMember.GetText().c_str()).c_str()));
77+
m_intEnumSet.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumSetMember.GetText().c_str()).c_str()));
7878
intEnumSetMember = intEnumSetMember.NextNode("member");
7979
}
8080

@@ -89,7 +89,7 @@ XmlIntEnumsResult& XmlIntEnumsResult::operator =(const Aws::AmazonWebServiceResu
8989
XmlNode keyNode = intEnumMapEntry.FirstChild("key");
9090
XmlNode valueNode = intEnumMapEntry.FirstChild("value");
9191
m_intEnumMap[keyNode.GetText()] =
92-
StringUtils::ConvertToInt32(StringUtils::Trim(valueNode.GetText().c_str()).c_str());
92+
StringUtils::ConvertToInt32(StringUtils::Trim(valueNode.GetText().c_str()).c_str());
9393
intEnumMapEntry = intEnumMapEntry.NextNode("entry");
9494
}
9595

‎generated/protocol-tests/test-clients/aws-cpp-sdk-query-protocol/source/model/XmlListsResult.cpp‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ XmlListsResult& XmlListsResult::operator =(const Aws::AmazonWebServiceResult<Xml
6666
XmlNode integerListMember = integerListNode.FirstChild("member");
6767
while(!integerListMember.IsNull())
6868
{
69-
m_integerList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(integerListMember.GetText().c_str()).c_str()));
69+
m_integerList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(integerListMember.GetText().c_str()).c_str()));
7070
integerListMember = integerListMember.NextNode("member");
7171
}
7272

@@ -77,7 +77,7 @@ XmlListsResult& XmlListsResult::operator =(const Aws::AmazonWebServiceResult<Xml
7777
XmlNode booleanListMember = booleanListNode.FirstChild("member");
7878
while(!booleanListMember.IsNull())
7979
{
80-
m_booleanList.push_back(StringUtils::ConvertToBool(StringUtils::Trim(booleanListMember.GetText().c_str()).c_str()));
80+
m_booleanList.push_back(StringUtils::ConvertToBool(StringUtils::Trim(booleanListMember.GetText().c_str()).c_str()));
8181
booleanListMember = booleanListMember.NextNode("member");
8282
}
8383

@@ -110,7 +110,7 @@ XmlListsResult& XmlListsResult::operator =(const Aws::AmazonWebServiceResult<Xml
110110
XmlNode intEnumListMember = intEnumListNode.FirstChild("member");
111111
while(!intEnumListMember.IsNull())
112112
{
113-
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
113+
m_intEnumList.push_back(StringUtils::ConvertToInt32(StringUtils::Trim(intEnumListMember.GetText().c_str()).c_str()));
114114
intEnumListMember = intEnumListMember.NextNode("member");
115115
}
116116

@@ -121,6 +121,16 @@ XmlListsResult& XmlListsResult::operator =(const Aws::AmazonWebServiceResult<Xml
121121
XmlNode nestedStringListMember = nestedStringListNode.FirstChild("member");
122122
while(!nestedStringListMember.IsNull())
123123
{
124+
m_nestedStringList.push_back([&nestedStringListMember]() -> Aws::Vector<Aws::String> {
125+
Aws::Vector<Aws::String> nestedListNestedStringList;
126+
if(nestedStringListMember.IsNull()) { return nestedListNestedStringList; }
127+
XmlNode nestedListNestedStringListMemberNode = nestedStringListMember.FirstChild("member");
128+
while(!nestedListNestedStringListMemberNode.IsNull()) {
129+
nestedListNestedStringList.push_back(nestedListNestedStringListMemberNode.GetText());
130+
nestedListNestedStringListMemberNode = nestedListNestedStringListMemberNode.NextNode("member");
131+
}
132+
return nestedListNestedStringList;
133+
} (/*IIFE*/));
124134
nestedStringListMember = nestedStringListMember.NextNode("member");
125135
}
126136

0 commit comments

Comments
 (0)