Decode service escaped xml characters.

Andrew Tang · web-flow · commit 72131ed9529a · 2019-07-30T14:03:16.000-07:00
If we use &lt;tag&gt; as part of the API member's value to services using xml protocol. &lt;tag&gt; will be XML escaped to &amp;lt;tag&amp;gt; in returned xml body. We need to decode the escaped string to it's original form.
diff --git a/aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp b/aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp
@@ -230,7 +230,7 @@ TEST_F(QueueOperationTest, TestSendReceiveDelete)
     ASSERT_TRUE(queueUrl.find(queueName) != Aws::String::npos);
 
     SendMessageRequest sendMessageRequest;
-    sendMessageRequest.SetMessageBody(" TestMessageBody\r\n ");
+    sendMessageRequest.SetMessageBody(" TestMessageBody<tag>info\"\"</tag>\r\n ");
     MessageAttributeValue stringAttributeValue;
     stringAttributeValue.SetStringValue("TestString");
     stringAttributeValue.SetDataType("String");
@@ -263,7 +263,7 @@ TEST_F(QueueOperationTest, TestSendReceiveDelete)
     ReceiveMessageResult receiveMessageResult = receiveMessageOutcome.GetResult();
     ASSERT_EQ(1uL, receiveMessageResult.GetMessages().size());
     Aws::String receivedMessage = receiveMessageResult.GetMessages()[0].GetBody();
-    EXPECT_STREQ(" TestMessageBody\r\n ", receivedMessage.c_str());
+    EXPECT_STREQ(" TestMessageBody<tag>info\"\"</tag>\r\n ", receivedMessage.c_str());
     EXPECT_STREQ(HashingUtils::HexEncode(HashingUtils::CalculateMD5(receivedMessage)).c_str(), receiveMessageResult.GetMessages()[0].GetMD5OfBody().c_str());
     Aws::Map<Aws::String, MessageAttributeValue> messageAttributes = receiveMessageResult.GetMessages()[0].GetMessageAttributes();
     ASSERT_TRUE(messageAttributes.find("TestStringAttribute") != messageAttributes.end());
diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/ModelClassMembersDeserializeXml.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/ModelClassMembersDeserializeXml.vm
@@ -65,7 +65,7 @@
 
 #end##member uses location for serialization
 #else##this is not a map or a list
-#set($substituteString = "${lowerCaseVarName}Node.GetText()")
+#set($substituteString = "Aws::Utils::Xml::DecodeEscapedXmlText(${lowerCaseVarName}Node.GetText())")
 #if($member.locationName)##location specified
 #if($member.xmlAttribute)
     auto ${lowerCaseVarName} = resultNode.GetAttributeValue("${member.locationName}");
