Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
CodeFormatted S.SM.Syndication. (#24520)
Browse files Browse the repository at this point in the history 
* CodeFormatted S.SM.Syndication.

* Address feedback.
  • Loading branch information
@shmao @stephentoub
shmao authored and stephentoub committed Oct 9, 2017
1 parent 144253c commit 7f7c79a
Show file tree
Hide file tree
Showing 16 changed files with 254 additions and 262 deletions.
82 changes: 40 additions & 42 deletions ...ystem.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10FeedFormatter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ public class Atom10FeedFormatter : SyndicationFeedFormatter
public Func<string, string, string, string> stringParser = DefaultStringParser;
public Func<string, string, string, DateTimeOffset> dateParser = DefaultDateFromString;
public Func<string, UriKind, string, string, Uri> uriParser = DefaultUriParser;

private static string DefaultStringParser(string value, string localName, string ns)
{
return value;
}

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))
{
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -154,7 +154,7 @@ internal static async Task<SyndicationCategory> ReadCategoryAsync(XmlReaderWrapp
string value = await reader.GetValueAsync();
bool notHandled = false;

if(reader.NamespaceURI == string.Empty)
if (reader.NamespaceURI == string.Empty)
{
switch (reader.LocalName)
{
Expand Down Expand Up @@ -290,7 +290,7 @@ internal async Task<bool> TryParseFeedElementFromAsync(XmlReaderWrapper reader,
string name = reader.LocalName;
string ns = reader.NamespaceURI;

if(ns == Atom10Constants.Atom10Namespace)
if (ns == Atom10Constants.Atom10Namespace)
{
switch (name)
{
Expand All @@ -304,10 +304,10 @@ internal async Task<bool> 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));
Expand Down Expand Up @@ -352,7 +352,7 @@ internal async Task<bool> TryParseItemElementFromAsync(XmlReaderWrapper reader,
string name = reader.LocalName;
string ns = reader.NamespaceURI;

if(ns == Atom10Constants.Atom10Namespace)
if (ns == Atom10Constants.Atom10Namespace)
{
switch (name)
{
Expand All @@ -369,7 +369,7 @@ internal async Task<bool> 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));
Expand Down Expand Up @@ -486,7 +486,7 @@ internal async Task WriteItemContributorsToAsync(XmlWriter writer, Collection<Sy
}
}

internal Task WriteItemLastUpdatedTimeToAsync(XmlWriter writer, DateTimeOffset lastUpdatedTime)
internal Task WriteItemLastUpdatedTimeToAsync(XmlWriter writer, DateTimeOffset lastUpdatedTime)
{
if (lastUpdatedTime == DateTimeOffset.MinValue)
{
Expand Down Expand Up @@ -604,7 +604,7 @@ protected virtual async Task WriteItemsAsync(XmlWriter writer, IEnumerable<Syndi
await this.WriteItemAsync(writer, item, feedBaseUri);
}
}

private async Task<TextSyndicationContent> ReadTextContentFromHelperAsync(XmlReaderWrapper reader, string type, string context, bool preserveAttributeExtensions)
{
if (string.IsNullOrEmpty(type))
Expand Down Expand Up @@ -657,7 +657,7 @@ private async Task<TextSyndicationContent> 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)
{
Expand All @@ -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();
Expand Down Expand Up @@ -721,10 +721,10 @@ private static DateTimeOffset DefaultDateFromString(string dateTimeString, strin
//if imposible to parse, return default date
return new DateTimeOffset();
}

private Task<SyndicationCategory> 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<SyndicationCategory> ReadCategoryFromAsync(XmlReaderWrapper reader, SyndicationFeed feed)
Expand All @@ -733,14 +733,14 @@ private Task<SyndicationCategory> ReadCategoryFromAsync(XmlReaderWrapper reader,
SyndicationCategory result = CreateCategory(feed);
return ReadCategoryAsync(reader, result);
}

private async Task<SyndicationCategory> ReadCategoryFromAsync(XmlReaderWrapper reader, SyndicationItem item)
{
SyndicationCategory result = CreateCategory(item);
await ReadCategoryAsync(reader, result);
return result;
}

private async Task<SyndicationContent> ReadContentFromAsync(XmlReaderWrapper reader, SyndicationItem item)
{
await MoveToStartElementAsync(reader);
Expand Down Expand Up @@ -856,7 +856,7 @@ private async Task<SyndicationFeed> ReadFeedFromAsync(XmlReaderWrapper reader, S

XmlBuffer buffer = null;
XmlDictionaryWriter extWriter = null;

if (!elementIsEmpty)
{
try
Expand Down Expand Up @@ -923,8 +923,7 @@ private async Task<SyndicationFeed> ReadFeedFromAsync(XmlReaderWrapper reader, S

return result;
}



private async Task ReadItemFromAsync(XmlReaderWrapper reader, SyndicationItem result, Uri feedBaseUri)
{
try
Expand Down Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down Expand Up @@ -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<SyndicationLink> ReadLinkFromAsync(XmlReaderWrapper reader, SyndicationFeed feed)
{
SyndicationLink result = CreateLink(feed);
await ReadLinkAsync(reader, result, feed.BaseUri);
return result;
}

private async Task<SyndicationLink> ReadLinkFromAsync(XmlReaderWrapper reader, SyndicationItem item)
{
SyndicationLink result = CreateLink(item);
await ReadLinkAsync(reader, result, item.BaseUri);
return result;
}

private async Task<SyndicationPerson> ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationFeed feed)
{
SyndicationPerson result = CreatePerson(feed);
await ReadPersonFromAsync(reader, result);
return result;
}

private async Task<SyndicationPerson> ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationItem item)
{
SyndicationPerson result = CreatePerson(item);
Expand Down Expand Up @@ -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)
{
Expand All @@ -1226,7 +1224,7 @@ private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationPerso
{
await reader.SkipAsync();
}
}
}
}

LoadElementExtensions(buffer, extWriter, result);
Expand All @@ -1242,12 +1240,12 @@ private async Task ReadPersonFromAsync(XmlReaderWrapper reader, SyndicationPerso
await reader.ReadEndElementAsync();
}
}

private Task<TextSyndicationContent> ReadTextContentFromAsync(XmlReaderWrapper reader, string context)
{
return ReadTextContentFromAsync(reader, context, this.PreserveAttributeExtensions);
return ReadTextContentFromAsync(reader, context, this.PreserveAttributeExtensions);
}

private async Task WriteCategoriesToAsync(XmlWriter writer, Collection<SyndicationCategory> categories)
{
writer = XmlWriterWrapper.CreateFromWriter(writer);
Expand All @@ -1256,7 +1254,7 @@ private async Task WriteCategoriesToAsync(XmlWriter writer, Collection<Syndicati
await WriteCategoryAsync(writer, categories[i], this.Version);
}
}

private Task WriteFeedAsync(XmlWriter writer)
{
if (this.Feed == null)
Expand All @@ -1265,7 +1263,7 @@ private Task WriteFeedAsync(XmlWriter writer)
}
return WriteFeedToAsync(writer, this.Feed, false); // isSourceFeed
}

private async Task WriteFeedToAsync(XmlWriter writer, SyndicationFeed feed, bool isSourceFeed)
{
if (!isSourceFeed)
Expand Down Expand Up @@ -1305,7 +1303,7 @@ private async Task WriteFeedToAsync(XmlWriter writer, SyndicationFeed feed, bool
await WriteFeedContributorsToAsync(writer, feed.Contributors);
await WriteElementAsync(writer, Atom10Constants.GeneratorTag, feed.Generator);

if(feed.IconImage != null)
if (feed.IconImage != null)
{
await WriteElementAsync(writer, Atom10Constants.IconTag, feed.IconImage.AbsoluteUri);
}
Expand All @@ -1322,7 +1320,7 @@ private async Task WriteFeedToAsync(XmlWriter writer, SyndicationFeed feed, bool
await WriteItemsAsync(writer, feed.Items, feed.BaseUri);
}
}

private async Task WriteItemContentsAsync(XmlWriter dictWriter, SyndicationItem item, Uri feedBaseUri)
{
Uri baseUriToWrite = FeedUtils.GetBaseUriToWrite(feedBaseUri, item.BaseUri);
Expand Down Expand Up @@ -1362,7 +1360,7 @@ await dictWriter.WriteElementStringAsync(Atom10Constants.PublishedTag,
}
await WriteElementExtensionsAsync(dictWriter, item, this.Version);
}

private async Task WritePersonToAsync(XmlWriter writer, SyndicationPerson p, string elementName)
{
await writer.WriteStartElementAsync(elementName, Atom10Constants.Atom10Namespace);
Expand Down
2 changes: 1 addition & 1 deletion ...ystem.ServiceModel.Syndication/src/System/ServiceModel/Syndication/Atom10ItemFormatter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected override SyndicationItem CreateItemInstance()
{
return SyndicationItemFormatter.CreateItemInstance(_itemType);
}

private Task ReadItemAsync(XmlReader reader)
{
SetItem(CreateItemInstance());
Expand Down
13 changes: 6 additions & 7 deletions ...l.Syndication/src/System/ServiceModel/Syndication/AtomPub10CategoriesDocumentFormatter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

namespace System.ServiceModel.Syndication
{

using System;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
Expand Down Expand Up @@ -81,7 +80,7 @@ public override string Version
}

public override Task<bool> CanReadAsync(XmlReader reader)
{
{
if (reader == null)
{
throw new ArgumentNullException(nameof(reader));
Expand All @@ -91,9 +90,9 @@ public override Task<bool> CanReadAsync(XmlReader reader)
return wrappedReader.IsStartElementAsync(App10Constants.Categories, App10Constants.Namespace);
}



Task ReadXmlAsync(XmlReaderWrapper reader)

private Task ReadXmlAsync(XmlReaderWrapper reader)
{
if (reader == null)
{
Expand All @@ -103,7 +102,7 @@ Task ReadXmlAsync(XmlReaderWrapper reader)
return ReadDocumentAsync(reader);
}

Task WriteXmlAsync(XmlWriter writer)
private Task WriteXmlAsync(XmlWriter writer)
{
if (writer == null)
{
Expand Down Expand Up @@ -173,7 +172,7 @@ protected override ReferencedCategoriesDocument CreateReferencedCategoriesDocume
return (ReferencedCategoriesDocument)Activator.CreateInstance(_referencedDocumentType);
}
}

private async Task ReadDocumentAsync(XmlReaderWrapper reader)
{
try
Expand Down Expand Up @@ -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);
Expand Down
Loading

0 comments on commit 7f7c79a

Please sign in to comment.