Skip to content

System.Text.Json file and converter name clean-up (no functional changes) #32184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steveharter merged 3 commits into from
Feb 13, 2020
Merged

System.Text.Json file and converter name clean-up (no functional changes) #32184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c2f462
Rename and move converter files
steveharter Feb 12, 2020
d22a9fa
Rename converter types
steveharter Feb 12, 2020
640e3a7
Additional renaming and csproj changes
steveharter Feb 12, 2020
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
184 changes: 92 additions & 92 deletions src/libraries/System.Text.Json/src/System.Text.Json.csproj
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...lization/Converters/JsonArrayConverter.cs → ...n/Converters/Collection/ArrayConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ namespace System.Text.Json.Serialization.Converters
/// <summary>
/// Converter for <cref>System.Array</cref>.
/// </summary>
internal sealed class JsonArrayConverter<TCollection, TElement>
: JsonIEnumerableDefaultConverter<TCollection, TElement>
internal sealed class ArrayConverter<TCollection, TElement>
: IEnumerableDefaultConverter<TCollection, TElement>
where TCollection: IEnumerable
{
internal override bool CanHaveIdMetadata => false;
Expand Down
3 changes: 2 additions & 1 deletion ...erters/JsonConcurrentQueueOfTConverter.cs → ...Collection/ConcurrentQueueOfTConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

namespace System.Text.Json.Serialization.Converters
{
internal sealed class JsonConcurrentQueueOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
internal sealed class ConcurrentQueueOfTConverter<TCollection, TElement>
: IEnumerableDefaultConverter<TCollection, TElement>
where TCollection : ConcurrentQueue<TElement>
{
protected override void Add(TElement value, ref ReadStack state)
Expand Down
3 changes: 2 additions & 1 deletion ...erters/JsonConcurrentStackOfTConverter.cs → ...Collection/ConcurrentStackOfTConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

namespace System.Text.Json.Serialization.Converters
{
internal sealed class JsonConcurrentStackOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
internal sealed class ConcurrentStackOfTConverter<TCollection, TElement>
: IEnumerableDefaultConverter<TCollection, TElement>
where TCollection : ConcurrentStack<TElement>
{
protected override void Add(TElement value, ref ReadStack state)
Expand Down
2 changes: 1 addition & 1 deletion ...verters/JsonDictionaryDefaultConverter.cs → .../Collection/DictionaryDefaultConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace System.Text.Json.Serialization.Converters
/// <summary>
/// Default base class implementation of <cref>JsonDictionaryConverter{TCollection}</cref> .
/// </summary>
internal abstract class JsonDictionaryDefaultConverter<TCollection, TValue>
internal abstract class DictionaryDefaultConverter<TCollection, TValue>
: JsonDictionaryConverter<TCollection>
{
/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions .../JsonDictionaryOfStringTValueConverter.cs → ...tion/DictionaryOfStringTValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ namespace System.Text.Json.Serialization.Converters
/// Converter for Dictionary{string, TValue} that (de)serializes as a JSON object with properties
/// representing the dictionary element key and value.
/// </summary>
internal sealed class JsonDictionaryOfStringTValueConverter<TCollection, TValue>
: JsonDictionaryDefaultConverter<TCollection, TValue>
internal sealed class DictionaryOfStringTValueConverter<TCollection, TValue>
: DictionaryDefaultConverter<TCollection, TValue>
where TCollection : Dictionary<string, TValue>
{
protected override void Add(TValue value, JsonSerializerOptions options, ref ReadStack state)
Expand Down
4 changes: 2 additions & 2 deletions ...Converters/JsonICollectionOfTConverter.cs → ...ers/Collection/ICollectionOfTConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace System.Text.Json.Serialization.Converters
/// <summary>
/// Converter for <cref>System.Collections.Generic.ICollection{TElement}</cref>.
/// </summary>
internal sealed class JsonICollectionOfTConverter<TCollection, TElement>
: JsonIEnumerableDefaultConverter<TCollection, TElement>
internal sealed class ICollectionOfTConverter<TCollection, TElement>
: IEnumerableDefaultConverter<TCollection, TElement>
where TCollection : ICollection<TElement>
{
protected override void Add(TElement value, ref ReadStack state)
Expand Down
4 changes: 2 additions & 2 deletions ...on/Converters/JsonIDictionaryConverter.cs → ...erters/Collection/IDictionaryConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ namespace System.Text.Json.Serialization.Converters
/// Converter for <cref>System.Collections.IDictionary</cref> that (de)serializes as a JSON object with properties
/// representing the dictionary element key and value.
/// </summary>
internal sealed class JsonIDictionaryConverter<TCollection>
: JsonDictionaryDefaultConverter<TCollection, object?>
internal sealed class IDictionaryConverter<TCollection>
: DictionaryDefaultConverter<TCollection, object?>
where TCollection : IDictionary
{
protected override void Add(object? value, JsonSerializerOptions options, ref ReadStack state)
Expand Down
4 changes: 2 additions & 2 deletions ...JsonIDictionaryOfStringTValueConverter.cs → ...ion/IDictionaryOfStringTValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ namespace System.Text.Json.Serialization.Converters
/// Converter for <cref>System.Collections.Generic.IDictionary{string, TValue}</cref> that
/// (de)serializes as a JSON object with properties representing the dictionary element key and value.
/// </summary>
internal sealed class JsonIDictionaryOfStringTValueConverter<TCollection, TValue>
: JsonDictionaryDefaultConverter<TCollection, TValue>
internal sealed class IDictionaryOfStringTValueConverter<TCollection, TValue>
: DictionaryDefaultConverter<TCollection, TValue>
where TCollection : IDictionary<string, TValue>
{
protected override void Add(TValue value, JsonSerializerOptions options, ref ReadStack state)
Expand Down
4 changes: 2 additions & 2 deletions ...on/Converters/JsonIEnumerableConverter.cs → ...erters/Collection/IEnumerableConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ namespace System.Text.Json.Serialization.Converters
/// Converter for <cref>System.Collections.IEnumerable</cref>.
/// </summary>
/// <typeparam name="TCollection"></typeparam>
internal sealed class JsonIEnumerableConverter<TCollection>
: JsonIEnumerableDefaultConverter<TCollection, object?>
internal sealed class IEnumerableConverter<TCollection>
: IEnumerableDefaultConverter<TCollection, object?>
where TCollection : IEnumerable
{
protected override void Add(object? value, ref ReadStack state)
Expand Down
80 changes: 40 additions & 40 deletions ...erters/JsonIEnumerableConverterFactory.cs → ...Collection/IEnumerableConverterFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,33 @@ namespace System.Text.Json.Serialization.Converters
/// </summary>
internal class JsonIEnumerableConverterFactory : JsonConverterFactory
{
private static readonly JsonIDictionaryConverter<IDictionary> s_converterForIDictionary = new JsonIDictionaryConverter<IDictionary>();
private static readonly JsonIEnumerableConverter<IEnumerable> s_converterForIEnumerable = new JsonIEnumerableConverter<IEnumerable>();
private static readonly JsonIListConverter<IList> s_converterForIList = new JsonIListConverter<IList>();
private static readonly IDictionaryConverter<IDictionary> s_converterForIDictionary = new IDictionaryConverter<IDictionary>();
private static readonly IEnumerableConverter<IEnumerable> s_converterForIEnumerable = new IEnumerableConverter<IEnumerable>();
private static readonly IListConverter<IList> s_converterForIList = new IListConverter<IList>();

public override bool CanConvert(Type typeToConvert)
{
return typeof(IEnumerable).IsAssignableFrom(typeToConvert);
}

[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonArrayConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonConcurrentQueueOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonConcurrentStackOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonDefaultArrayConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonDictionaryOfStringTValueConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonICollectionOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIDictionaryOfStringTValueConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIEnumerableOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIEnumerableWithAddMethodConverter`1")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIListConverter`1")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIListOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonImmutableDictionaryOfStringTValueConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonImmutableEnumerableOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIReadOnlyDictionaryOfStringTValueConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonISetOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonListOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonQueueOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonStackOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ArrayConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ConcurrentQueueOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ConcurrentStackOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.DefaultArrayConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.DictionaryOfStringTValueConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ICollectionOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IDictionaryOfStringTValueConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IEnumerableOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IEnumerableWithAddMethodConverter`1")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IListConverter`1")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IListOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ImmutableDictionaryOfStringTValueConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ImmutableEnumerableOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IReadOnlyDictionaryOfStringTValueConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ISetOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ListOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.QueueOfTConverter`2")]
[PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.StackOfTConverter`2")]
public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
{
JsonConverter? converter = null;
Expand All @@ -60,13 +60,13 @@ public override bool CanConvert(Type typeToConvert)
return null;
}

converterType = typeof(JsonArrayConverter<,>);
converterType = typeof(ArrayConverter<,>);
elementType = typeToConvert.GetElementType();
}
// List<> or deriving from List<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(List<>))) != null)
{
converterType = typeof(JsonListOfTConverter<,>);
converterType = typeof(ListOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// Dictionary<string,> or deriving from Dictionary<string,>
Expand All @@ -75,7 +75,7 @@ public override bool CanConvert(Type typeToConvert)
genericArgs = actualTypeToConvert.GetGenericArguments();
if (genericArgs[0] == typeof(string))
{
converterType = typeof(JsonDictionaryOfStringTValueConverter<,>);
converterType = typeof(DictionaryOfStringTValueConverter<,>);
elementType = genericArgs[1];
}
else
Expand All @@ -89,7 +89,7 @@ public override bool CanConvert(Type typeToConvert)
genericArgs = typeToConvert.GetGenericArguments();
if (genericArgs[0] == typeof(string))
{
converterType = typeof(JsonImmutableDictionaryOfStringTValueConverter<,>);
converterType = typeof(ImmutableDictionaryOfStringTValueConverter<,>);
elementType = genericArgs[1];
}
else
Expand All @@ -103,7 +103,7 @@ public override bool CanConvert(Type typeToConvert)
genericArgs = actualTypeToConvert.GetGenericArguments();
if (genericArgs[0] == typeof(string))
{
converterType = typeof(JsonIDictionaryOfStringTValueConverter<,>);
converterType = typeof(IDictionaryOfStringTValueConverter<,>);
elementType = genericArgs[1];
}
else
Expand All @@ -117,7 +117,7 @@ public override bool CanConvert(Type typeToConvert)
genericArgs = actualTypeToConvert.GetGenericArguments();
if (genericArgs[0] == typeof(string))
{
converterType = typeof(JsonIReadOnlyDictionaryOfStringTValueConverter<,>);
converterType = typeof(IReadOnlyDictionaryOfStringTValueConverter<,>);
elementType = genericArgs[1];
}
else
Expand All @@ -128,55 +128,55 @@ public override bool CanConvert(Type typeToConvert)
// Immutable non-dictionaries from System.Collections.Immutable, e.g. ImmutableStack<T>
else if (typeToConvert.IsImmutableEnumerableType())
{
converterType = typeof(JsonImmutableEnumerableOfTConverter<,>);
converterType = typeof(ImmutableEnumerableOfTConverter<,>);
elementType = typeToConvert.GetGenericArguments()[0];
}
// IList<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericInterface(typeof(IList<>))) != null)
{
converterType = typeof(JsonIListOfTConverter<,>);
converterType = typeof(IListOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// ISet<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericInterface(typeof(ISet<>))) != null)
{
converterType = typeof(JsonISetOfTConverter<,>);
converterType = typeof(ISetOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// ICollection<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericInterface(typeof(ICollection<>))) != null)
{
converterType = typeof(JsonICollectionOfTConverter<,>);
converterType = typeof(ICollectionOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// Stack<> or deriving from Stack<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(Stack<>))) != null)
{
converterType = typeof(JsonStackOfTConverter<,>);
converterType = typeof(StackOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// Queue<> or deriving from Queue<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(Queue<>))) != null)
{
converterType = typeof(JsonQueueOfTConverter<,>);
converterType = typeof(QueueOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// ConcurrentStack<> or deriving from ConcurrentStack<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(ConcurrentStack<>))) != null)
{
converterType = typeof(JsonConcurrentStackOfTConverter<,>);
converterType = typeof(ConcurrentStackOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// ConcurrentQueue<> or deriving from ConcurrentQueue<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(ConcurrentQueue<>))) != null)
{
converterType = typeof(JsonConcurrentQueueOfTConverter<,>);
converterType = typeof(ConcurrentQueueOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// IEnumerable<>, types assignable from List<>
else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericInterface(typeof(IEnumerable<>))) != null)
{
converterType = typeof(JsonIEnumerableOfTConverter<,>);
converterType = typeof(IEnumerableOfTConverter<,>);
elementType = actualTypeToConvert.GetGenericArguments()[0];
}
// Check for non-generics after checking for generics.
Expand All @@ -187,7 +187,7 @@ public override bool CanConvert(Type typeToConvert)
return s_converterForIDictionary;
}

converterType = typeof(JsonIDictionaryConverter<>);
converterType = typeof(IDictionaryConverter<>);
}
else if (typeof(IList).IsAssignableFrom(typeToConvert))
{
Expand All @@ -196,11 +196,11 @@ public override bool CanConvert(Type typeToConvert)
return s_converterForIList;
}

converterType = typeof(JsonIListConverter<>);
converterType = typeof(IListConverter<>);
}
else if (typeToConvert.IsNonGenericStackOrQueue())
{
converterType = typeof(JsonIEnumerableWithAddMethodConverter<>);
converterType = typeof(IEnumerableWithAddMethodConverter<>);
}
else
{
Expand All @@ -210,7 +210,7 @@ public override bool CanConvert(Type typeToConvert)
return s_converterForIEnumerable;
}

converterType = typeof(JsonIEnumerableConverter<>);
converterType = typeof(IEnumerableConverter<>);
}

if (converterType != null)
Expand Down
3 changes: 1 addition & 2 deletions ...xt/Json/Serialization/ExtensionMethods.cs → ...ion/IEnumerableConverterFactoryHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
// 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.Buffers;
using System.Diagnostics;
using System.Reflection;

namespace System.Text.Json.Serialization
{
internal static class ExtensionMethods
internal static class IEnumerableConverterFactoryHelpers
{
private const string ImmutableArrayTypeName = "System.Collections.Immutable.ImmutableArray";
private const string ImmutableArrayGenericTypeName = "System.Collections.Immutable.ImmutableArray`1";
Expand Down
3 changes: 2 additions & 1 deletion ...erters/JsonIEnumerableDefaultConverter.cs → ...Collection/IEnumerableDefaultConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ namespace System.Text.Json.Serialization.Converters
/// <summary>
/// Default base class implementation of <cref>JsonIEnumerableConverter{TCollection, TElement}</cref>.
/// </summary>
internal abstract class JsonIEnumerableDefaultConverter<TCollection, TElement> : JsonCollectionConverter<TCollection, TElement>
internal abstract class IEnumerableDefaultConverter<TCollection, TElement>
: JsonCollectionConverter<TCollection, TElement>
Copy link
Member

@jozkee jozkee Feb 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JsonConllectionConverter, JsonDictionaryConverter and JsonObjectConverter are not renamed becuase those are the ones that are going to become public, right?

Copy link
Contributor Author

@steveharter steveharter Feb 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. If that's not the case then we can revisit the naming at that point.

{
protected abstract void Add(TElement value, ref ReadStack state);
protected abstract void CreateCollection(ref ReadStack state, JsonSerializerOptions options);
Expand Down
3 changes: 2 additions & 1 deletion ...Converters/JsonIEnumerableOfTConverter.cs → ...ers/Collection/IEnumerableOfTConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ namespace System.Text.Json.Serialization.Converters
/// <summary>
/// Converter for <cref>System.Collections.Generic.IEnumerable{TElement}</cref>.
/// </summary>
internal sealed class JsonIEnumerableOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
internal sealed class IEnumerableOfTConverter<TCollection, TElement>
: IEnumerableDefaultConverter<TCollection, TElement>
where TCollection : IEnumerable<TElement>
{
protected override void Add(TElement value, ref ReadStack state)
Expand Down
Loading