Forward-declare XmlTraits in Schema.h

Author: pulimsr

src/aws-cpp-sdk-core/include/smithy/client/schema/Schema.h

@@ -1,13 +1,14 @@
 #pragma once
 
 #include <aws/core/utils/memory/stl/AWSString.h>
-#include <smithy/client/schema/XmlTraits.h>
 
 #include <cstdint>
 
 namespace smithy {
 namespace schema {
 
+struct XmlTraits;
+
 enum class ShapeType : uint8_t {
   Boolean,
   Byte,
@@ -49,10 +50,8 @@ class Schema {
 
   uint16_t GetMemberCount() const { return m_memberCount; }
 
-  // XML traits accessor
   const XmlTraits* GetXmlTraits() const { return m_xmlTraits; }
 
-  // Builder-style setter for XML traits pointer (used by codegen)
   Schema& WithXmlTraits(const XmlTraits* traits) {
     m_xmlTraits = traits;
     return *this;

src/aws-cpp-sdk-core/include/smithy/client/schema/XmlTraits.h

@@ -9,21 +9,16 @@
 namespace smithy {
 namespace schema {
 
-/**
- * XML-specific traits for a Schema member.
- * Instances should be declared as static const and referenced via pointer from Schema.
- * Zero cost for non-XML services (Schema just holds a null pointer).
- */
 struct XmlTraits {
-  Aws::String xmlName;          // @xmlName override (empty = use member name)
-  Aws::String listItemName;     // element name for list items (default: "member")
-  Aws::String mapEntryName;     // element name for map entries (default: "entry")
-  Aws::String mapKeyName;       // element name for map keys (default: "key")
-  Aws::String mapValueName;     // element name for map values (default: "value")
-  Aws::String namespaceUri;     // @xmlNamespace URI
-  Aws::String namespacePrefix;  // @xmlNamespace prefix (empty = default namespace)
-  bool flattened = false;       // @xmlFlattened
-  bool isAttribute = false;     // @xmlAttribute
+  Aws::String xmlName;
+  Aws::String listItemName;
+  Aws::String mapEntryName;
+  Aws::String mapKeyName;
+  Aws::String mapValueName;
+  Aws::String namespaceUri;
+  Aws::String namespacePrefix;
+  bool flattened = false;
+  bool isAttribute = false;
 };
 
 }  // namespace schema

src/aws-cpp-sdk-core/source/smithy/client/schema/XmlShapeSerializer.cpp

@@ -6,6 +6,7 @@
 #include <aws/core/utils/StringUtils.h>
 #include <aws/core/utils/memory/stl/AWSArray.h>
 #include <smithy/client/schema/XmlShapeSerializer.h>
+#include <smithy/client/schema/XmlTraits.h>
 
 using namespace smithy::schema;
 using namespace Aws::Utils;
@@ -49,8 +50,6 @@ void WriteXmlEscaped(Aws::String& buf, const Aws::String& value) {
   }
 }
 
-// Get the effective XML element name for a schema.
-// If XmlTraits is present and has an xmlName, use it; otherwise fall back to memberName.
 Aws::String GetXmlName(const Schema& schema) {
   const auto* traits = schema.GetXmlTraits();
   if (traits && !traits->xmlName.empty()) {

tests/aws-cpp-sdk-core-tests/smithy/client/schema/XmlShapeSerializerTest.cpp

@@ -393,8 +393,9 @@ TEST_F(XmlShapeSerializerTest, XmlNameOverridesMemberName) {
   s.BeginStructure(root);
   s.WriteString(member, "hello");
   s.EndStructure();
-  EXPECT_NE(s.GetPayload().find("<ExternalName>hello</ExternalName>"), Aws::String::npos);
-  EXPECT_EQ(s.GetPayload().find("<internalName>"), Aws::String::npos);
+  auto payload = s.GetPayload();
+  EXPECT_NE(payload.find("<ExternalName>hello</ExternalName>"), Aws::String::npos);
+  EXPECT_EQ(payload.find("<internalName>"), Aws::String::npos);
 }
 
 TEST_F(XmlShapeSerializerTest, XmlNameOnStructure) {