Make sure all JSON converters are public to allow referencing by JSON…

… source generators (#253)
tinglesoftware · May 16, 2024 · 363500d · 363500d
1 parent 31d7735
commit 363500d
Show file tree

Hide file tree

Showing 31 changed files with 367 additions and 171 deletions.
diff --git a/src/Tingle.AspNetCore.Tokens/ContinuationTokenJsonConverter.cs b/src/Tingle.AspNetCore.Tokens/ContinuationTokenJsonConverter.cs
@@ -11,7 +11,7 @@ namespace Tingle.AspNetCore.Tokens;
 /// <item><see cref="TimedContinuationToken{T}"/></item>
 /// </list>
 /// </summary>
-internal class ContinuationTokenJsonConverter : JsonConverter<IToken>
+public class ContinuationTokenJsonConverter : JsonConverter<IToken>
 {
     /// <inheritdoc/>
     public override bool CanConvert(Type typeToConvert) => typeof(IToken).IsAssignableFrom(typeToConvert);

diff --git a/src/Tingle.Extensions.Primitives/ConnectionStringBuilder.cs b/src/Tingle.Extensions.Primitives/ConnectionStringBuilder.cs
@@ -2,8 +2,8 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using System.Text.Json;
 using System.Text.Json.Serialization;
+using Tingle.Extensions.Primitives.Converters;
 using Tingle.Extensions.Primitives.Properties;
 
 namespace Tingle.Extensions.Primitives;
@@ -417,30 +417,6 @@ readonly object IConvertible.ToType(Type conversionType, IFormatProvider? provid
 
     #endregion
 
-    internal class ConnectionStringBuilderJsonConverter : JsonConverter<ConnectionStringBuilder>
-    {
-        public ConnectionStringBuilderJsonConverter() { }
-
-        /// <inheritdoc/>
-        public override ConnectionStringBuilder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.Null) return default;
-            if (reader.TokenType != JsonTokenType.String)
-            {
-                throw new InvalidOperationException("Only strings are supported");
-            }
-
-            var str = reader.GetString();
-            return new ConnectionStringBuilder(str!);
-        }
-
-        /// <inheritdoc/>
-        public override void Write(Utf8JsonWriter writer, ConnectionStringBuilder value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value.ToString());
-        }
-    }
-
     internal class ConnectionStringBuilderTypeConverter : TypeConverter
     {
         /// <inheritdoc/>

diff --git a/src/Tingle.Extensions.Primitives/Continent.cs b/src/Tingle.Extensions.Primitives/Continent.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Globalization;
-using System.Text.Json;
 using System.Text.Json.Serialization;
+using Tingle.Extensions.Primitives.Converters;
 
 namespace Tingle.Extensions.Primitives;
 
@@ -147,22 +147,6 @@ object IConvertible.ToType(Type conversionType, IFormatProvider? provider)
 
     #endregion
 
-    internal class ContinentJsonConverter : JsonConverter<Continent>
-    {
-        /// <inheritdoc/>
-        public override Continent? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var s = reader.GetString();
-            return string.IsNullOrWhiteSpace(s) ? null : new Continent(s);
-        }
-
-        /// <inheritdoc/>
-        public override void Write(Utf8JsonWriter writer, Continent value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value.Name);
-        }
-    }
-
     internal class ContinentTypeConverter : TypeConverter
     {
         /// <inheritdoc/>

diff --git a/src/Tingle.Extensions.Primitives/Converters/ConnectionStringBuilderJsonConverter.cs b/src/Tingle.Extensions.Primitives/Converters/ConnectionStringBuilderJsonConverter.cs
@@ -0,0 +1,29 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Tingle.Extensions.Primitives.Converters;
+
+/// <summary>
+/// A <see cref="JsonConverter{T}"/> for <see cref="ConnectionStringBuilder"/>
+/// </summary>
+public class ConnectionStringBuilderJsonConverter : JsonConverter<ConnectionStringBuilder>
+{
+    /// <inheritdoc/>
+    public override ConnectionStringBuilder Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.Null) return default;
+        if (reader.TokenType != JsonTokenType.String)
+        {
+            throw new InvalidOperationException("Only strings are supported");
+        }
+
+        var str = reader.GetString();
+        return new ConnectionStringBuilder(str!);
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, ConnectionStringBuilder value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString());
+    }
+}
diff --git a/src/Tingle.Extensions.Primitives/Converters/ContinentJsonConverter.cs b/src/Tingle.Extensions.Primitives/Converters/ContinentJsonConverter.cs
@@ -0,0 +1,23 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Tingle.Extensions.Primitives.Converters;
+
+/// <summary>
+/// A <see cref="JsonConverter{T}"/> for <see cref="Continent"/>
+/// </summary>
+public class ContinentJsonConverter : JsonConverter<Continent>
+{
+    /// <inheritdoc/>
+    public override Continent? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var s = reader.GetString();
+        return string.IsNullOrWhiteSpace(s) ? null : new Continent(s);
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, Continent value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.Name);
+    }
+}
diff --git a/src/Tingle.Extensions.Primitives/Converters/CountryJsonConverter.cs b/src/Tingle.Extensions.Primitives/Converters/CountryJsonConverter.cs
@@ -0,0 +1,23 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Tingle.Extensions.Primitives.Converters;
+
+/// <summary>
+/// A <see cref="JsonConverter{T}"/> for <see cref="Country"/>
+/// </summary>
+public class CountryJsonConverter : JsonConverter<Country>
+{
+    /// <inheritdoc/>
+    public override Country? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var s = reader.GetString();
+        return string.IsNullOrWhiteSpace(s) ? null : Country.FromCode(s);
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, Country value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ThreeLetterCode);
+    }
+}
diff --git a/src/Tingle.Extensions.Primitives/Converters/CurrencyJsonConverter.cs b/src/Tingle.Extensions.Primitives/Converters/CurrencyJsonConverter.cs
@@ -0,0 +1,23 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Tingle.Extensions.Primitives.Converters;
+
+/// <summary>
+/// A <see cref="JsonConverter{T}"/> for <see cref="Currency"/>
+/// </summary>
+public class CurrencyJsonConverter : JsonConverter<Currency>
+{
+    /// <inheritdoc/>
+    public override Currency? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var s = reader.GetString();
+        return string.IsNullOrWhiteSpace(s) ? null : Currency.FromCode(s);
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, Currency value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.Code);
+    }
+}
diff --git a/src/Tingle.Extensions.Primitives/Converters/DurationJsonConverter.cs b/src/Tingle.Extensions.Primitives/Converters/DurationJsonConverter.cs
@@ -0,0 +1,29 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Tingle.Extensions.Primitives.Converters;
+
+/// <summary>
+/// A <see cref="JsonConverter{T}"/> for <see cref="Duration"/>
+/// </summary>
+public class DurationJsonConverter : JsonConverter<Duration>
+{
+    /// <inheritdoc/>
+    public override Duration Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.Null) return default;
+        if (reader.TokenType != JsonTokenType.String)
+        {
+            throw new InvalidOperationException("Only strings are supported");
+        }
+
+        var str = reader.GetString();
+        return Duration.Parse(str!);
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, Duration value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString());
+    }
+}
diff --git a/src/Tingle.Extensions.Primitives/Converters/LanguageJsonConverter.cs b/src/Tingle.Extensions.Primitives/Converters/LanguageJsonConverter.cs
@@ -0,0 +1,23 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Tingle.Extensions.Primitives;
+
+/// <summary>
+/// A <see cref="JsonConverter{T}"/> for <see cref="Language"/>
+/// </summary>
+public class LanguageJsonConverter : JsonConverter<Language>
+{
+    /// <inheritdoc/>
+    public override Language? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var s = reader.GetString();
+        return string.IsNullOrWhiteSpace(s) ? null : Language.FromCode(s);
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, Language value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ThreeLetterCode);
+    }
+}
diff --git a/src/Tingle.Extensions.Primitives/Converters/SequenceNumberJsonConverter.cs b/src/Tingle.Extensions.Primitives/Converters/SequenceNumberJsonConverter.cs
@@ -0,0 +1,28 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Tingle.Extensions.Primitives.Converters;
+
+/// <summary>
+/// A <see cref="JsonConverter{T}"/> for <see cref="SequenceNumber"/>
+/// </summary>
+public class SequenceNumberJsonConverter : JsonConverter<SequenceNumber>
+{
+    /// <inheritdoc/>
+    public override SequenceNumber Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.Number)
+        {
+            throw new InvalidOperationException("Only numbers are supported");
+        }
+
+        var value = reader.GetInt64();
+        return new SequenceNumber(value);
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, SequenceNumber value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value.Value);
+    }
+}
diff --git a/src/Tingle.Extensions.Primitives/Converters/SwiftCodeJsonConverter.cs b/src/Tingle.Extensions.Primitives/Converters/SwiftCodeJsonConverter.cs
@@ -0,0 +1,23 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Tingle.Extensions.Primitives.Converters;
+
+/// <summary>
+/// A <see cref="JsonConverter{T}"/> for <see cref="SwiftCode"/>
+/// </summary>
+public class SwiftCodeJsonConverter : JsonConverter<SwiftCode>
+{
+    /// <inheritdoc/>
+    public override SwiftCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var s = reader.GetString();
+        return string.IsNullOrWhiteSpace(s) ? null : SwiftCode.Parse(s);
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, SwiftCode value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString());
+    }
+}
diff --git a/src/Tingle.Extensions.Primitives/Country.cs b/src/Tingle.Extensions.Primitives/Country.cs
@@ -2,8 +2,8 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using System.Text.Json;
 using System.Text.Json.Serialization;
