diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs index 03bf2d4e5e0f..177f84ba53c5 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs @@ -42,7 +42,7 @@ public class Atom10FeedFormatter : SyndicationFeedFormatter public Func stringParser = DefaultStringParser; public Func dateParser = DefaultDateFromString; public Func uriParser = DefaultUriParser; - + private static string DefaultStringParser(string value, string localName, string ns) { return value; @@ -50,9 +50,9 @@ private static string DefaultStringParser(string value, string localName, string private static Uri DefaultUriParser(string value, UriKind kind, string localName, string ns) { - return new Uri(value,kind); + return new Uri(value, kind); } - + public Atom10FeedFormatter() : this(typeof(SyndicationFeed)) { @@ -117,7 +117,7 @@ public override bool CanRead(XmlReader reader) return reader.IsStartElement(Atom10Constants.FeedTag, Atom10Constants.Atom10Namespace); } - + public override async Task ReadFromAsync(XmlReader reader, CancellationToken ct) { if (!CanRead(reader)) @@ -154,7 +154,7 @@ internal static async Task ReadCategoryAsync(XmlReaderWrapp string value = await reader.GetValueAsync(); bool notHandled = false; - if(reader.NamespaceURI == string.Empty) + if (reader.NamespaceURI == string.Empty) { switch (reader.LocalName) { @@ -290,7 +290,7 @@ internal async Task TryParseFeedElementFromAsync(XmlReaderWrapper reader, string name = reader.LocalName; string ns = reader.NamespaceURI; - if(ns == Atom10Constants.Atom10Namespace) + if (ns == Atom10Constants.Atom10Namespace) { switch (name) { @@ -304,10 +304,10 @@ internal async Task TryParseFeedElementFromAsync(XmlReaderWrapper reader, result.Contributors.Add(await ReadPersonFromAsync(reader, result)); break; case Atom10Constants.GeneratorTag: - result.Generator = stringParser(await reader.ReadElementStringAsync(),Atom10Constants.GeneratorTag,ns); + result.Generator = stringParser(await reader.ReadElementStringAsync(), Atom10Constants.GeneratorTag, ns); break; case Atom10Constants.IdTag: - result.Id = stringParser(await reader.ReadElementStringAsync(),Atom10Constants.IdTag,ns); + result.Id = stringParser(await reader.ReadElementStringAsync(), Atom10Constants.IdTag, ns); break; case Atom10Constants.LinkTag: result.Links.Add(await ReadLinkFromAsync(reader, result)); @@ -352,7 +352,7 @@ internal async Task TryParseItemElementFromAsync(XmlReaderWrapper reader, string name = reader.LocalName; string ns = reader.NamespaceURI; - if(ns == Atom10Constants.Atom10Namespace) + if (ns == Atom10Constants.Atom10Namespace) { switch (name) { @@ -369,7 +369,7 @@ internal async Task TryParseItemElementFromAsync(XmlReaderWrapper reader, result.Contributors.Add(await ReadPersonFromAsync(reader, result)); break; case Atom10Constants.IdTag: - result.Id = stringParser(await reader.ReadElementStringAsync(),Atom10Constants.IdTag,ns); + result.Id = stringParser(await reader.ReadElementStringAsync(), Atom10Constants.IdTag, ns); break; case Atom10Constants.LinkTag: result.Links.Add(await ReadLinkFromAsync(reader, result)); @@ -486,7 +486,7 @@ internal async Task WriteItemContributorsToAsync(XmlWriter writer, Collection ReadTextContentFromHelperAsync(XmlReaderWrapper reader, string type, string context, bool preserveAttributeExtensions) { if (string.IsNullOrEmpty(type)) @@ -657,7 +657,7 @@ private async Task ReadTextContentFromHelperAsync(XmlRea reader.MoveToElement(); string localName = reader.LocalName; string nameSpace = reader.NamespaceURI; - string val = (kind == TextSyndicationContentKind.XHtml) ? await reader.ReadInnerXmlAsync() : stringParser(await reader.ReadElementStringAsync(),localName,nameSpace); // cant custom parse because its static + string val = (kind == TextSyndicationContentKind.XHtml) ? await reader.ReadInnerXmlAsync() : stringParser(await reader.ReadElementStringAsync(), localName, nameSpace); // cant custom parse because its static TextSyndicationContent result = new TextSyndicationContent(val, kind); if (attrs != null) { @@ -683,7 +683,7 @@ private string AsString(DateTimeOffset dateTime) return dateTime.ToString(Rfc3339LocalDateTimeFormat, CultureInfo.InvariantCulture); } } - + private static DateTimeOffset DefaultDateFromString(string dateTimeString, string localName, string ns) { dateTimeString = dateTimeString.Trim(); @@ -721,10 +721,10 @@ private static DateTimeOffset DefaultDateFromString(string dateTimeString, strin //if imposible to parse, return default date return new DateTimeOffset(); } - + private Task ReadCategoryAsync(XmlReaderWrapper reader, SyndicationCategory category) { - return ReadCategoryAsync(reader, category, this.Version, this.PreserveAttributeExtensions, this.PreserveElementExtensions, _maxExtensionSize); + return ReadCategoryAsync(reader, category, this.Version, this.PreserveAttributeExtensions, this.PreserveElementExtensions, _maxExtensionSize); } private Task ReadCategoryFromAsync(XmlReaderWrapper reader, SyndicationFeed feed) @@ -733,14 +733,14 @@ private Task ReadCategoryFromAsync(XmlReaderWrapper reader, SyndicationCategory result = CreateCategory(feed); return ReadCategoryAsync(reader, result); } - + private async Task ReadCategoryFromAsync(XmlReaderWrapper reader, SyndicationItem item) { SyndicationCategory result = CreateCategory(item); await ReadCategoryAsync(reader, result); return result; } - + private async Task ReadContentFromAsync(XmlReaderWrapper reader, SyndicationItem item) { await MoveToStartElementAsync(reader); @@ -856,7 +856,7 @@ private async Task ReadFeedFromAsync(XmlReaderWrapper reader, S XmlBuffer buffer = null; XmlDictionaryWriter extWriter = null; - + if (!elementIsEmpty) { try @@ -923,8 +923,7 @@ private async Task ReadFeedFromAsync(XmlReaderWrapper reader, S return result; } - - + private async Task ReadItemFromAsync(XmlReaderWrapper reader, SyndicationItem result, Uri feedBaseUri) { try @@ -1005,14 +1004,13 @@ private async Task ReadItemFromAsync(XmlReaderWrapper reader, SyndicationItem re catch (FormatException e) { throw new XmlException(FeedUtils.AddLineInfo(reader, SR.ErrorParsingItem), e); - } catch (ArgumentException e) { throw new XmlException(FeedUtils.AddLineInfo(reader, SR.ErrorParsingItem), e); } } - + private async Task ReadLinkAsync(XmlReaderWrapper reader, SyndicationLink link, Uri baseUri) { bool isEmpty = reader.IsEmptyElement; @@ -1032,7 +1030,7 @@ private async Task ReadLinkAsync(XmlReaderWrapper reader, SyndicationLink link, { link.BaseUri = FeedUtils.CombineXmlBase(link.BaseUri, await reader.GetValueAsync()); } - else if(reader.NamespaceURI == string.Empty) + else if (reader.NamespaceURI == string.Empty) { switch (reader.LocalName) { @@ -1125,30 +1123,30 @@ private async Task ReadLinkAsync(XmlReaderWrapper reader, SyndicationLink link, link.MediaType = mediaType; link.RelationshipType = relationship; link.Title = title; - link.Uri = (val != null) ? uriParser(val,UriKind.RelativeOrAbsolute,Atom10Constants.LinkTag,ns) /*new Uri(val, UriKind.RelativeOrAbsolute)*/ : null; + link.Uri = (val != null) ? uriParser(val, UriKind.RelativeOrAbsolute, Atom10Constants.LinkTag, ns) /*new Uri(val, UriKind.RelativeOrAbsolute)*/ : null; } - + private async Task ReadLinkFromAsync(XmlReaderWrapper reader, SyndicationFeed feed) { SyndicationLink result = CreateLink(feed); await ReadLinkAsync(reader, result, feed.BaseUri); return result; } - + private async Task ReadLinkFromAsync(XmlReaderWrapper reader, SyndicationItem item) { SyndicationLink result = CreateLink(item); await ReadLinkAsync(reader, result, item.BaseUri); return result; } - + private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationFeed feed) { SyndicationPerson result = CreatePerson(feed); await ReadPersonFromAsync(reader, result); return result; } - + private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationItem item) { SyndicationPerson result = CreatePerson(item); @@ -1196,20 +1194,20 @@ private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationPerso switch (name) { case Atom10Constants.NameTag: - result.Name = stringParser(await reader.ReadElementStringAsync(),Atom10Constants.NameTag,ns); + result.Name = stringParser(await reader.ReadElementStringAsync(), Atom10Constants.NameTag, ns); break; case Atom10Constants.UriTag: - result.Uri = stringParser(await reader.ReadElementStringAsync(),Atom10Constants.UriTag,ns); + result.Uri = stringParser(await reader.ReadElementStringAsync(), Atom10Constants.UriTag, ns); break; case Atom10Constants.EmailTag: - result.Email = stringParser(await reader.ReadElementStringAsync(),Atom10Constants.EmailTag,ns); + result.Email = stringParser(await reader.ReadElementStringAsync(), Atom10Constants.EmailTag, ns); break; default: notHandled = true; break; } - if(notHandled && !TryParseElement(reader, result, this.Version)) + if (notHandled && !TryParseElement(reader, result, this.Version)) { if (_preserveElementExtensions) { @@ -1226,7 +1224,7 @@ private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationPerso { await reader.SkipAsync(); } - } + } } LoadElementExtensions(buffer, extWriter, result); @@ -1242,12 +1240,12 @@ private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationPerso await reader.ReadEndElementAsync(); } } - + private Task ReadTextContentFromAsync(XmlReaderWrapper reader, string context) { - return ReadTextContentFromAsync(reader, context, this.PreserveAttributeExtensions); + return ReadTextContentFromAsync(reader, context, this.PreserveAttributeExtensions); } - + private async Task WriteCategoriesToAsync(XmlWriter writer, Collection categories) { writer = XmlWriterWrapper.CreateFromWriter(writer); @@ -1256,7 +1254,7 @@ private async Task WriteCategoriesToAsync(XmlWriter writer, Collection CanReadAsync(XmlReader reader) - { + { if (reader == null) { throw new ArgumentNullException(nameof(reader)); @@ -91,9 +90,9 @@ public override Task CanReadAsync(XmlReader reader) return wrappedReader.IsStartElementAsync(App10Constants.Categories, App10Constants.Namespace); } - - Task ReadXmlAsync(XmlReaderWrapper reader) + + private Task ReadXmlAsync(XmlReaderWrapper reader) { if (reader == null) { @@ -103,7 +102,7 @@ Task ReadXmlAsync(XmlReaderWrapper reader) return ReadDocumentAsync(reader); } - Task WriteXmlAsync(XmlWriter writer) + private Task WriteXmlAsync(XmlWriter writer) { if (writer == null) { @@ -173,7 +172,7 @@ protected override ReferencedCategoriesDocument CreateReferencedCategoriesDocume return (ReferencedCategoriesDocument)Activator.CreateInstance(_referencedDocumentType); } } - + private async Task ReadDocumentAsync(XmlReaderWrapper reader) { try @@ -204,7 +203,7 @@ private async Task ReadDocumentAsync(XmlReaderWrapper reader) } } - private Task WriteDocumentAsync(XmlWriter writer) + private Task WriteDocumentAsync(XmlWriter writer) { // declare the atom10 namespace upfront for compactness writer.WriteAttributeString(Atom10Constants.Atom10Prefix, Atom10FeedFormatter.XmlNsNs, Atom10Constants.Atom10Namespace); diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/AtomPub10ServiceDocumentFormatter.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/AtomPub10ServiceDocumentFormatter.cs index 61f83aba3fd2..d114695ef261 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/AtomPub10ServiceDocumentFormatter.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/AtomPub10ServiceDocumentFormatter.cs @@ -4,7 +4,6 @@ namespace System.ServiceModel.Syndication { - using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; @@ -72,7 +71,7 @@ public override Task CanReadAsync(XmlReader reader) return readerWrapper.IsStartElementAsync(App10Constants.Service, App10Constants.Namespace); } - Task ReadXml(XmlReaderWrapper reader) + private Task ReadXml(XmlReaderWrapper reader) { if (reader == null) { @@ -82,7 +81,7 @@ Task ReadXml(XmlReaderWrapper reader) return ReadDocumentAsync(reader); } - Task WriteXml(XmlWriter writer) + private Task WriteXml(XmlWriter writer) { if (writer == null) { @@ -187,7 +186,7 @@ protected override ServiceDocument CreateDocumentInstance() return (ServiceDocument)Activator.CreateInstance(_documentType); } } - + private static async Task ReadInlineCategoriesAsync(XmlReaderWrapper reader, InlineCategoriesDocument inlineCategories, Uri baseUri, string version, bool preserveElementExtensions, bool preserveAttributeExtensions, int _maxExtensionSize) { inlineCategories.BaseUri = baseUri; @@ -280,7 +279,7 @@ private static async Task ReadInlineCategoriesAsync(XmlReaderWrapper reader, Inl await reader.ReadEndElementAsync(); } } - + private static async Task ReadReferencedCategoriesAsync(XmlReaderWrapper reader, ReferencedCategoriesDocument referencedCategories, Uri baseUri, Uri link, string version, bool preserveElementExtensions, bool preserveAttributeExtensions, int maxExtensionSize) { referencedCategories.BaseUri = baseUri; @@ -357,14 +356,14 @@ private static async Task ReadReferencedCategoriesAsync(XmlReaderWrapper reader, await reader.ReadEndElementAsync(); } } - + private static async Task WriteCategoriesAsync(XmlWriter writer, CategoriesDocument categories, Uri baseUri, string version) { await writer.WriteStartElementAsync(App10Constants.Prefix, App10Constants.Categories, App10Constants.Namespace); await WriteCategoriesInnerXml(writer, categories, baseUri, version); await writer.WriteEndElementAsync(); } - + private static async Task WriteInlineCategoriesContentAsync(XmlWriter writer, InlineCategoriesDocument categories, string version) { writer = XmlWriterWrapper.CreateFromWriter(writer); @@ -408,7 +407,7 @@ private static void WriteXmlLang(XmlWriter writer, string lang) { writer.WriteAttributeString("xml", "lang", Atom10FeedFormatter.XmlNs, lang); } - + private async Task ReadCollection(XmlReaderWrapper reader, Workspace workspace) { ResourceCollectionInfo result = CreateCollection(workspace); @@ -513,7 +512,7 @@ private async Task ReadCollection(XmlReaderWrapper reade reader.ReadEndElement(); return result; } - + private async Task ReadDocumentAsync(XmlReaderWrapper reader) { ServiceDocument result = CreateDocumentInstance(); @@ -606,7 +605,7 @@ private async Task ReadDocumentAsync(XmlReaderWrapper reader) SetDocument(result); } - + private async Task ReadWorkspace(XmlReaderWrapper reader, ServiceDocument document) { Workspace result = CreateWorkspace(document); @@ -617,7 +616,7 @@ private async Task ReadWorkspace(XmlReaderWrapper reader, ServiceDocu { if (reader.LocalName == "base" && reader.NamespaceURI == Atom10FeedFormatter.XmlNs) { - result.BaseUri = FeedUtils.CombineXmlBase(result.BaseUri,await reader.GetValueAsync()); + result.BaseUri = FeedUtils.CombineXmlBase(result.BaseUri, await reader.GetValueAsync()); } else { @@ -641,7 +640,7 @@ private async Task ReadWorkspace(XmlReaderWrapper reader, ServiceDocu } XmlBuffer buffer = null; - XmlDictionaryWriter extWriter = null; + XmlDictionaryWriter extWriter = null; await reader.ReadStartElementAsync(); try { @@ -683,7 +682,7 @@ private async Task ReadWorkspace(XmlReaderWrapper reader, ServiceDocu await reader.ReadEndElementAsync(); return result; } - + private async Task WriteCollectionAsync(XmlWriter writer, ResourceCollectionInfo collection, Uri baseUri) { await writer.WriteStartElementAsync(App10Constants.Prefix, App10Constants.Collection, App10Constants.Namespace); @@ -718,7 +717,7 @@ private async Task WriteCollectionAsync(XmlWriter writer, ResourceCollectionInfo await WriteElementExtensionsAsync(writer, collection, this.Version); await writer.WriteEndElementAsync(); } - + private async Task WriteDocumentAsync(XmlWriter writer) { // declare the atom10 namespace upfront for compactness @@ -743,7 +742,7 @@ private async Task WriteDocumentAsync(XmlWriter writer) await WriteElementExtensionsAsync(writer, this.Document, this.Version); } - + private async Task WriteWorkspaceAsync(XmlWriter writer, Workspace workspace, Uri baseUri) { await writer.WriteStartElementAsync(App10Constants.Prefix, App10Constants.Workspace, App10Constants.Namespace); diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs index 10b65da082af..c5fdcb189b61 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20FeedFormatter.cs @@ -24,7 +24,7 @@ public class Rss20FeedFormatter : SyndicationFeedFormatter private static readonly XmlQualifiedName s_rss20Length = new XmlQualifiedName(Rss20Constants.LengthTag, string.Empty); private static readonly XmlQualifiedName s_rss20Type = new XmlQualifiedName(Rss20Constants.TypeTag, string.Empty); private static readonly XmlQualifiedName s_rss20Url = new XmlQualifiedName(Rss20Constants.UrlTag, string.Empty); - private static List acceptedDays = new List { "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday" }; + private static List s_acceptedDays = new List { "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday" }; private const string Rfc822OutputLocalDateTimeFormat = "ddd, dd MMM yyyy HH:mm:ss zzz"; private const string Rfc822OutputUtcDateTimeFormat = "ddd, dd MMM yyyy HH:mm:ss Z"; @@ -62,7 +62,7 @@ private async Task OnReadImage(XmlReaderWrapper reader, SyndicationFeed re { result.ImageUrl = UriParser(await reader.ReadElementStringAsync(), Rss20Constants.UrlTag, Rss20Constants.Rss20Namespace); } - else if(await reader.IsStartElementAsync(Rss20Constants.LinkTag, Rss20Constants.Rss20Namespace)) + else if (await reader.IsStartElementAsync(Rss20Constants.LinkTag, Rss20Constants.Rss20Namespace)) { result.ImageLink = UriParser(await reader.ReadElementStringAsync(), Rss20Constants.LinkTag, Rss20Constants.Rss20Namespace); } @@ -277,7 +277,7 @@ private async Task ReadItemFromAsync(XmlReaderWrapper reader, SyndicationItem re { bool isPermalink = true; string permalinkString = reader.GetAttribute(Rss20Constants.IsPermaLinkTag, Rss20Constants.Rss20Namespace); - if (permalinkString != null && permalinkString.Equals("false",StringComparison.OrdinalIgnoreCase)) + if (permalinkString != null && permalinkString.Equals("false", StringComparison.OrdinalIgnoreCase)) { isPermalink = false; } @@ -326,7 +326,7 @@ private async Task ReadItemFromAsync(XmlReaderWrapper reader, SyndicationItem re string val = await reader.GetValueAsync(); if (name == Rss20Constants.UrlTag && ns == Rss20Constants.Rss20Namespace) { - feed.Links.Add(SyndicationLink.CreateSelfLink(UriParser(val, Rss20Constants.UrlTag,ns))); + feed.Links.Add(SyndicationLink.CreateSelfLink(UriParser(val, Rss20Constants.UrlTag, ns))); } else if (!FeedUtils.IsXmlns(name, ns)) { @@ -551,22 +551,21 @@ private static string NormalizeTimeZone(string rfc822TimeZone, out bool isUtc) return ""; } } - + private async Task ReadSkipHoursAsync(XmlReaderWrapper reader, SyndicationFeed result) { await reader.ReadStartElementAsync(); while (await reader.IsStartElementAsync()) { - - if(reader.LocalName == Rss20Constants.HourTag) + if (reader.LocalName == Rss20Constants.HourTag) { string val = StringParser(await reader.ReadElementStringAsync(), Rss20Constants.HourTag, Rss20Constants.Rss20Namespace); int hour = int.Parse(val); bool parsed = false; - parsed = int.TryParse(val,NumberStyles.Integer,NumberFormatInfo.InvariantInfo,out hour); + parsed = int.TryParse(val, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out hour); - if(parsed == false) + if (parsed == false) { throw new ArgumentException("The number on skip hours must be an integer betwen 0 and 23."); } @@ -582,7 +581,6 @@ private async Task ReadSkipHoursAsync(XmlReaderWrapper reader, SyndicationFeed r { await reader.SkipAsync(); } - } await reader.ReadEndElementAsync(); @@ -591,7 +589,7 @@ private async Task ReadSkipHoursAsync(XmlReaderWrapper reader, SyndicationFeed r private bool checkDay(string day) { - if (acceptedDays.Contains(day.ToLower())) + if (s_acceptedDays.Contains(day.ToLower())) { return true; } @@ -640,7 +638,7 @@ internal static void RemoveExtraWhiteSpaceAtStart(StringBuilder stringBuilder) stringBuilder.Remove(0, i); } } - + private static void ReplaceMultipleWhiteSpaceWithSingleWhiteSpace(StringBuilder builder) { int index = 0; @@ -686,7 +684,7 @@ private string AsString(DateTimeOffset dateTime) return sb.ToString(); } } - + private async Task ReadAlternateLinkAsync(XmlReaderWrapper reader, Uri baseUri) { SyndicationLink link = new SyndicationLink(); @@ -714,14 +712,14 @@ private async Task ReadAlternateLinkAsync(XmlReaderWrapper read link.Uri = UriParser(await reader.ReadElementStringAsync(), localName, namespaceUri);//new Uri(uri, UriKind.RelativeOrAbsolute); return link; } - + private async Task ReadCategoryAsync(XmlReaderWrapper reader, SyndicationFeed feed) { SyndicationCategory result = CreateCategory(feed); await ReadCategoryAsync(reader, result); return result; } - + private async Task ReadCategoryAsync(XmlReaderWrapper reader, SyndicationCategory category) { bool isEmpty = reader.IsEmptyElement; @@ -758,7 +756,7 @@ private async Task ReadCategoryAsync(XmlReaderWrapper reader, SyndicationCategor await reader.ReadEndElementAsync(); } } - + private async Task ReadCategoryAsync(XmlReaderWrapper reader, SyndicationItem item) { SyndicationCategory result = CreateCategory(item); @@ -855,7 +853,7 @@ private async Task ReadPersonAsync(XmlReaderWrapper reader, SyndicationPerson pe await reader.ReadStartElementAsync(); if (!isEmpty) { - string email = StringParser(await reader.ReadStringAsync(),reader.LocalName,reader.NamespaceURI); + string email = StringParser(await reader.ReadStringAsync(), reader.LocalName, reader.NamespaceURI); await reader.ReadEndElementAsync(); person.Email = email; } @@ -911,7 +909,7 @@ private async Task readTextInputTag(XmlReaderWrapper reader, SyndicationFeed res } } - if(checkTextInput(textInput) == true) + if (checkTextInput(textInput) == true) { result.TextInput = textInput; } @@ -1169,7 +1167,7 @@ private async Task WriteAlternateLinkAsync(XmlWriter writer, SyndicationLink lin await writer.WriteStringAsync(FeedUtils.GetUriString(link.Uri)); await writer.WriteEndElementAsync(); } - + private async Task WriteCategoryAsync(XmlWriter writer, SyndicationCategory category) { if (category == null) @@ -1185,7 +1183,7 @@ private async Task WriteCategoryAsync(XmlWriter writer, SyndicationCategory cate await writer.WriteStringAsync(category.Name); await writer.WriteEndElementAsync(); } - + private async Task WriteFeedAsync(XmlWriter writer) { if (this.Feed == null) @@ -1286,39 +1284,39 @@ private async Task WriteFeedAsync(XmlWriter writer) //Optional spec items //time to live - if(this.Feed.TimeToLive != 0) + if (this.Feed.TimeToLive != 0) { await writer.WriteElementStringAsync(Rss20Constants.TimeToLiveTag, this.Feed.TimeToLive.ToString()); } //skiphours - if(this.Feed.SkipHours.Count > 0) + if (this.Feed.SkipHours.Count > 0) { await writer.WriteStartElementAsync(Rss20Constants.SkipHoursTag); - foreach(int hour in this.Feed.SkipHours) + foreach (int hour in this.Feed.SkipHours) { - writer.WriteElementString(Rss20Constants.HourTag,hour.ToString()); + writer.WriteElementString(Rss20Constants.HourTag, hour.ToString()); } await writer.WriteEndElementAsync(); } //skipDays - if(this.Feed.SkipDays.Count > 0) + if (this.Feed.SkipDays.Count > 0) { await writer.WriteStartElementAsync(Rss20Constants.SkipDaysTag); - foreach(string day in this.Feed.SkipDays) + foreach (string day in this.Feed.SkipDays) { - await writer.WriteElementStringAsync(Rss20Constants.DayTag,day); + await writer.WriteElementStringAsync(Rss20Constants.DayTag, day); } await writer.WriteEndElementAsync(); } //textinput - if(this.Feed.TextInput != null) + if (this.Feed.TextInput != null) { await writer.WriteStartElementAsync(Rss20Constants.TextInputTag); @@ -1329,7 +1327,7 @@ private async Task WriteFeedAsync(XmlWriter writer) await writer.WriteEndElementAsync(); } - + if (_serializeExtensionsAsAtom) { await _atomSerializer.WriteElementAsync(writer, Atom10Constants.IdTag, this.Feed.Id); @@ -1351,7 +1349,7 @@ private async Task WriteFeedAsync(XmlWriter writer) await WriteItemsAsync(writer, this.Feed.Items, this.Feed.BaseUri); await writer.WriteEndElementAsync(); // channel } - + private async Task WriteItemContentsAsync(XmlWriter writer, SyndicationItem item, Uri feedBaseUri) { Uri baseUriToWrite = FeedUtils.GetBaseUriToWrite(feedBaseUri, item.BaseUri); @@ -1526,7 +1524,7 @@ private async Task WriteItemContentsAsync(XmlWriter writer, SyndicationItem item await WriteElementExtensionsAsync(writer, item, this.Version); } - + private async Task WriteMediaEnclosureAsync(XmlWriter writer, SyndicationLink link, Uri baseUri) { await writer.WriteStartElementAsync(Rss20Constants.EnclosureTag, Rss20Constants.Rss20Namespace); @@ -1550,7 +1548,7 @@ private async Task WriteMediaEnclosureAsync(XmlWriter writer, SyndicationLink li } await writer.WriteEndElementAsync(); } - + private async Task WritePersonAsync(XmlWriter writer, string elementTag, SyndicationPerson person) { await writer.WriteStartElementAsync(elementTag, Rss20Constants.Rss20Namespace); @@ -1566,9 +1564,9 @@ private static bool OriginalDateParser(string dateTimeString, out DateTimeOffset { return false; } - + int timeZoneStartIndex; - for (timeZoneStartIndex = dateTimeStringBuilder.Length-1; dateTimeStringBuilder[timeZoneStartIndex] != ' '; timeZoneStartIndex--); + for (timeZoneStartIndex = dateTimeStringBuilder.Length - 1; dateTimeStringBuilder[timeZoneStartIndex] != ' '; timeZoneStartIndex--) ; timeZoneStartIndex++; string timeZoneSuffix = dateTimeStringBuilder.ToString().Substring(timeZoneStartIndex); @@ -1578,13 +1576,13 @@ private static bool OriginalDateParser(string dateTimeString, out DateTimeOffset string wellFormattedString = dateTimeStringBuilder.ToString(); DateTimeOffset theTime; - string[] parseFormat = + string[] parseFormat = { "ddd, dd MMMM yyyy HH:mm:ss zzz", "dd MMMM yyyy HH:mm:ss zzz", "ddd, dd MMM yyyy HH:mm:ss zzz", "dd MMM yyyy HH:mm:ss zzz", - + "ddd, dd MMMM yyyy HH:mm zzz", "dd MMMM yyyy HH:mm zzz", "ddd, dd MMM yyyy HH:mm zzz", @@ -1613,7 +1611,7 @@ public static DateTimeOffset DefaultDateParser(string dateTimeString, string loc //original parser here - parsed = OriginalDateParser(dateTimeString,out dto); + parsed = OriginalDateParser(dateTimeString, out dto); if (parsed) return dto; diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20ItemFormatter.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20ItemFormatter.cs index 6581dff9c976..a432f7a496d6 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20ItemFormatter.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Rss20ItemFormatter.cs @@ -114,8 +114,8 @@ public override bool CanRead(XmlReader reader) return reader.IsStartElement(Rss20Constants.ItemTag, Rss20Constants.Rss20Namespace); } - - async Task WriteXml(XmlWriter writer) + + private async Task WriteXml(XmlWriter writer) { if (writer == null) { @@ -152,7 +152,7 @@ protected override SyndicationItem CreateItemInstance() { return SyndicationItemFormatter.CreateItemInstance(_itemType); } - + private Task ReadItemAsync(XmlReaderWrapper reader) { SetItem(CreateItemInstance()); diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/ServiceDocument.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/ServiceDocument.cs index f21e658cbcf3..140800a71bf6 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/ServiceDocument.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/ServiceDocument.cs @@ -10,7 +10,7 @@ namespace System.ServiceModel.Syndication using System.Runtime.CompilerServices; using System.Threading.Tasks; using System.Xml; - + public class ServiceDocument : IExtensibleSyndicationObject { private Uri _baseUri; diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationElementExtension.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationElementExtension.cs index 3b2ff90f926b..e62e62642402 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationElementExtension.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationElementExtension.cs @@ -12,7 +12,7 @@ namespace System.ServiceModel.Syndication using System.Threading.Tasks; using System.Xml; using System.Xml.Serialization; - + public class SyndicationElementExtension { private XmlBuffer _buffer; diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationFeed.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationFeed.cs index 1bac5e8c558e..e6530c817cce 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationFeed.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationFeed.cs @@ -30,7 +30,7 @@ public class SyndicationFeed : IExtensibleSyndicationObject private Uri _imageUrl; private TextSyndicationContent _imageTitle; private Uri _imageLink; - + private IEnumerable _items; private string _language; private DateTimeOffset _lastUpdatedTime; @@ -57,7 +57,7 @@ public Uri IconImage throw new ArgumentNullException(nameof(value)); _iconImage = value; } - } + } public SyndicationTextInput TextInput { @@ -87,7 +87,8 @@ public SyndicationLink Documentation public int TimeToLive { - get { + get + { return _timeToLive; } set @@ -114,7 +115,7 @@ public Collection SkipDays _skipDays = new Collection(); return _skipDays; } - } + } //====================================== @@ -285,12 +286,14 @@ public Uri ImageUrl set { _imageUrl = value; } } - public TextSyndicationContent ImageTitle { + public TextSyndicationContent ImageTitle + { get { return _imageTitle; } set { _imageTitle = value; } } - public Uri ImageLink { + public Uri ImageLink + { get { return _imageLink; } set { _imageLink = value; } } @@ -391,7 +394,7 @@ public static TSyndicationFeed Load(XmlReader reader) where TSyndicationFeed : SyndicationFeed, new() { CancellationToken ct = new CancellationToken(); - return LoadAsync(reader,ct).GetAwaiter().GetResult(); + return LoadAsync(reader, ct).GetAwaiter().GetResult(); } public static async Task LoadAsync(XmlReader reader, CancellationToken ct) diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationFeedFormatter.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationFeedFormatter.cs index 7b2ab9609d07..1fc464787bd3 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationFeedFormatter.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationFeedFormatter.cs @@ -370,13 +370,13 @@ internal static protected Task WriteElementExtensionsAsync(XmlWriter writer, Syn return person.WriteElementExtensionsAsync(writer, version); } - internal protected virtual void SetFeed(SyndicationFeed feed) { + internal protected virtual void SetFeed(SyndicationFeed feed) + { _feed = feed ?? throw new ArgumentNullException(nameof(feed)); } internal static void CloseBuffer(XmlBuffer buffer, XmlDictionaryWriter extWriter) { - if (buffer == null) { return; @@ -386,7 +386,7 @@ internal static void CloseBuffer(XmlBuffer buffer, XmlDictionaryWriter extWriter buffer.Close(); } - internal static async Task> CreateBufferIfRequiredAndWriteNodeAsync(XmlBuffer buffer, XmlDictionaryWriter extWriter, XmlReader reader, int maxExtensionSize) + internal static async Task> CreateBufferIfRequiredAndWriteNodeAsync(XmlBuffer buffer, XmlDictionaryWriter extWriter, XmlReader reader, int maxExtensionSize) { if (buffer == null) { @@ -436,7 +436,6 @@ internal static void LoadElementExtensions(XmlBuffer buffer, XmlDictionaryWriter internal static void LoadElementExtensions(XmlBuffer buffer, XmlDictionaryWriter writer, SyndicationItem item) { - if (item == null) { throw new ArgumentNullException(nameof(item)); diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationItem.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationItem.cs index 7d3408233c88..ca308a4522dd 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationItem.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationItem.cs @@ -201,7 +201,7 @@ public static Task LoadAsync(XmlReader reader) { return LoadAsync(reader); } - + public static async Task LoadAsync(XmlReader reader) where TSyndicationItem : SyndicationItem, new() { diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationItemFormatter.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationItemFormatter.cs index 884255d27665..4483f94ba0cb 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationItemFormatter.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/SyndicationItemFormatter.cs @@ -42,7 +42,7 @@ public abstract String Version { get; } public abstract bool CanRead(XmlReader reader); - + public abstract Task ReadFromAsync(XmlReader reader); public override string ToString() diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/XmlReaderWrapper.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/XmlReaderWrapper.cs index 5e8d8d292568..f7c66af2ed80 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/XmlReaderWrapper.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/XmlReaderWrapper.cs @@ -1,4 +1,8 @@ -using System; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; using System.Diagnostics; using System.Threading.Tasks; using System.Xml; @@ -7,13 +11,13 @@ namespace System.ServiceModel.Syndication { internal class XmlReaderWrapper : XmlReader { - private XmlReader reader; + private XmlReader _reader; - private Func> getValueFunc; - private Func> moveToContentFunc; - private Func skipFunc; - private Func> readFunc; - private Func> readInnerXmlFunc; + private Func> _getValueFunc; + private Func> _moveToContentFunc; + private Func _skipFunc; + private Func> _readFunc; + private Func> _readInnerXmlFunc; private XmlReaderWrapper(XmlReader reader) { @@ -22,9 +26,9 @@ private XmlReaderWrapper(XmlReader reader) throw new ArgumentNullException(nameof(reader)); } - this.reader = reader; + _reader = reader; - if (this.reader.Settings.Async) + if (_reader.Settings.Async) { InitAsync(); } @@ -42,27 +46,27 @@ public static XmlReaderWrapper CreateFromReader(XmlReader reader) private void InitAsync() { - this.getValueFunc = new Func>((thisPtr) => { return thisPtr.reader.GetValueAsync(); }); - this.moveToContentFunc = new Func>((thisPtr) => { return thisPtr.reader.MoveToContentAsync(); }); - this.skipFunc = new Func((thisPtr) => { return thisPtr.reader.SkipAsync(); }); - this.readFunc = new Func>((thisPtr) => { return thisPtr.reader.ReadAsync(); }); - this.readInnerXmlFunc = new Func>((thisPtr) => { return thisPtr.reader.ReadInnerXmlAsync(); }); + _getValueFunc = new Func>((thisPtr) => { return thisPtr._reader.GetValueAsync(); }); + _moveToContentFunc = new Func>((thisPtr) => { return thisPtr._reader.MoveToContentAsync(); }); + _skipFunc = new Func((thisPtr) => { return thisPtr._reader.SkipAsync(); }); + _readFunc = new Func>((thisPtr) => { return thisPtr._reader.ReadAsync(); }); + _readInnerXmlFunc = new Func>((thisPtr) => { return thisPtr._reader.ReadInnerXmlAsync(); }); } private void Init() { - this.getValueFunc = new Func>((thisPtr) => { return Task.FromResult(thisPtr.reader.Value); }); - this.moveToContentFunc = new Func>((thisPtr) => { return Task.FromResult(this.reader.MoveToContent()); }); - this.skipFunc = new Func((thisPtr) => { this.reader.Skip(); return Task.CompletedTask; }); - this.readFunc = new Func>((thisPtr) => { return Task.FromResult(this.reader.Read()); }); - this.readInnerXmlFunc = new Func>((thisPtr) => { return Task.FromResult(this.reader.ReadInnerXml()); }); + _getValueFunc = new Func>((thisPtr) => { return Task.FromResult(thisPtr._reader.Value); }); + _moveToContentFunc = new Func>((thisPtr) => { return Task.FromResult(_reader.MoveToContent()); }); + _skipFunc = new Func((thisPtr) => { _reader.Skip(); return Task.CompletedTask; }); + _readFunc = new Func>((thisPtr) => { return Task.FromResult(_reader.Read()); }); + _readInnerXmlFunc = new Func>((thisPtr) => { return Task.FromResult(_reader.ReadInnerXml()); }); } public override XmlNodeType NodeType { get { - return this.reader.NodeType; + return _reader.NodeType; } } @@ -70,7 +74,7 @@ public override string LocalName { get { - return this.reader.LocalName; + return _reader.LocalName; } } @@ -78,7 +82,7 @@ public override string NamespaceURI { get { - return this.reader.NamespaceURI; + return _reader.NamespaceURI; } } @@ -86,7 +90,7 @@ public override string Prefix { get { - return this.reader.Prefix; + return _reader.Prefix; } } @@ -94,7 +98,7 @@ public override string Value { get { - return this.reader.Value; + return _reader.Value; } } @@ -102,7 +106,7 @@ public override int Depth { get { - return this.reader.Depth; + return _reader.Depth; } } @@ -110,7 +114,7 @@ public override string BaseURI { get { - return this.reader.BaseURI; + return _reader.BaseURI; } } @@ -118,7 +122,7 @@ public override bool IsEmptyElement { get { - return this.reader.IsEmptyElement; + return _reader.IsEmptyElement; } } @@ -126,7 +130,7 @@ public override int AttributeCount { get { - return this.reader.AttributeCount; + return _reader.AttributeCount; } } @@ -134,7 +138,7 @@ public override bool EOF { get { - return this.reader.EOF; + return _reader.EOF; } } @@ -142,7 +146,7 @@ public override ReadState ReadState { get { - return this.reader.ReadState; + return _reader.ReadState; } } @@ -150,93 +154,93 @@ public override XmlNameTable NameTable { get { - return this.reader.NameTable; + return _reader.NameTable; } } public override string GetAttribute(string name) { - return this.reader.GetAttribute(name); + return _reader.GetAttribute(name); } public override string GetAttribute(string name, string namespaceURI) { - return this.reader.GetAttribute(name, namespaceURI); + return _reader.GetAttribute(name, namespaceURI); } public override string GetAttribute(int i) { - return this.reader.GetAttribute(i); + return _reader.GetAttribute(i); } public override string LookupNamespace(string prefix) { - return this.reader.LookupNamespace(prefix); + return _reader.LookupNamespace(prefix); } public override bool MoveToAttribute(string name) { - return this.reader.MoveToAttribute(name); + return _reader.MoveToAttribute(name); } public override bool MoveToAttribute(string name, string ns) { - return this.reader.MoveToAttribute(name, ns); + return _reader.MoveToAttribute(name, ns); } public override bool MoveToElement() { - return this.reader.MoveToElement(); + return _reader.MoveToElement(); } public override bool MoveToFirstAttribute() { - return this.reader.MoveToFirstAttribute(); + return _reader.MoveToFirstAttribute(); } public override bool MoveToNextAttribute() { - return this.reader.MoveToNextAttribute(); + return _reader.MoveToNextAttribute(); } public override bool Read() { - return this.reader.Read(); + return _reader.Read(); } public override bool ReadAttributeValue() { - return this.reader.ReadAttributeValue(); + return _reader.ReadAttributeValue(); } public override void ResolveEntity() { - this.reader.ResolveEntity(); + _reader.ResolveEntity(); } public override Task GetValueAsync() { - return this.getValueFunc(this); + return _getValueFunc(this); } public override Task MoveToContentAsync() { - return this.moveToContentFunc(this); + return _moveToContentFunc(this); } public override Task SkipAsync() { - return this.skipFunc(this); + return _skipFunc(this); } public override Task ReadAsync() { - return this.readFunc(this); + return _readFunc(this); } public override Task ReadInnerXmlAsync() { - return readInnerXmlFunc(this); + return _readInnerXmlFunc(this); } public static async Task WriteNodeAsync(XmlDictionaryWriter writer, XmlReader reader, bool defattr) @@ -319,7 +323,7 @@ public static async Task WriteNodeAsync(XmlDictionaryWriter writer, XmlReader re internal static class XmlReaderExtensions { - static private uint IsTextualNodeBitmap = 0x6018; // 00 0110 0000 0001 1000 + private const uint IsTextualNodeBitmap = 0x6018; // 00 0110 0000 0001 1000 public static async Task ReadStartElementAsync(this XmlReader reader) { @@ -346,7 +350,7 @@ public static async Task ReadElementStringAsync(this XmlReader reader) result = reader.ReadString(); if (reader.NodeType != XmlNodeType.EndElement) { - throw new XmlException(); + throw new XmlException(); throw new XmlException(reader.NodeType.ToString() + " is an invalid XmlNodeType"); //throw new XmlException(Res.Xml_UnexpectedNodeInSimpleContent, new string[] { this.NodeType.ToString(), "ReadElementString" }, this as IXmlLineInfo); } @@ -357,7 +361,6 @@ public static async Task ReadElementStringAsync(this XmlReader reader) await reader.ReadAsync(); } return result; - } public static async Task ReadStringAsync(this XmlReader reader) @@ -393,7 +396,6 @@ public static async Task ReadStringAsync(this XmlReader reader) } } return result; - } static internal bool IsTextualNode(XmlNodeType nodeType) @@ -449,7 +451,6 @@ public static async Task ReadStartElementAsync(this XmlReader reader, string loc throw new XmlException(reader.NodeType.ToString() + " is an invalid XmlNodeType"); //throw new XmlException(Res.Xml_ElementNotFoundNs, new string[2] { localname, ns }, this as IXmlLineInfo); } - } public static async Task IsStartElementAsync(this XmlReader reader) @@ -474,7 +475,7 @@ private static async Task ReadStartElementAsync(this XmlReader reader, string na } else { - throw new InvalidOperationException("name doesn’t match"); + throw new InvalidOperationException("name doesn\u2019t match"); } } @@ -543,7 +544,5 @@ private static async Task ReadElementStringAsync(XmlReader reader, strin } return result; } - } - } diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/XmlWriterWrapper.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/XmlWriterWrapper.cs index a35027a35984..232d25161ef4 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/XmlWriterWrapper.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/XmlWriterWrapper.cs @@ -1,4 +1,8 @@ -using System; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; using System.Threading.Tasks; using System.Xml; @@ -6,38 +10,37 @@ namespace System.ServiceModel.Syndication { internal class XmlWriterWrapper : XmlWriter { + private XmlWriter _writer; - private XmlWriter writer; - - private Func writeStringFunc; - private Func writeStartElementFunc2; - private Func writeEndElementFunc; - private Func writeAttributeStringFunc2; - private Func writeAttributeStringFunc3; - private Func writeAttributeStringFunc4; - private Func WriteNodeFunc; + private Func _writeStringFunc; + private Func _writeStartElementFunc2; + private Func _writeEndElementFunc; + private Func _writeAttributeStringFunc2; + private Func _writeAttributeStringFunc3; + private Func _writeAttributeStringFunc4; + private Func _writeNodeFunc; private void InitAsync() { - this.writeStringFunc = new Func((thisPtr, text) => { return thisPtr.writer.WriteStringAsync(text); }); - this.writeStartElementFunc2 = new Func((thisPtr, localName, ns) => { return this.writer.WriteStartElementAsync("", localName, ns); }); - this.writeEndElementFunc = new Func((thisPtr) => { return thisPtr.writer.WriteEndElementAsync(); }); - this.writeAttributeStringFunc2 = new Func((thisPtr, localname, value) => { return thisPtr.writer.WriteAttributeStringAsync("", localname, "", value); }); - this.writeAttributeStringFunc3 = new Func((thisPtr, localName, ns, value) => { return thisPtr.writer.WriteAttributeStringAsync("", localName, ns, value); }); - this.writeAttributeStringFunc4 = new Func((thisPtr, prefix, localName, ns, value) => { return thisPtr.writer.WriteAttributeStringAsync(prefix, localName, ns, value); }); - this.WriteNodeFunc = new Func((thisPtr, reader, defattr) => { return thisPtr.writer.WriteNodeAsync(reader, defattr); }); + _writeStringFunc = new Func((thisPtr, text) => { return thisPtr._writer.WriteStringAsync(text); }); + _writeStartElementFunc2 = new Func((thisPtr, localName, ns) => { return _writer.WriteStartElementAsync("", localName, ns); }); + _writeEndElementFunc = new Func((thisPtr) => { return thisPtr._writer.WriteEndElementAsync(); }); + _writeAttributeStringFunc2 = new Func((thisPtr, localname, value) => { return thisPtr._writer.WriteAttributeStringAsync("", localname, "", value); }); + _writeAttributeStringFunc3 = new Func((thisPtr, localName, ns, value) => { return thisPtr._writer.WriteAttributeStringAsync("", localName, ns, value); }); + _writeAttributeStringFunc4 = new Func((thisPtr, prefix, localName, ns, value) => { return thisPtr._writer.WriteAttributeStringAsync(prefix, localName, ns, value); }); + _writeNodeFunc = new Func((thisPtr, reader, defattr) => { return thisPtr._writer.WriteNodeAsync(reader, defattr); }); } private void Init() { - this.writeStringFunc = new Func((thisPtr, text) => { thisPtr.writer.WriteString(text); return Task.CompletedTask; }); - this.writeStartElementFunc2 = new Func((thisPtr, localName, ns) => { this.writer.WriteStartElement(localName, ns); return Task.CompletedTask; }); - this.writeEndElementFunc = new Func((thisPtr) => { thisPtr.writer.WriteEndElement(); return Task.CompletedTask; }); - this.writeAttributeStringFunc2 = new Func((thisPtr, localname, value) => { thisPtr.writer.WriteAttributeString("", localname, "", value); return Task.CompletedTask; }); - this.writeAttributeStringFunc3 = new Func((thisPtr, localName, ns, value) => { thisPtr.writer.WriteAttributeString(localName, ns, value); return Task.CompletedTask; }); - this.writeAttributeStringFunc4 = new Func((thisPtr, prefix, localName, ns, value) => { thisPtr.writer.WriteAttributeString(prefix, localName, ns, value); return Task.CompletedTask; }); - this.WriteNodeFunc = new Func((thisPtr, reader, defattr) => { thisPtr.writer.WriteNode(reader, defattr); return Task.CompletedTask; }); + _writeStringFunc = new Func((thisPtr, text) => { thisPtr._writer.WriteString(text); return Task.CompletedTask; }); + _writeStartElementFunc2 = new Func((thisPtr, localName, ns) => { _writer.WriteStartElement(localName, ns); return Task.CompletedTask; }); + _writeEndElementFunc = new Func((thisPtr) => { thisPtr._writer.WriteEndElement(); return Task.CompletedTask; }); + _writeAttributeStringFunc2 = new Func((thisPtr, localname, value) => { thisPtr._writer.WriteAttributeString("", localname, "", value); return Task.CompletedTask; }); + _writeAttributeStringFunc3 = new Func((thisPtr, localName, ns, value) => { thisPtr._writer.WriteAttributeString(localName, ns, value); return Task.CompletedTask; }); + _writeAttributeStringFunc4 = new Func((thisPtr, prefix, localName, ns, value) => { thisPtr._writer.WriteAttributeString(prefix, localName, ns, value); return Task.CompletedTask; }); + _writeNodeFunc = new Func((thisPtr, reader, defattr) => { thisPtr._writer.WriteNode(reader, defattr); return Task.CompletedTask; }); } public static XmlWriter CreateFromWriter(XmlWriter writer) @@ -56,9 +59,9 @@ public XmlWriterWrapper(XmlWriter writer) if (writer == null) throw new ArgumentNullException(nameof(writer)); - this.writer = writer; + _writer = writer; - if (this.writer.Settings.Async) + if (_writer.Settings.Async) { InitAsync(); } @@ -72,28 +75,28 @@ public XmlWriterWrapper(XmlWriter writer) public override Task WriteNodeAsync(XmlReader reader, bool defattr) { - return WriteNodeFunc(this, reader, defattr); + return _writeNodeFunc(this, reader, defattr); } public override Task WriteStringAsync(string text) { - return writeStringFunc(this, text); + return _writeStringFunc(this, text); } public override Task WriteStartElementAsync(string prefix, string localName, string ns) { - writer.WriteStartElement(prefix, localName, ns); + _writer.WriteStartElement(prefix, localName, ns); return Task.CompletedTask; } public override Task WriteEndElementAsync() { - return writeEndElementFunc(this); + return _writeEndElementFunc(this); } public override Task WriteAttributesAsync(XmlReader reader, bool defattr) { - writer.WriteAttributes(reader, defattr); + _writer.WriteAttributes(reader, defattr); return Task.CompletedTask; } @@ -102,123 +105,123 @@ public override WriteState WriteState { get { - return this.writer.WriteState; + return _writer.WriteState; } } public override void Flush() { - this.writer.Flush(); + _writer.Flush(); } public override string LookupPrefix(string ns) { - return this.writer.LookupPrefix(ns); + return _writer.LookupPrefix(ns); } public override void WriteBase64(byte[] buffer, int index, int count) { - this.writer.WriteBase64(buffer, index, count); + _writer.WriteBase64(buffer, index, count); } public override void WriteCData(string text) { - this.writer.WriteCData(text); + _writer.WriteCData(text); } public override void WriteCharEntity(char ch) { - this.writer.WriteCharEntity(ch); + _writer.WriteCharEntity(ch); } public override void WriteChars(char[] buffer, int index, int count) { - this.writer.WriteChars(buffer, index, count); + _writer.WriteChars(buffer, index, count); } public override void WriteComment(string text) { - this.writer.WriteComment(text); + _writer.WriteComment(text); } public override void WriteDocType(string name, string pubid, string sysid, string subset) { - this.writer.WriteDocType(name, pubid, sysid, subset); + _writer.WriteDocType(name, pubid, sysid, subset); } public override void WriteEndAttribute() { - this.writer.WriteEndAttribute(); + _writer.WriteEndAttribute(); } public override void WriteEndDocument() { - this.writer.WriteEndDocument(); + _writer.WriteEndDocument(); } public override void WriteEndElement() { - this.writer.WriteEndElement(); + _writer.WriteEndElement(); } public override void WriteEntityRef(string name) { - this.writer.WriteEntityRef(name); + _writer.WriteEntityRef(name); } public override void WriteFullEndElement() { - this.writer.WriteFullEndElement(); + _writer.WriteFullEndElement(); } public override void WriteProcessingInstruction(string name, string text) { - this.writer.WriteProcessingInstruction(name, text); + _writer.WriteProcessingInstruction(name, text); } public override void WriteRaw(char[] buffer, int index, int count) { - this.writer.WriteRaw(buffer, index, count); + _writer.WriteRaw(buffer, index, count); } public override void WriteRaw(string data) { - this.writer.WriteRaw(data); + _writer.WriteRaw(data); } public override void WriteStartAttribute(string prefix, string localName, string ns) { - this.writer.WriteStartAttribute(prefix, localName, ns); + _writer.WriteStartAttribute(prefix, localName, ns); } public override void WriteStartDocument() { - this.writer.WriteStartDocument(); + _writer.WriteStartDocument(); } public override void WriteStartDocument(bool standalone) { - this.writer.WriteStartDocument(standalone); + _writer.WriteStartDocument(standalone); } public override void WriteStartElement(string prefix, string localName, string ns) { - this.writer.WriteStartElement(prefix, localName, ns); + _writer.WriteStartElement(prefix, localName, ns); } public override void WriteString(string text) { - this.writer.WriteString(text); + _writer.WriteString(text); } public override void WriteSurrogateCharEntity(char lowChar, char highChar) { - this.writer.WriteSurrogateCharEntity(lowChar, highChar); + _writer.WriteSurrogateCharEntity(lowChar, highChar); } public override void WriteWhitespace(string ws) { - this.writer.WriteWhitespace(ws); + _writer.WriteWhitespace(ws); } } diff --git a/src/System.ServiceModel.Syndication/src/System/ServiceModel/XmlBuffer.cs b/src/System.ServiceModel.Syndication/src/System/ServiceModel/XmlBuffer.cs index 40560e12481e..6fee3f374b87 100644 --- a/src/System.ServiceModel.Syndication/src/System/ServiceModel/XmlBuffer.cs +++ b/src/System.ServiceModel.Syndication/src/System/ServiceModel/XmlBuffer.cs @@ -59,8 +59,8 @@ public XmlBuffer(int maxBufferSize) { if (maxBufferSize < 0) throw new ArgumentOutOfRangeException(nameof(maxBufferSize), maxBufferSize, SR.ValueMustBeNonNegative); - - int initialBufferSize = Math.Min(512, maxBufferSize); + + int initialBufferSize = Math.Min(512, maxBufferSize); _stream = new BufferedStream(new MemoryStream(), initialBufferSize); _sections = new List
(1); } diff --git a/src/System.ServiceModel.Syndication/tests/BasicScenarioTests.cs b/src/System.ServiceModel.Syndication/tests/BasicScenarioTests.cs index 1462307a40f5..c4c6a918f567 100644 --- a/src/System.ServiceModel.Syndication/tests/BasicScenarioTests.cs +++ b/src/System.ServiceModel.Syndication/tests/BasicScenarioTests.cs @@ -11,16 +11,14 @@ using System.Threading.Tasks; using System.Threading; using Xunit; - + namespace System.ServiceModel.Syndication.Tests { public static class BasicScenarioTests { - [Fact] public static void SyndicationFeed_CreateNewFeed() { - string filePath = Path.GetTempFileName(); try @@ -87,9 +85,9 @@ public static void SyndicationFeed_Load_Write_RSS_Feed_Async() // *** SETUP *** \\\ XmlReaderSettings settingsReader = new XmlReaderSettings(); settingsReader.Async = true; - XmlReader xmlr = XmlReader.Create(@"rssSpecExample.xml",settingsReader); + XmlReader xmlr = XmlReader.Create(@"rssSpecExample.xml", settingsReader); SyndicationFeed sf; - Task < SyndicationFeed > rss = null; + Task rss = null; CancellationToken ct = new CancellationToken(); rss = SyndicationFeed.LoadAsync(xmlr, ct); @@ -101,7 +99,7 @@ public static void SyndicationFeed_Load_Write_RSS_Feed_Async() //Write the same feed that was read. XmlWriterSettings settingsWriter = new XmlWriterSettings(); settingsWriter.Async = true; - XmlWriter xmlw = XmlWriter.Create(path,settingsWriter); + XmlWriter xmlw = XmlWriter.Create(path, settingsWriter); Rss20FeedFormatter atomFeed = new Rss20FeedFormatter(sf); Task write = atomFeed.WriteToAsync(xmlw, ct); @@ -118,7 +116,7 @@ public static void SyndicationFeed_Load_Write_RSS_Feed_Async() File.Delete(path); } } - + [Fact] public static void SyndicationFeed_Load_Write_Atom_Feed() { @@ -129,7 +127,7 @@ public static void SyndicationFeed_Load_Write_Atom_Feed() // *** SETUP *** \\\ XmlReaderSettings setting = new XmlReaderSettings(); setting.Async = true; - XmlReader xmlr = XmlReader.Create(@"SimpleAtomFeed.xml",setting); + XmlReader xmlr = XmlReader.Create(@"SimpleAtomFeed.xml", setting); SyndicationFeed sf = SyndicationFeed.Load(xmlr); Assert.True(sf != null); CancellationToken ct = new CancellationToken(); @@ -138,7 +136,7 @@ public static void SyndicationFeed_Load_Write_Atom_Feed() //Write the same feed that was read. XmlWriter xmlw = XmlWriter.Create(path); Atom10FeedFormatter atomFeed = new Atom10FeedFormatter(sf); - atomFeed.WriteToAsync(xmlw,ct).GetAwaiter().GetResult(); + atomFeed.WriteToAsync(xmlw, ct).GetAwaiter().GetResult(); xmlw.Close(); // *** VALIDATE *** \\ @@ -163,7 +161,7 @@ public static void SyndicationFeed_Load_Write_Atom_Feed_Async() readerSettings.Async = true; XmlReader xmlr = XmlReader.Create(@"atom_spec_example.xml", readerSettings); CancellationToken ct = new CancellationToken(); - Task rss = SyndicationFeed.LoadAsync(xmlr,ct); + Task rss = SyndicationFeed.LoadAsync(xmlr, ct); SyndicationFeed sf = rss.Result; Assert.True(sf != null); @@ -172,9 +170,9 @@ public static void SyndicationFeed_Load_Write_Atom_Feed_Async() XmlWriterSettings writerSettings = new XmlWriterSettings(); writerSettings.Async = true; - XmlWriter xmlw = XmlWriter.Create(path,writerSettings); + XmlWriter xmlw = XmlWriter.Create(path, writerSettings); Atom10FeedFormatter atomFeed = new Atom10FeedFormatter(sf); - Task write = atomFeed.WriteToAsync(xmlw,ct); + Task write = atomFeed.WriteToAsync(xmlw, ct); Task.WhenAll(write); xmlw.Close(); @@ -224,7 +222,7 @@ public static void SyndicationFeed_Write_RSS_Atom() XmlWriterSettings settings = new XmlWriterSettings(); settings.Async = true; - XmlWriter xmlwRss = XmlWriter.Create(RssPath,settings); + XmlWriter xmlwRss = XmlWriter.Create(RssPath, settings); Rss20FeedFormatter rssff = new Rss20FeedFormatter(feed); // Write to XML > atom @@ -234,12 +232,12 @@ public static void SyndicationFeed_Write_RSS_Atom() // *** EXECUTE *** \\ - Task rss = rssff.WriteToAsync(xmlwRss,ct); + Task rss = rssff.WriteToAsync(xmlwRss, ct); Task.WaitAll(rss); xmlwRss.Close(); - atomf.WriteToAsync(xmlwAtom,ct).GetAwaiter().GetResult(); ; + atomf.WriteToAsync(xmlwAtom, ct).GetAwaiter().GetResult(); ; xmlwAtom.Close(); // *** ASSERT *** \\ @@ -287,16 +285,15 @@ public static void SyndicationFeed_RSS20_Write_customImageDataInFeed() XmlWriter writer = XmlWriter.Create(resultPath); Rss20FeedFormatter rssff = sf.GetRss20Formatter(); CancellationToken ct = new CancellationToken(); - + try { // *** EXECUTE *** \\ - rssff.WriteToAsync(writer,ct).GetAwaiter().GetResult(); ; + rssff.WriteToAsync(writer, ct).GetAwaiter().GetResult(); ; writer.Close(); // *** ASSERT *** \\ Assert.True(File.Exists(resultPath)); - } finally { @@ -306,8 +303,8 @@ public static void SyndicationFeed_RSS20_Write_customImageDataInFeed() } [Fact] - public static async Task SyndicationFeed_LoadAsync_Rss() { - + public static async Task SyndicationFeed_LoadAsync_Rss() + { // *** SETUP *** \\ XmlReaderSettings setting = new XmlReaderSettings(); setting.Async = true; @@ -319,7 +316,7 @@ public static async Task SyndicationFeed_LoadAsync_Rss() { { // *** EXECUTE *** \\ reader = XmlReader.Create(@"rssSpecExample.xml", setting); - rss = SyndicationFeed.LoadAsync(reader,ct); + rss = SyndicationFeed.LoadAsync(reader, ct); await Task.WhenAll(rss); // *** ASSERT *** \\ @@ -335,7 +332,6 @@ public static async Task SyndicationFeed_LoadAsync_Rss() { [Fact] public static async Task SyndicationFeed_LoadAsync_Atom() { - // *** SETUP *** \\ XmlReaderSettings setting = new XmlReaderSettings(); setting.Async = true; @@ -346,7 +342,7 @@ public static async Task SyndicationFeed_LoadAsync_Atom() { reader = XmlReader.Create(@"atom_spec_example.xml", setting); // *** EXECUTE *** \\ - Task atom = SyndicationFeed.LoadAsync(reader,ct); + Task atom = SyndicationFeed.LoadAsync(reader, ct); await Task.WhenAll(atom); // *** ASSERT *** \\ Assert.True(atom.Result.Items != null); @@ -427,7 +423,7 @@ public static async Task SyndicationFeed_RSS_Optional_Documentation() { // *** EXECUTE *** \\ reader = XmlReader.Create(@"rssSpecExample.xml", setting); - rss = SyndicationFeed.LoadAsync(reader,ct); + rss = SyndicationFeed.LoadAsync(reader, ct); await Task.WhenAll(rss); // *** ASSERT *** \\ @@ -561,7 +557,6 @@ public static async Task SyndicationFeed_RSS_Optional_TextInput() [Fact] public static async Task SyndicationFeed__Atom_Optional_Icon() { - // *** SETUP *** \\ XmlReaderSettings setting = new XmlReaderSettings(); setting.Async = true; @@ -613,13 +608,13 @@ public static void SyndicationFeed_Rss_TestCustomParsing() CancellationToken ct = new CancellationToken(); // *** EXECUTE *** \\ - Task task = SyndicationFeed.LoadAsync(reader,rssformatter,ct); + Task task = SyndicationFeed.LoadAsync(reader, rssformatter, ct); Task.WhenAll(task); SyndicationFeed res = task.Result; // *** ASSERT *** \\ Assert.True(res.Title.Text == "new title"); - foreach(int hour in res.SkipHours) + foreach (int hour in res.SkipHours) { Assert.True(hour == 5); } @@ -670,7 +665,7 @@ public static void SyndicationFeed_Rss_TestWrongSkipDays() CancellationToken ct = new CancellationToken(); // *** EXECUTE *** \\ - Task task = SyndicationFeed.LoadAsync(reader,ct); + Task task = SyndicationFeed.LoadAsync(reader, ct); Task.WhenAll(task); SyndicationFeed res = task.Result; @@ -697,6 +692,5 @@ public static void SyndicationFeed_Rss_WrongDateFormat() // *** ASSERT *** \\ Assert.True(!res.LastUpdatedTime.Equals(new DateTimeOffset())); } - } }