Merge branch 'master' of https://github.com/simonmau/enum_ext

Author: mjuen

Enum.Ext/Enum.Ext.Tests/ConvertTests.cs

@@ -0,0 +1,43 @@
+using Newtonsoft.Json;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Enum.Ext.Tests
+{
+    public class ConvertTests
+    {
+        [SetUp]
+        public void InitWeekday()
+        {
+            Initialize.InitStaticFields<Weekday>();
+        }
+
+        [Test]
+        public void Test_ConvertToJson()
+        {
+            var tempClass = new ClassToSerialize
+            {
+                Weekday = Weekday.Monday
+            };
+
+            var json = JsonConvert.SerializeObject(tempClass);
+
+            Assert.AreEqual("{\"Weekday\":1}", json);
+        }
+
+        [Test]
+        public void Test_ConvertFromJson()
+        {
+            var tempClass = JsonConvert.DeserializeObject<ClassToSerialize>("{\"Weekday\":1}");
+
+            Assert.AreEqual(Weekday.Monday, tempClass.Weekday);
+        }
+
+        public class ClassToSerialize
+        {
+            public Weekday Weekday { get; set; }
+        }
+    }
+}

Enum.Ext/Enum.Ext/Converter/JsonTypeSafeEnumConverter.cs

@@ -0,0 +1,76 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+
+namespace Enum.Ext.Converter
+{
+    public class JsonTypeSafeEnumConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            Type currentType = objectType.BaseType;
+            while (currentType != typeof(object))
+            {
+                if (currentType.IsGenericType && currentType.GetGenericTypeDefinition() == typeof(TypeSafeEnum<,>))
+                    return true;
+
+                currentType = currentType.BaseType;
+            }
+
+            return false;
+        }
+
+        private Type GetKeyType(Type objectType)
+        {
+            Type currentType = objectType.BaseType;
+            while (currentType != typeof(object))
+            {
+                if (currentType.IsGenericType && currentType.GetGenericTypeDefinition() == typeof(TypeSafeEnum<,>))
+                    return currentType.GenericTypeArguments[1];
+
+                currentType = currentType.BaseType;
+            }
+
+            return null;
+        }
+
+        private MethodInfo GetBaseMethod(Type objectType)
+        {
+            Type currentType = objectType.BaseType;
+            while (currentType != typeof(object))
+            {
+                if (currentType.IsGenericType && currentType.GetGenericTypeDefinition() == typeof(TypeSafeEnum<,>))
+                    return currentType.GetMethod("GetById");
+
+                currentType = currentType.BaseType;
+            }
+
+            return null;
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (!CanConvert(objectType))
+            {
+                throw new NotImplementedException();
+            }
+
+            var keyType = GetKeyType(objectType);
+            var method = GetBaseMethod(objectType);
+
+            return method.Invoke(null, new[] { Convert.ChangeType(reader.Value, keyType) });
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var idProperty = value.GetType().GetProperty("Id");
+
+            var ser = new JsonSerializer();
+            ser.Serialize(writer, idProperty.GetValue(value));
+        }
+
+        public override bool CanRead => true;
+    }
+}

Enum.Ext/Enum.Ext/Enum.Ext.csproj

@@ -3,12 +3,12 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.0.1</Version>
+    <Version>1.0.1.0</Version>
     <Authors>Mauracher Simon, Juen Marcel</Authors>
     <PackageProjectUrl>https://github.com/simonmau/enum_ext</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonmau/enum_ext</RepositoryUrl>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageIconUrl>https://github.com/simonmau/enum_ext/blob/master/Resources/Logo/EXT.png?raw=true</PackageIconUrl>
+    <PackageIconUrl>https://github.com/simonmau/enum_ext/blob/master/Resources/Logo/EXT_64.png?raw=true</PackageIconUrl>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,4 +18,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+  </ItemGroup>
+
 </Project>

Enum.Ext/Enum.Ext/TypeSafeEnum.cs

@@ -1,10 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System;
+using Newtonsoft.Json;
+using Enum.Ext.Converter;
 
 namespace Enum.Ext
 {
-    public abstract class TypeSafeEnum<TValue, TKey>
+    [JsonConverter(typeof(JsonTypeSafeEnumConverter))]
+    public abstract class TypeSafeEnum<TValue, TKey> where TKey : struct
     {
         protected static readonly Dictionary<TKey, TypeSafeEnum<TValue, TKey>> Dictionary = new Dictionary<TKey, TypeSafeEnum<TValue, TKey>>();
 

Enum.Ext/Enum.Ext/TypeSafeNameEnum.cs

@@ -1,6 +1,6 @@
 namespace Enum.Ext
 {
-    public abstract class TypeSafeNameEnum<TValue, TKey> : TypeSafeEnum<TypeSafeNameEnum<TValue, TKey>, TKey>
+    public abstract class TypeSafeNameEnum<TValue, TKey> : TypeSafeEnum<TypeSafeNameEnum<TValue, TKey>, TKey> where TKey : struct
     {
         protected TypeSafeNameEnum(TKey id, string name) : base(id)
         {

README.md

@@ -7,6 +7,8 @@ Enum.Ext provides a `TypeSafeEnum` that has a bunch of advantages compared to th
 For example is it possible, to store additional information directly with the enum. You are also able to 
 query an enum based on the information stored with it.
 
+There is also a Json-Serializer Implemented, so you dont have to cast from DTOs manually.
+
 ### Installation 
 https://www.nuget.org/packages/Enum.Ext/