Skip to content

Commit ca8eebd

Browse files
committed
Namesspaces.CreateDefaultXmlNamespaceLookup method renamed
1 parent 10d9136 commit ca8eebd

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

src/SoapCore.Tests/Wsdl/WsdlTests.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ public async Task CheckSoapHeaderTypes(SoapSerializer soapSerializer)
905905
Trace.TraceInformation(wsdl);
906906

907907
var root = XElement.Parse(wsdl);
908-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
908+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
909909

910910
var headerComplexType = root.XPathSelectElements("//xsd:complexType[@name='AuthenticationContextSoapHeader']", nm);
911911
Assert.IsNotNull(headerComplexType);
@@ -932,7 +932,7 @@ public async Task CheckUnqualifiedMembersService(SoapSerializer soapSerializer)
932932
Trace.TraceInformation(wsdl);
933933

934934
var root = XElement.Parse(wsdl);
935-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
935+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
936936

937937
bool allNeededAreUnqualified = root.XPathSelectElements($"//xsd:complexType[@name='{nameof(TypeWithUnqualifiedMembers)}' or @name='{nameof(UnqType2)}']/xsd:sequence/xsd:element[contains(@name, 'Unqualified')]", nm)
938938
.All(x => x.Attribute("form")?.Value.Equals("unqualified") == true);
@@ -948,7 +948,7 @@ public async Task CheckUnqualifiedMembersService(SoapSerializer soapSerializer)
948948
[DataRow(SoapSerializer.DataContractSerializer)]
949949
public async Task CheckDateTimeOffsetServiceWsdl(SoapSerializer soapSerializer)
950950
{
951-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
951+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
952952

953953
var wsdl = await GetWsdlFromMetaBodyWriter<DateTimeOffsetService>(soapSerializer);
954954
var root = XElement.Parse(wsdl);
@@ -987,7 +987,7 @@ public async Task CheckXmlSchemaProviderTypeServiceWsdl(SoapSerializer soapSeria
987987
Assert.IsNotNull(wsdl);
988988

989989
var root = XElement.Parse(wsdl);
990-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
990+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
991991

992992
var responseDateElem = root.XPathSelectElement("//xsd:element[@name='GetDateResponse']/xsd:complexType/xsd:sequence/xsd:element[@name='GetDateResult' and contains(@type, ':date')]", nm);
993993
Assert.IsNotNull(responseDateElem);
@@ -1011,7 +1011,7 @@ public async Task CheckArrayServiceWsdl()
10111011
Assert.IsNotNull(wsdl);
10121012

10131013
var root = XElement.Parse(wsdl);
1014-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1014+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
10151015

10161016
var nullableArray = root.XPathSelectElement("//xsd:complexType[@name='ArrayRequest']/xsd:sequence/xsd:element[@name='LongNullableArray' and @type='tns:ArrayOfNullableLong' and @nillable='true']", nm);
10171017
Assert.IsNotNull(nullableArray);
@@ -1051,7 +1051,7 @@ public void CheckEnumServiceWsdl()
10511051
Assert.IsNotNull(wsdl);
10521052

10531053
var root = XElement.Parse(wsdl);
1054-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1054+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
10551055

10561056
var normalEnum = root.XPathSelectElement("//xsd:complexType[@name='TypeWithEnums']/xsd:sequence/xsd:element[@name='Enum' and @type='tns:NulEnum' and not(@nillable)]", nm);
10571057
Assert.IsNotNull(normalEnum);
@@ -1069,7 +1069,7 @@ public void CheckEnumSpecifiedBoolWsdl()
10691069
Assert.IsNotNull(wsdl);
10701070

10711071
var root = XElement.Parse(wsdl);
1072-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1072+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
10731073

10741074
var enumWithSpecifiedBool = root.XPathSelectElement("//xsd:complexType[@name='TypeWithSpecifiedEnum']/xsd:sequence/xsd:element[@name='Enum' and @type='tns:NulEnum' and not(@nillable) and @minOccurs='0' and @maxOccurs='1']", nm);
10751075
Assert.IsNotNull(enumWithSpecifiedBool);
@@ -1126,7 +1126,7 @@ public async Task CheckXmlAnnotatedTypeServiceWsdl()
11261126
Assert.IsFalse(wsdl.Contains("name=\"\""));
11271127

11281128
var root = XElement.Parse(wsdl);
1129-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1129+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
11301130

11311131
var requestTypeElement = root.XPathSelectElement("//xsd:element[@name='RequestRoot']", nm);
11321132
Assert.IsNotNull(requestTypeElement);
@@ -1171,7 +1171,7 @@ public void CheckXmlArrayAttributeTypeServiceWsdl()
11711171
Assert.IsNotNull(wsdl);
11721172

11731173
var root = XElement.Parse(wsdl);
1174-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1174+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
11751175

11761176
var typeWithXmlArrayAttribute = root.XPathSelectElement("//xsd:complexType[@name='TypeWithXmlArrayAttribute']/xsd:sequence/xsd:element[@name='AvlRoomTypeItems' and @type='tns:ArrayOfAvlRoomTypeItem' and @nillable='true' and @minOccurs='0' and @maxOccurs='1']", nm);
11771177
Assert.IsNotNull(typeWithXmlArrayAttribute);
@@ -1193,7 +1193,7 @@ public async Task CheckXmlAnnotatedChoiceReturnServiceWsdl()
11931193
Assert.IsFalse(wsdl.Contains("name=\"\""));
11941194

11951195
var root = XElement.Parse(wsdl);
1196-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1196+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
11971197

11981198
var requestTypeElement = root.XPathSelectElement("//xsd:element[@name='GetResponseResponse']", nm);
11991199
Assert.IsNotNull(requestTypeElement);
@@ -1224,7 +1224,7 @@ public async Task CheckMessageHeadersServiceWsdl()
12241224
Assert.IsFalse(wsdl.Contains("name=\"\""));
12251225

12261226
var root = XElement.Parse(wsdl);
1227-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1227+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
12281228

12291229
var stringPropertyElement = root.XPathSelectElement("//xsd:element[@name='ModifiedStringProperty']", nm);
12301230
Assert.IsNotNull(stringPropertyElement);
@@ -1240,7 +1240,7 @@ public async Task CheckDefaultValueAttributesServiceWsdl()
12401240
Assert.IsFalse(wsdl.Contains("name=\"\""));
12411241

12421242
var root = XElement.Parse(wsdl);
1243-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1243+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
12441244

12451245
var booleanWithNoDefaultPropertyElement = root.XPathSelectElement("//xsd:element[@name='BooleanWithNoDefaultProperty' and @minOccurs='1' and @maxOccurs='1' and not(@default)]", nm);
12461246
Assert.IsNotNull(booleanWithNoDefaultPropertyElement);
@@ -1280,7 +1280,7 @@ public async Task CheckDataContractKnownTypeAttributeServiceWsdl()
12801280
Assert.IsFalse(wsdl.Contains("name=\"\""));
12811281

12821282
var root = XElement.Parse(wsdl);
1283-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1283+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
12841284

12851285
var schemaElement = root.XPathSelectElement("//xsd:schema[@targetNamespace='http://schemas.datacontract.org/2004/07/SoapCore.Tests.Model']", nm);
12861286
Assert.IsNotNull(schemaElement);
@@ -1300,7 +1300,7 @@ public void CheckComplexBaseTypeServiceWsdl()
13001300
Assert.IsNotNull(wsdl);
13011301

13021302
var root = XElement.Parse(wsdl);
1303-
var nm = Namespaces.CreateXmlNamespaceLookup(false).ToXmlNamespaceManager();
1303+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false).ToXmlNamespaceManager();
13041304

13051305
var derivedTypeContent = root.XPathSelectElement("//xsd:complexType[@name='DerivedType']/xsd:complexContent[@mixed='false']/xsd:extension[@base='tns:BaseType']/xsd:sequence/xsd:element[@name='DerivedName' and @type='xsd:string' and not(@nillable)]", nm);
13061306
Assert.IsNotNull(derivedTypeContent);
@@ -1370,7 +1370,7 @@ public void CheckSchemeOverride()
13701370
Assert.IsNotNull(wsdl);
13711371

13721372
var root = XElement.Parse(wsdl);
1373-
var nm = Namespaces.CreateXmlNamespaceLookup(false);
1373+
var nm = Namespaces.CreateDefaultXmlNamespaceLookup(false);
13741374

13751375
var addressElement = GetElements(root, _soapSchema + "address").SingleOrDefault(a => a.Attribute("location")?.Value.StartsWith("https") == true);
13761376
Assert.IsNotNull(addressElement);
@@ -1417,7 +1417,7 @@ private async Task<string> GetWsdlFromMetaBodyWriter<T>(SoapSerializer serialize
14171417
{
14181418
var service = new ServiceDescription(typeof(T), false);
14191419
var baseUrl = "http://tempuri.org/";
1420-
var xmlNamespaceLookup = Namespaces.CreateXmlNamespaceLookup(useMicrosoftGuid);
1420+
var xmlNamespaceLookup = Namespaces.CreateDefaultXmlNamespaceLookup(useMicrosoftGuid);
14211421
xmlNamespaceLookup.AddNamespace("tns", service.GeneralContract.Namespace);
14221422
var defaultBindingName = !string.IsNullOrWhiteSpace(bindingName) ? bindingName : "BasicHttpBinding";
14231423
var bodyWriter = serializer == SoapSerializer.DataContractSerializer

src/SoapCore/Namespaces.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static string AddNamespaceIfNotAlreadyPresentAndGetPrefix(ConcurrentXmlNa
5353
return existingPrefix;
5454
}
5555

56-
public static ConcurrentXmlNamespaceLookup CreateXmlNamespaceLookup(bool addMicrosoftTypesNamespace)
56+
public static ConcurrentXmlNamespaceLookup CreateDefaultXmlNamespaceLookup(bool addMicrosoftTypesNamespace)
5757
{
5858
var xmlNamespaceLookup = new ConcurrentXmlNamespaceLookup();
5959

src/SoapCore/SoapEndpointMiddleware.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ private ConcurrentXmlNamespaceLookup GetXmlNamespaceLookup(SoapMessageEncoder me
11781178

11791179
ConcurrentXmlNamespaceLookup CreateDefaultNamespaceManager(SoapMessageEncoder messageEncoder)
11801180
{
1181-
var xmlNamespaceLookup = Namespaces.CreateXmlNamespaceLookup(_options.UseMicrosoftGuid);
1181+
var xmlNamespaceLookup = Namespaces.CreateDefaultXmlNamespaceLookup(_options.UseMicrosoftGuid);
11821182

11831183
xmlNamespaceLookup.AddNamespace("tns", _service.GeneralContract.Namespace);
11841184

0 commit comments

Comments
 (0)