feat: upgrade to .NET 6, refactor everything

2021-11-26 21:10:56 -05:00
parent d28e99ba43
commit 1918c56937
314 changed files with 27954 additions and 27966 deletions
--- a/Myriad/Serialization/JsonSerializerOptionsExtensions.cs
+++ b/Myriad/Serialization/JsonSerializerOptionsExtensions.cs
@@ -1,21 +1,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;

-namespace Myriad.Serialization
+namespace Myriad.Serialization;
+
+public static class JsonSerializerOptionsExtensions
 {
-    public static class JsonSerializerOptionsExtensions
+    public static JsonSerializerOptions ConfigureForMyriad(this JsonSerializerOptions opts)
    {
-        public static JsonSerializerOptions ConfigureForMyriad(this JsonSerializerOptions opts)
-        {
-            opts.PropertyNamingPolicy = new JsonSnakeCaseNamingPolicy();
-            opts.NumberHandling = JsonNumberHandling.AllowReadingFromString;
-            opts.IncludeFields = true;
+        opts.PropertyNamingPolicy = new JsonSnakeCaseNamingPolicy();
+        opts.NumberHandling = JsonNumberHandling.AllowReadingFromString;
+        opts.IncludeFields = true;

-            opts.Converters.Add(new PermissionSetJsonConverter());
-            opts.Converters.Add(new ShardInfoJsonConverter());
-            opts.Converters.Add(new OptionalConverterFactory());
+        opts.Converters.Add(new PermissionSetJsonConverter());
+        opts.Converters.Add(new ShardInfoJsonConverter());
+        opts.Converters.Add(new OptionalConverterFactory());

-            return opts;
-        }
+        return opts;
    }
 }
--- a/Myriad/Serialization/JsonSnakeCaseNamingPolicy.cs
+++ b/Myriad/Serialization/JsonSnakeCaseNamingPolicy.cs
@@ -1,88 +1,86 @@
-using System;
 using System.Text;
 using System.Text.Json;

-namespace Myriad.Serialization
+namespace Myriad.Serialization;
+
+// From https://github.com/J0rgeSerran0/JsonNamingPolicy/blob/master/JsonSnakeCaseNamingPolicy.cs, no NuGet :/
+public class JsonSnakeCaseNamingPolicy: JsonNamingPolicy
 {
-    // From https://github.com/J0rgeSerran0/JsonNamingPolicy/blob/master/JsonSnakeCaseNamingPolicy.cs, no NuGet :/
-    public class JsonSnakeCaseNamingPolicy: JsonNamingPolicy
+    private readonly string _separator = "_";
+
+    public override string ConvertName(string name)
    {
-        private readonly string _separator = "_";
+        if (string.IsNullOrEmpty(name) || string.IsNullOrWhiteSpace(name)) return string.Empty;

-        public override string ConvertName(string name)
+        ReadOnlySpan<char> spanName = name.Trim();
+
+        var stringBuilder = new StringBuilder();
+        var addCharacter = true;
+
+        var isPreviousSpace = false;
+        var isPreviousSeparator = false;
+        var isCurrentSpace = false;
+        var isNextLower = false;
+        var isNextUpper = false;
+        var isNextSpace = false;
+
+        for (var position = 0; position < spanName.Length; position++)
        {
-            if (string.IsNullOrEmpty(name) || string.IsNullOrWhiteSpace(name)) return string.Empty;
-
-            ReadOnlySpan<char> spanName = name.Trim();
-
-            var stringBuilder = new StringBuilder();
-            var addCharacter = true;
-
-            var isPreviousSpace = false;
-            var isPreviousSeparator = false;
-            var isCurrentSpace = false;
-            var isNextLower = false;
-            var isNextUpper = false;
-            var isNextSpace = false;
-
-            for (var position = 0; position < spanName.Length; position++)
+            if (position != 0)
            {
-                if (position != 0)
+                isCurrentSpace = spanName[position] == 32;
+                isPreviousSpace = spanName[position - 1] == 32;
+                isPreviousSeparator = spanName[position - 1] == 95;
+
+                if (position + 1 != spanName.Length)
                {
-                    isCurrentSpace = spanName[position] == 32;
-                    isPreviousSpace = spanName[position - 1] == 32;
-                    isPreviousSeparator = spanName[position - 1] == 95;
+                    isNextLower = spanName[position + 1] > 96 && spanName[position + 1] < 123;
+                    isNextUpper = spanName[position + 1] > 64 && spanName[position + 1] < 91;
+                    isNextSpace = spanName[position + 1] == 32;
+                }

-                    if (position + 1 != spanName.Length)
-                    {
-                        isNextLower = spanName[position + 1] > 96 && spanName[position + 1] < 123;
-                        isNextUpper = spanName[position + 1] > 64 && spanName[position + 1] < 91;
-                        isNextSpace = spanName[position + 1] == 32;
-                    }
+                if (isCurrentSpace &&
+                    (isPreviousSpace ||
+                     isPreviousSeparator ||
+                     isNextUpper ||
+                     isNextSpace))
+                {
+                    addCharacter = false;
+                }
+                else
+                {
+                    var isCurrentUpper = spanName[position] > 64 && spanName[position] < 91;
+                    var isPreviousLower = spanName[position - 1] > 96 && spanName[position - 1] < 123;
+                    var isPreviousNumber = spanName[position - 1] > 47 && spanName[position - 1] < 58;

-                    if (isCurrentSpace &&
-                        (isPreviousSpace ||
-                         isPreviousSeparator ||
-                         isNextUpper ||
-                         isNextSpace))
+                    if (isCurrentUpper &&
+                        (isPreviousLower ||
+                         isPreviousNumber ||
+                         isNextLower ||
+                         isNextSpace ||
+                         isNextLower && !isPreviousSpace))
                    {
-                        addCharacter = false;
+                        stringBuilder.Append(_separator);
                    }
                    else
                    {
-                        var isCurrentUpper = spanName[position] > 64 && spanName[position] < 91;
-                        var isPreviousLower = spanName[position - 1] > 96 && spanName[position - 1] < 123;
-                        var isPreviousNumber = spanName[position - 1] > 47 && spanName[position - 1] < 58;
-
-                        if (isCurrentUpper &&
-                            (isPreviousLower ||
-                             isPreviousNumber ||
-                             isNextLower ||
-                             isNextSpace ||
-                             isNextLower && !isPreviousSpace))
+                        if (isCurrentSpace &&
+                            !isPreviousSpace &&
+                            !isNextSpace)
                        {
                            stringBuilder.Append(_separator);
-                        }
-                        else
-                        {
-                            if (isCurrentSpace &&
-                                !isPreviousSpace &&
-                                !isNextSpace)
-                            {
-                                stringBuilder.Append(_separator);
-                                addCharacter = false;
-                            }
+                            addCharacter = false;
                        }
                    }
                }
-
-                if (addCharacter)
-                    stringBuilder.Append(spanName[position]);
-                else
-                    addCharacter = true;
            }

-            return stringBuilder.ToString().ToLower();
+            if (addCharacter)
+                stringBuilder.Append(spanName[position]);
+            else
+                addCharacter = true;
        }
+
+        return stringBuilder.ToString().ToLower();
    }
 }