+using Tingle.Extensions.Primitives.Converters;
 
 namespace Tingle.Extensions.Primitives;
 
@@ -161,22 +161,6 @@ object IConvertible.ToType(Type conversionType, IFormatProvider? provider)
 
     #endregion
 
-    internal class CountryJsonConverter : JsonConverter<Country>
-    {
-        /// <inheritdoc/>
-        public override Country? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var s = reader.GetString();
-            return string.IsNullOrWhiteSpace(s) ? null : FromCode(s);
-        }
-
-        /// <inheritdoc/>
-        public override void Write(Utf8JsonWriter writer, Country value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value.ThreeLetterCode);
-        }
-    }
-
     internal class CountryTypeConverter : TypeConverter
     {
         /// <inheritdoc/>

diff --git a/src/Tingle.Extensions.Primitives/Currency.cs b/src/Tingle.Extensions.Primitives/Currency.cs
@@ -2,8 +2,8 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using System.Text.Json;
 using System.Text.Json.Serialization;
+using Tingle.Extensions.Primitives.Converters;
 
 namespace Tingle.Extensions.Primitives;
 
@@ -157,22 +157,6 @@ object IConvertible.ToType(Type conversionType, IFormatProvider? provider)
 
     #endregion
 
-    internal class CurrencyJsonConverter : JsonConverter<Currency>
-    {
-        /// <inheritdoc/>
-        public override Currency? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var s = reader.GetString();
-            return string.IsNullOrWhiteSpace(s) ? null : FromCode(s);
-        }
-
-        /// <inheritdoc/>
-        public override void Write(Utf8JsonWriter writer, Currency value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value.Code);
-        }
-    }
-
     internal class CurrencyTypeConverter : TypeConverter
     {
         /// <inheritdoc/>

diff --git a/src/Tingle.Extensions.Primitives/Duration.cs b/src/Tingle.Extensions.Primitives/Duration.cs
@@ -1,8 +1,8 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Text;
-using System.Text.Json;
 using System.Text.Json.Serialization;
+using Tingle.Extensions.Primitives.Converters;
 
 namespace Tingle.Extensions.Primitives;
 
@@ -445,30 +445,6 @@ object IConvertible.ToType(Type conversionType, IFormatProvider? provider)
 
     #endregion
 
-    internal class DurationJsonConverter : JsonConverter<Duration>
-    {
-        public DurationJsonConverter() { }
-
-        /// <inheritdoc/>
-        public override Duration Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.Null) return default;
-            if (reader.TokenType != JsonTokenType.String)
-            {
-                throw new InvalidOperationException("Only strings are supported");
-            }
-
-            var str = reader.GetString();
-            return Parse(str!);
-        }
-
-        /// <inheritdoc/>
-        public override void Write(Utf8JsonWriter writer, Duration value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value.ToString());
-        }
-    }
-
     internal class DurationTypeConverter : TypeConverter
     {
         /// <inheritdoc/>