Code style - Use file scoped namespaces

Code style - Ran code cleanup

src/Artemis.Core/JsonConverters/ForgivingIntConverter.cs

@@ -2,32 +2,31 @@ using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Artemis.Core.JsonConverters
+namespace Artemis.Core.JsonConverters;
+
+/// <summary>
+///     An int converter that, if required, will round float values
+/// </summary>
+internal class ForgivingIntConverter : JsonConverter<int>
 {
-    /// <summary>
-    ///     An int converter that, if required, will round float values
-    /// </summary>
-    internal class ForgivingIntConverter : JsonConverter<int>
+    public override bool CanWrite => false;
+
+    public override void WriteJson(JsonWriter writer, int value, JsonSerializer serializer)
     {
-        public override bool CanWrite => false;
-
-        public override void WriteJson(JsonWriter writer, int value, JsonSerializer serializer)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override int ReadJson(JsonReader reader, Type objectType, int existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            JValue? jsonValue = serializer.Deserialize<JValue>(reader);
-            if (jsonValue == null)
-                throw new JsonReaderException("Failed to deserialize forgiving int value");
-
-            if (jsonValue.Type == JTokenType.Float)
-                return (int) Math.Round(jsonValue.Value<double>());
-            if (jsonValue.Type == JTokenType.Integer) 
-                return jsonValue.Value<int>();
+        throw new NotImplementedException();
+    }
 
+    public override int ReadJson(JsonReader reader, Type objectType, int existingValue, bool hasExistingValue, JsonSerializer serializer)
+    {
+        JValue? jsonValue = serializer.Deserialize<JValue>(reader);
+        if (jsonValue == null)
             throw new JsonReaderException("Failed to deserialize forgiving int value");
-        }
+
+        if (jsonValue.Type == JTokenType.Float)
+            return (int) Math.Round(jsonValue.Value<double>());
+        if (jsonValue.Type == JTokenType.Integer)
+            return jsonValue.Value<int>();
+
+        throw new JsonReaderException("Failed to deserialize forgiving int value");
     }
 }

src/Artemis.Core/JsonConverters/NumericJsonConverter.cs

@@ -1,25 +1,24 @@
 using System;
 using Newtonsoft.Json;
 
-namespace Artemis.Core.JsonConverters
+namespace Artemis.Core.JsonConverters;
+
+internal class NumericJsonConverter : JsonConverter<Numeric>
 {
-    internal class NumericJsonConverter : JsonConverter<Numeric>
+    #region Overrides of JsonConverter<Numeric>
+
+    /// <inheritdoc />
+    public override void WriteJson(JsonWriter writer, Numeric value, JsonSerializer serializer)
     {
-        #region Overrides of JsonConverter<Numeric>
-
-        /// <inheritdoc />
-        public override void WriteJson(JsonWriter writer, Numeric value, JsonSerializer serializer)
-        {
-            float floatValue = value;
-            writer.WriteValue(floatValue);
-        }
-
-        /// <inheritdoc />
-        public override Numeric ReadJson(JsonReader reader, Type objectType, Numeric existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            return new Numeric(reader.Value);
-        }
-
-        #endregion
+        float floatValue = value;
+        writer.WriteValue(floatValue);
     }
+
+    /// <inheritdoc />
+    public override Numeric ReadJson(JsonReader reader, Type objectType, Numeric existingValue, bool hasExistingValue, JsonSerializer serializer)
+    {
+        return new Numeric(reader.Value);
+    }
+
+    #endregion
 }

src/Artemis.Core/JsonConverters/SKColorConverter.cs

@@ -2,21 +2,20 @@
 using Newtonsoft.Json;
 using SkiaSharp;
 
-namespace Artemis.Core.JsonConverters
+namespace Artemis.Core.JsonConverters;
+
+internal class SKColorConverter : JsonConverter<SKColor>
 {
-    internal class SKColorConverter : JsonConverter<SKColor>
+    public override void WriteJson(JsonWriter writer, SKColor value, JsonSerializer serializer)
     {
-        public override void WriteJson(JsonWriter writer, SKColor value, JsonSerializer serializer)
-        {
-            writer.WriteValue(value.ToString());
-        }
+        writer.WriteValue(value.ToString());
+    }
 
-        public override SKColor ReadJson(JsonReader reader, Type objectType, SKColor existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            if (reader.Value is string value && !string.IsNullOrWhiteSpace(value))
-                return SKColor.Parse(value);
+    public override SKColor ReadJson(JsonReader reader, Type objectType, SKColor existingValue, bool hasExistingValue, JsonSerializer serializer)
+    {
+        if (reader.Value is string value && !string.IsNullOrWhiteSpace(value))
+            return SKColor.Parse(value);
 
-            return SKColor.Empty;
-        }
+        return SKColor.Empty;
     }
 }

src/Artemis.Core/JsonConverters/StreamConverter.cs

@@ -2,44 +2,43 @@
 using System.IO;
 using Newtonsoft.Json;
 
-namespace Artemis.Core.JsonConverters
+namespace Artemis.Core.JsonConverters;
+
+/// <inheritdoc />
+public class StreamConverter : JsonConverter<Stream>
 {
+    #region Overrides of JsonConverter<Stream>
+
     /// <inheritdoc />
-    public class StreamConverter : JsonConverter<Stream>
+    public override void WriteJson(JsonWriter writer, Stream? value, JsonSerializer serializer)
     {
-        #region Overrides of JsonConverter<Stream>
-
-        /// <inheritdoc />
-        public override void WriteJson(JsonWriter writer, Stream? value, JsonSerializer serializer)
+        if (value == null)
         {
-            if (value == null)
-            {
-                writer.WriteNull();
-                return;
-            }
-
-            using MemoryStream memoryStream = new();
-            value.Position = 0;
-            value.CopyTo(memoryStream);
-            writer.WriteValue(memoryStream.ToArray());
+            writer.WriteNull();
+            return;
         }
 
-        /// <inheritdoc />
-        public override Stream? ReadJson(JsonReader reader, Type objectType, Stream? existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            if (reader.Value is not string base64)
-                return null;
-
-            if (existingValue == null || !hasExistingValue || !existingValue.CanRead)
-                return new MemoryStream(Convert.FromBase64String(base64));
-
-            using MemoryStream memoryStream = new(Convert.FromBase64String(base64));
-            existingValue.Position = 0;
-            memoryStream.CopyTo(existingValue);
-            existingValue.Position = 0;
-            return existingValue;
-        }
-
-        #endregion
+        using MemoryStream memoryStream = new();
+        value.Position = 0;
+        value.CopyTo(memoryStream);
+        writer.WriteValue(memoryStream.ToArray());
     }
+
+    /// <inheritdoc />
+    public override Stream? ReadJson(JsonReader reader, Type objectType, Stream? existingValue, bool hasExistingValue, JsonSerializer serializer)
+    {
+        if (reader.Value is not string base64)
+            return null;
+
+        if (existingValue == null || !hasExistingValue || !existingValue.CanRead)
+            return new MemoryStream(Convert.FromBase64String(base64));
+
+        using MemoryStream memoryStream = new(Convert.FromBase64String(base64));
+        existingValue.Position = 0;
+        memoryStream.CopyTo(existingValue);
+        existingValue.Position = 0;
+        return existingValue;
+    }
+
+    #endregion
 }