Merge pull request #12 from jacqueskang/bugfix-enum-conversion

support enum type in service contract

Author: jacqueskang

src/IpcServiceSample.ConsoleClient/Program.cs

@@ -40,6 +40,10 @@ private static async Task MainAsync(string[] args)
                 // test 4: call IPC service method without parameter or return
                 await client.InvokeAsync(x => x.DoNothing());
                 Console.WriteLine($"invoked DoNothing()");
+
+                // test 5: call IPC service method with enum parameter
+                string text = await client.InvokeAsync(x => x.ConvertText("hEllO woRd!", TextStyle.Upper));
+                Console.WriteLine(text);
             }
             catch (Exception ex)
             {

src/IpcServiceSample.ConsoleServer/ComputingService.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 using IpcServiceSample.ServiceContracts;
 using Microsoft.Extensions.Logging;
 
@@ -36,6 +37,19 @@ public float AddFloat(float x, float y)
             return x + y;
         }
 
+        public string ConvertText(string text, TextStyle style)
+        {
+            switch (style)
+            {
+                case TextStyle.TitleCase:
+                    return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(text);
+                case TextStyle.Upper:
+                    return CultureInfo.InvariantCulture.TextInfo.ToUpper(text);
+                default:
+                    return text;
+            }
+        }
+
         public void DoNothing()
         { }
     }

src/IpcServiceSample.ServiceContracts/IComputingService.cs

@@ -8,6 +8,7 @@ public interface IComputingService
         ComplexNumber AddComplexNumber(ComplexNumber x, ComplexNumber y);
         ComplexNumber AddComplexNumbers(IEnumerable<ComplexNumber> numbers);
         void DoNothing();
+        string ConvertText(string text, TextStyle style);
     }
 
     public class ComplexNumber
@@ -21,4 +22,10 @@ public ComplexNumber(float a, float b)
             B = b;
         }
     }
+
+    public enum TextStyle
+    {
+        TitleCase,
+        Upper
+    }
 }

src/JKang.IpcServiceFramework.Core.Tests/DefaultValueConverterTest.cs

@@ -140,6 +140,30 @@ public void TryConvert_DerivedTypeToBaseType()
             Assert.IsInstanceOfType(actual, typeof(ComplexType));
         }
 
+        [TestMethod]
+        public void TryConvert_StringToEnum()
+        {
+            EnumType expected = EnumType.SecondOption;
+
+            bool succeed = _sut.TryConvert(expected.ToString(), typeof(EnumType), out object actual);
+
+            Assert.IsTrue(succeed);
+            Assert.IsInstanceOfType(actual, typeof(EnumType));
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestMethod]
+        public void TryConvert_Int32ToEnum()
+        {
+            EnumType expected = EnumType.SecondOption;
+
+            bool succeed = _sut.TryConvert((int)expected, typeof(EnumType), out object actual);
+
+            Assert.IsTrue(succeed);
+            Assert.IsInstanceOfType(actual, typeof(EnumType));
+            Assert.AreEqual(expected, actual);
+        }
+
         interface IComplexType
         {
             int Int32Value { get; }
@@ -151,5 +175,11 @@ class ComplexType : IComplexType
             public int Int32Value { get; set; }
             public string StringValue { get; set; }
         }
+
+        enum EnumType
+        {
+            FirstOption,
+            SecondOption
+        }
     }
 }

src/JKang.IpcServiceFramework.Core/Services/DefaultValueConverter.cs

@@ -14,6 +14,30 @@ public bool TryConvert(object origValue, Type destType, out object destValue)
                 return true;
             }
 
+            if (destType.IsEnum)
+            {
+                if (origValue is string str)
+                {
+                    try
+                    {
+                        destValue = Enum.Parse(destType, str, ignoreCase: true);
+                        return true;
+                    }
+                    catch
+                    { }
+                }
+                else
+                {
+                    try
+                    {
+                        destValue = Enum.ToObject(destType, origValue);
+                        return true;
+                    }
+                    catch
+                    { }
+                }
+            }
+
             if (origValue is JObject jObj)
             {
                 // rely on JSON.Net to convert complexe type