--- a/Myriad/Serialization/JsonSnakeCaseStringEnumConverter.cs
+++ b/Myriad/Serialization/JsonSnakeCaseStringEnumConverter.cs
@@ -1,17 +1,15 @@
-using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;

-namespace Myriad.Serialization
+namespace Myriad.Serialization;
+
+public class JsonSnakeCaseStringEnumConverter: JsonConverterFactory
 {
-    public class JsonSnakeCaseStringEnumConverter: JsonConverterFactory
-    {
-        private readonly JsonStringEnumConverter _inner = new(new JsonSnakeCaseNamingPolicy());
+    private readonly JsonStringEnumConverter _inner = new(new JsonSnakeCaseNamingPolicy());

-        public override bool CanConvert(Type typeToConvert) =>
-            _inner.CanConvert(typeToConvert);
+    public override bool CanConvert(Type typeToConvert) =>
+        _inner.CanConvert(typeToConvert);

-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) =>
-            _inner.CreateConverter(typeToConvert, options);
-    }
+    public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) =>
+        _inner.CreateConverter(typeToConvert, options);
 }
--- a/Myriad/Serialization/JsonStringConverter.cs
+++ b/Myriad/Serialization/JsonStringConverter.cs
@@ -1,22 +1,20 @@
-using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;

-namespace Myriad.Serialization
-{
-    public class JsonStringConverter: JsonConverter<object>
-    {
-        public override object? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var str = JsonSerializer.Deserialize<string>(ref reader);
-            var inner = JsonSerializer.Deserialize(str!, typeToConvert, options);
-            return inner;
-        }
+namespace Myriad.Serialization;

-        public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
-        {
-            var inner = JsonSerializer.Serialize(value, options);
-            writer.WriteStringValue(inner);
-        }
+public class JsonStringConverter: JsonConverter<object>
+{
+    public override object? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var str = JsonSerializer.Deserialize<string>(ref reader);
+        var inner = JsonSerializer.Deserialize(str!, typeToConvert, options);
+        return inner;
+    }
+
+    public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
+    {
+        var inner = JsonSerializer.Serialize(value, options);
+        writer.WriteStringValue(inner);
    }
 }
--- a/Myriad/Serialization/OptionalConverter.cs
+++ b/Myriad/Serialization/OptionalConverter.cs
@@ -1,48 +1,47 @@
-using System;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;

 using Myriad.Utils;

