Skip to content
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

Jump to bottom

XmlSerializer WSDL: Fix generated schema for DateTimeOffset #1014

Merged
merged 1 commit into from
Feb 9, 2024
Merged

XmlSerializer WSDL: Fix generated schema for DateTimeOffset #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 22 additions & 9 deletions src/SoapCore.Tests/Wsdl/WsdlTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,19 +832,32 @@ public async Task CheckUnqualifiedMembersService(SoapSerializer soapSerializer)
public async Task CheckDateTimeOffsetServiceWsdl(SoapSerializer soapSerializer)
{
var nm = Namespaces.CreateDefaultXmlNamespaceManager(false);
string systemNs = "http://schemas.datacontract.org/2004/07/System";

var wsdl = await GetWsdlFromMetaBodyWriter<DateTimeOffsetService>(soapSerializer);
var root = XElement.Parse(wsdl);
var responseDateElem = root.XPathSelectElement($"//xsd:element[@name='MethodResponse']/xsd:complexType/xsd:sequence/xsd:element[@name='MethodResult']", nm);
Assert.IsTrue(responseDateElem.ToString().Contains(systemNs));

var wsdlWCF = await GetWsdlFromMetaBodyWriter<DateTimeOffsetService>(SoapSerializer.DataContractSerializer);
var rootWCF = XElement.Parse(wsdlWCF);
var responseDateElemWCF = rootWCF.XPathSelectElement($"//xsd:element[@name='MethodResponse']/xsd:complexType/xsd:sequence/xsd:element[@name='MethodResult']", nm);
Assert.IsTrue(responseDateElemWCF.ToString().Contains(systemNs));
var dayOfYearElem = GetElements(rootWCF, _xmlSchema + "element").SingleOrDefault(a => a.Attribute("name")?.Value.Equals("DayOfYear") == true);
Assert.IsNull(dayOfYearElem);

if (soapSerializer == SoapSerializer.DataContractSerializer)
{
string systemNs = "http://schemas.datacontract.org/2004/07/System";
Assert.IsTrue(responseDateElem.ToString().Contains(systemNs));

var wsdlWCF = await GetWsdlFromMetaBodyWriter<DateTimeOffsetService>(SoapSerializer.DataContractSerializer);
var rootWCF = XElement.Parse(wsdlWCF);
var responseDateElemWCF = rootWCF.XPathSelectElement($"//xsd:element[@name='MethodResponse']/xsd:complexType/xsd:sequence/xsd:element[@name='MethodResult']", nm);
Assert.IsTrue(responseDateElemWCF.ToString().Contains(systemNs));
var dayOfYearElem = GetElements(rootWCF, _xmlSchema + "element").SingleOrDefault(a => a.Attribute("name")?.Value.Equals("DayOfYear") == true);
Assert.IsNull(dayOfYearElem);
}
else
{
// XmlSerializer serializes DateTimeOffset as string
Assert.AreEqual("xsd:string", responseDateElem.Attribute("type").Value);

// DateTimeOffset is a ValueType
Assert.AreEqual("1", responseDateElem.Attribute("minOccurs").Value);
Assert.AreEqual("1", responseDateElem.Attribute("maxOccurs").Value);
}
}

[DataTestMethod]
Expand Down
50 changes: 2 additions & 48 deletions src/SoapCore/Meta/MetaBodyWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
public class MetaBodyWriter : BodyWriter
{
private const string FaultSuffix = "Fault";
private static int _namespaceCounter = 1;

Check warning on line 23 in src/SoapCore/Meta/MetaBodyWriter.cs

View workflow job for this annotation

GitHub Actions / Analyze 

The field 'MetaBodyWriter._namespaceCounter' is assigned but its value is never used

private readonly ServiceDescription _service;
private readonly string _baseUrl;
Expand All @@ -33,7 +33,6 @@
private readonly HashSet<string> _builtComplexTypes;
private readonly Dictionary<string, Dictionary<string, string>> _requestedDynamicTypes;

private bool _buildDateTimeOffset;
private bool _buildMicrosoftGuid = false;

[Obsolete]
Expand Down Expand Up @@ -299,7 +298,6 @@
writer.WriteAttributeString("targetNamespace", TargetNameSpace);

writer.WriteStartElement("import", Namespaces.XMLNS_XSD);
writer.WriteAttributeString("namespace", Namespaces.SYSTEM_NS);
writer.WriteEndElement();

foreach (var operation in _service.Operations)
Expand Down Expand Up @@ -508,42 +506,6 @@

writer.WriteEndElement(); // schema

if (_buildDateTimeOffset)
{
writer.WriteStartElement("schema", Namespaces.XMLNS_XSD);
writer.WriteXmlnsAttribute("tns", Namespaces.SYSTEM_NS);
writer.WriteAttributeString("elementFormDefault", "qualified");
writer.WriteAttributeString("targetNamespace", Namespaces.SYSTEM_NS);

writer.WriteStartElement("import", Namespaces.XMLNS_XSD);
writer.WriteAttributeString("namespace", Namespaces.SERIALIZATION_NS);
writer.WriteEndElement();

writer.WriteStartElement("complexType", Namespaces.XMLNS_XSD);
writer.WriteAttributeString("name", "DateTimeOffset");
writer.WriteStartElement("annotation", Namespaces.XMLNS_XSD);
writer.WriteStartElement("appinfo", Namespaces.XMLNS_XSD);

writer.WriteElementString("IsValueType", Namespaces.SERIALIZATION_NS, "true");
writer.WriteEndElement(); // appinfo
writer.WriteEndElement(); // annotation

writer.WriteStartElement("sequence", Namespaces.XMLNS_XSD);
AddSchemaType(writer, typeof(DateTime), "DateTime", false);
AddSchemaType(writer, typeof(short), "OffsetMinutes", false);
writer.WriteEndElement(); // sequence

writer.WriteEndElement(); // complexType

writer.WriteStartElement("element", Namespaces.XMLNS_XSD);
writer.WriteAttributeString("name", "DateTimeOffset");
writer.WriteAttributeString("nillable", "true");
writer.WriteAttributeString("type", "tns:DateTimeOffset");
writer.WriteEndElement();

writer.WriteEndElement(); // schema
}

if (_buildMicrosoftGuid)
{
writer.WriteStartElement("schema", Namespaces.XMLNS_XSD);
Expand Down Expand Up @@ -1059,16 +1021,8 @@
}
else if (typeof(DateTimeOffset).IsAssignableFrom(type))
{
if (string.IsNullOrEmpty(name))
{
name = typeName;
}

ns = $"q{_namespaceCounter++}";
writer.WriteXmlnsAttribute(ns, Namespaces.SYSTEM_NS);
xsTypename = new XmlQualifiedName(typeName, Namespaces.SYSTEM_NS);

_buildDateTimeOffset = true;
// XmlSerializer serializes a DateTimeOffset simply as a string, such as 2024-02-08T09:55:41.2527621+01:00
xsTypename = ResolveType(typeof(string));
}
else if (typeInfo.IsEnum)
{
Expand Down
Loading