Skip to content

Protocol tests issue 33 #3267

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
merged 5 commits into from
Apr 8, 2024
Merged

Protocol tests issue 33 #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f05ab0
Fixes for issue 33
peterrsongg Apr 5, 2024
443a620
Generated changes for issue 33
peterrsongg Apr 5, 2024
5a81002
Fixes for issue 33 (PR feedback)
peterrsongg Apr 5, 2024
3b2aee9
Generated changes for issue 33
peterrsongg Apr 5, 2024
3501188
Fixes for issue 33 (PR feedback)
peterrsongg Apr 5, 2024
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
151 changes: 88 additions & 63 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 26 additions & 6 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
else
{
#>
if (context.TestExpression("<#=member.MarshallName#>/<#=listMarshallName#>", targetDepth))
if (context.TestExpression("<#=DetermineXmlMarshallName(member)#>/<#=listMarshallName#>", targetDepth))
{
var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
response.<#=member.PropertyName#>.Add(unmarshaller.Unmarshall(context));
Expand All @@ -161,7 +161,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
if(member.IsFlattened)
{
#>
if (context.TestExpression("<#=member.MarshallName#>", targetDepth))
if (context.TestExpression("<#=DetermineXmlMarshallName(member)#>", targetDepth))
{
var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
response.<#=member.PropertyName#>.Add(unmarshaller.Unmarshall(context));
Expand All @@ -172,7 +172,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
else
{
#>
if (context.TestExpression("<#=member.MarshallName#>", targetDepth))
if (context.TestExpression("<#=DetermineXmlMarshallName(member)#>", targetDepth))
{
var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
response.<#=member.PropertyName#> = unmarshaller.Unmarshall(context);
Expand All @@ -184,7 +184,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
else
{
#>
if (context.TestExpression("<#=member.MarshallName#>", targetDepth))
if (context.TestExpression("<#=DetermineXmlMarshallName(member)#>", targetDepth))
{
var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
response.<#=member.PropertyName#> = unmarshaller.Unmarshall(context);
Expand All @@ -197,7 +197,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
if (shouldMarshallPayload)
{
#>
if (context.TestExpression("<#=payload.MarshallName#>", targetDepth))
if (context.TestExpression("<#=DetermineXmlMarshallName(payload)#>", targetDepth))
{
var unmarshaller = <#= payload.DetermineTypeUnmarshallerInstantiate() #>;
response.<#=payload.PropertyName#> = unmarshaller.Unmarshall(context);
Expand Down Expand Up @@ -256,4 +256,24 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
this.AddResponseSingletonMethod();
#>
}
}
}
<#+
/* The rules for determining the marshallName for xml services is different than json services
1. Use the member locationName if the value doesn't match the member's name
2. Use the value of the locationName on the member's target if present
3. Use the name of the member's target
*/
protected string DetermineXmlMarshallName(Member member)
{
var locationName = member.data[ServiceModel.LocationNameKey];
if (locationName == null)
return member.MarshallName;
if (!string.Equals(locationName.ToString(), member.ModeledName, StringComparison.Ordinal))
{
return locationName.ToString();
}
var memberTarget = member.Shape.data[ServiceModel.LocationNameKey];

return memberTarget != null ? memberTarget.ToString() : member.Shape.Name;
}
#>
4 changes: 2 additions & 2 deletions ...ocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public IRequest Marshall(FlattenedXmlMapRequest publicRequest)
xmlWriter.WriteElementString("key", kvp.Key);
xmlWriter.WriteElementString("value", kvp.Value);
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}
}

xmlWriter.WriteEndElement();
}
Expand Down
6 changes: 3 additions & 3 deletions ...ted/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ public IRequest Marshall(FlattenedXmlMapWithXmlNameRequest publicRequest)
{
foreach (var kvp in publicRequest.MyMap)
{
xmlWriter.WriteStartElement("entry");
xmlWriter.WriteStartElement("KVP");
xmlWriter.WriteElementString("K", kvp.Key);
xmlWriter.WriteElementString("V", kvp.Value);
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}
}

xmlWriter.WriteEndElement();
}
Expand Down
2 changes: 1 addition & 1 deletion ...ed/Model/Internal/MarshallTransformations/HttpPayloadWithStructureResponseUnmarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
{
if (context.IsStartElement || context.IsAttribute)
{
if (context.TestExpression("nested", targetDepth))
if (context.TestExpression("NestedPayload", targetDepth))
{
var unmarshaller = NestedPayloadUnmarshaller.Instance;
response.Nested = unmarshaller.Unmarshall(context);
Expand Down
2 changes: 1 addition & 1 deletion ...erated/Model/Internal/MarshallTransformations/HttpPayloadWithUnionResponseUnmarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
{
if (context.IsStartElement || context.IsAttribute)
{
if (context.TestExpression("nested", targetDepth))
if (context.TestExpression("UnionPayload", targetDepth))
{
var unmarshaller = UnionPayloadUnmarshaller.Instance;
response.Nested = unmarshaller.Unmarshall(context);
Expand Down
2 changes: 1 addition & 1 deletion ...ated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNameResponseUnmarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
{
if (context.IsStartElement || context.IsAttribute)
{
if (context.TestExpression("nested", targetDepth))
if (context.TestExpression("Hello", targetDepth))
{
var unmarshaller = PayloadWithXmlNameUnmarshaller.Instance;
response.Nested = unmarshaller.Unmarshall(context);
Expand Down
2 changes: 1 addition & 1 deletion ...ernal/MarshallTransformations/HttpPayloadWithXmlNamespaceAndPrefixResponseUnmarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
{
if (context.IsStartElement || context.IsAttribute)
{
if (context.TestExpression("nested", targetDepth))
if (context.TestExpression("PayloadWithXmlNamespaceAndPrefix", targetDepth))
{
var unmarshaller = PayloadWithXmlNamespaceAndPrefixUnmarshaller.Instance;
response.Nested = unmarshaller.Unmarshall(context);
Expand Down
2 changes: 1 addition & 1 deletion ...Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceResponseUnmarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
{
if (context.IsStartElement || context.IsAttribute)
{
if (context.TestExpression("nested", targetDepth))
if (context.TestExpression("PayloadWithXmlNamespace", targetDepth))
{
var unmarshaller = PayloadWithXmlNamespaceUnmarshaller.Instance;
response.Nested = unmarshaller.Unmarshall(context);
Expand Down
8 changes: 5 additions & 3 deletions ...otocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ public IRequest Marshall(NestedXmlMapsRequest publicRequest)
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}
}
if(publicRequest.IsSetNestedMap())
{
xmlWriter.WriteStartElement("nestedMap");
foreach (var kvp in publicRequest.NestedMap)
{
Expand All @@ -97,6 +98,7 @@ public IRequest Marshall(NestedXmlMapsRequest publicRequest)
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}

xmlWriter.WriteEndElement();
}
Expand Down
1 change: 1 addition & 0 deletions ...rotocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public IRequest Marshall(XmlEmptyMapsRequest publicRequest)
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}

xmlWriter.WriteEndElement();
}
Expand Down
1 change: 1 addition & 0 deletions ...XmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public IRequest Marshall(XmlEnumsRequest publicRequest)
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}
var publicRequestFooEnumSet = publicRequest.FooEnumSet;
if (publicRequestFooEnumSet != null && publicRequestFooEnumSet.Count > 0)
{
Expand Down
1 change: 1 addition & 0 deletions ...Protocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public IRequest Marshall(XmlIntEnumsRequest publicRequest)
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}
var publicRequestIntEnumSet = publicRequest.IntEnumSet;
if (publicRequestIntEnumSet != null && publicRequestIntEnumSet.Count > 0)
{
Expand Down
1 change: 1 addition & 0 deletions ...nerated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public IRequest Marshall(XmlMapWithXmlNamespaceRequest publicRequest)
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}

xmlWriter.WriteEndElement();
}
Expand Down
1 change: 1 addition & 0 deletions ...tXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public IRequest Marshall(XmlMapsRequest publicRequest)
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}

xmlWriter.WriteEndElement();
}
Expand Down
1 change: 1 addition & 0 deletions ...tocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public IRequest Marshall(XmlMapsXmlNameRequest publicRequest)
xmlWriter.WriteEndElement();
}
xmlWriter.WriteEndElement();
}

xmlWriter.WriteEndElement();
}
Expand Down