-namespace Myriad.Serialization
+namespace Myriad.Serialization;
+
+public class OptionalConverterFactory: JsonConverterFactory
 {
-    public class OptionalConverterFactory: JsonConverterFactory
+    public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
    {
-        public class Inner<T>: JsonConverter<Optional<T>>
-        {
-            public override Optional<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            {
-                var inner = JsonSerializer.Deserialize<T>(ref reader, options);
-                return new(inner!);
-            }
+        var innerType = typeToConvert.GetGenericArguments()[0];
+        return (JsonConverter?)Activator.CreateInstance(
+            typeof(Inner<>).MakeGenericType(innerType),
+            BindingFlags.Instance | BindingFlags.Public,
+            null,
+            null,
+            null);
+    }

-            public override void Write(Utf8JsonWriter writer, Optional<T> value, JsonSerializerOptions options)
-            {
-                JsonSerializer.Serialize(writer, value.HasValue ? value.GetValue() : default, typeof(T), options);
-            }
+    public override bool CanConvert(Type typeToConvert)
+    {
+        if (!typeToConvert.IsGenericType)
+            return false;
+
+        if (typeToConvert.GetGenericTypeDefinition() != typeof(Optional<>))
+            return false;
+
+        return true;
+    }
+
+    public class Inner<T>: JsonConverter<Optional<T>>
+    {
+        public override Optional<T> Read(ref Utf8JsonReader reader, Type typeToConvert,
+                                         JsonSerializerOptions options)
+        {
+            var inner = JsonSerializer.Deserialize<T>(ref reader, options);
+            return new Optional<T>(inner!);
        }

-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, Optional<T> value, JsonSerializerOptions options)
        {
-            var innerType = typeToConvert.GetGenericArguments()[0];
-            return (JsonConverter?)Activator.CreateInstance(
-                typeof(Inner<>).MakeGenericType(innerType),
-                BindingFlags.Instance | BindingFlags.Public,
-                null,
-                null,
-                null);
-        }
-
-        public override bool CanConvert(Type typeToConvert)
-        {
-            if (!typeToConvert.IsGenericType)
-                return false;
-
-            if (typeToConvert.GetGenericTypeDefinition() != typeof(Optional<>))
-                return false;
-
-            return true;
+            JsonSerializer.Serialize(writer, value.HasValue ? value.GetValue() : default, typeof(T), options);
        }
    }
 }
--- a/Myriad/Serialization/PermissionSetJsonConverter.cs
+++ b/Myriad/Serialization/PermissionSetJsonConverter.cs
@@ -1,24 +1,22 @@
-using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;

 using Myriad.Types;

-namespace Myriad.Serialization
+namespace Myriad.Serialization;
+
+public class PermissionSetJsonConverter: JsonConverter<PermissionSet>
 {
-    public class PermissionSetJsonConverter: JsonConverter<PermissionSet>
+    public override PermissionSet Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
    {
-        public override PermissionSet Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var str = reader.GetString();
-            if (str == null) return default;
+        var str = reader.GetString();
+        if (str == null) return default;

-            return (PermissionSet)ulong.Parse(str);
-        }
+        return (PermissionSet)ulong.Parse(str);
+    }

-        public override void Write(Utf8JsonWriter writer, PermissionSet value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(((ulong)value).ToString());
-        }
+    public override void Write(Utf8JsonWriter writer, PermissionSet value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(((ulong)value).ToString());
    }
 }
--- a/Myriad/Serialization/ShardInfoJsonConverter.cs
+++ b/Myriad/Serialization/ShardInfoJsonConverter.cs
@@ -1,28 +1,26 @@
-using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;

 using Myriad.Gateway;

-namespace Myriad.Serialization
+namespace Myriad.Serialization;
+
+public class ShardInfoJsonConverter: JsonConverter<ShardInfo>
 {
-    public class ShardInfoJsonConverter: JsonConverter<ShardInfo>
+    public override ShardInfo? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
    {
-        public override ShardInfo? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var arr = JsonSerializer.Deserialize<int[]>(ref reader);
-            if (arr?.Length != 2)
-                throw new JsonException("Expected shard info as array of length 2");
+        var arr = JsonSerializer.Deserialize<int[]>(ref reader);
+        if (arr?.Length != 2)
+            throw new JsonException("Expected shard info as array of length 2");

-            return new ShardInfo(arr[0], arr[1]);
-        }
+        return new ShardInfo(arr[0], arr[1]);
+    }

-        public override void Write(Utf8JsonWriter writer, ShardInfo value, JsonSerializerOptions options)
-        {
-            writer.WriteStartArray();
-            writer.WriteNumberValue(value.ShardId);
-            writer.WriteNumberValue(value.NumShards);
-            writer.WriteEndArray();
-        }
+    public override void Write(Utf8JsonWriter writer, ShardInfo value, JsonSerializerOptions options)
+    {
+        writer.WriteStartArray();
+        writer.WriteNumberValue(value.ShardId);
+        writer.WriteNumberValue(value.NumShards);
+        writer.WriteEndArray();
    }
 }