Async task (#25)

shawnallen85 · rabbah · commit ef821d18ef6a · 2019-11-28T17:36:59.000-05:00
Support for async/await.
diff --git a/core/dotnet2.2/CHANGELOG.md b/core/dotnet2.2/CHANGELOG.md
@@ -23,3 +23,15 @@
 ## 1.13
 Changes:
 - Initial release
+
+## Release TBD
+Changes:
+- Support for async methods. Example:
+
+```csharp
+        public async Task<JObject> MainAsync(JObject args)
+        {
+            await Task.Delay(10); // Just do a delay to have an async/await process occur.
+            return (args);
+        }
+```
diff --git a/core/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs b/core/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs
@@ -33,6 +33,7 @@ public class Init
         private Type Type { get; set; }
         private MethodInfo Method { get; set; }
         private ConstructorInfo Constructor { get; set; }
+        private bool AwaitableMethod { get; set; }
 
         public Init()
         {
@@ -51,7 +52,7 @@ public async Task<Run> HandleRequest(HttpContext httpContext)
                 {
                     await httpContext.Response.WriteError("Cannot initialize the action more than once.");
                     Console.Error.WriteLine("Cannot initialize the action more than once.");
-                    return (new Run(Type, Method, Constructor));
+                    return (new Run(Type, Method, Constructor, AwaitableMethod));
                 }
 
                 string body = await new StreamReader(httpContext.Request.Body).ReadToEndAsync();
@@ -156,7 +157,9 @@ await httpContext.Response.WriteError(ex.Message
 
                 await httpContext.Response.WriteResponse(200, "OK");
 
-                return (new Run(Type, Method, Constructor));
+                AwaitableMethod = (Method.ReturnType.GetMethod(nameof(Task.GetAwaiter)) != null);
+
+                return (new Run(Type, Method, Constructor, AwaitableMethod));
             }
             catch (Exception ex)
             {
diff --git a/core/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/Run.cs b/core/dotnet2.2/proxy/Apache.OpenWhisk.Runtime.Common/Run.cs
@@ -29,12 +29,14 @@ public class Run
         private readonly Type _type;
         private readonly MethodInfo _method;
         private readonly ConstructorInfo _constructor;
+        private readonly bool _awaitableMethod;
 
-        public Run(Type type, MethodInfo method, ConstructorInfo constructor)
+        public Run(Type type, MethodInfo method, ConstructorInfo constructor, bool awaitableMethod)
         {
             _type = type;
             _method = method;
             _constructor = constructor;
+            _awaitableMethod = awaitableMethod;
         }
 
         public async Task HandleRequest(HttpContext httpContext)
@@ -79,7 +81,14 @@ await Console.Error.WriteLineAsync(
 
                 try
                 {
-                    JObject output = (JObject) _method.Invoke(owObject, new object[] {valObject});
+                    JObject output;
+                    
+                    if(_awaitableMethod) {
+                        output = (JObject) await (dynamic) _method.Invoke(owObject, new object[] {valObject});
+                    }
+                    else {
+                        output = (JObject) _method.Invoke(owObject, new object[] {valObject});
+                    }
 
                     if (output == null)
                     {
diff --git a/core/dotnet3.0/CHANGELOG.md b/core/dotnet3.0/CHANGELOG.md
@@ -20,6 +20,15 @@
 # .NET Core 3.0 OpenWhisk Runtime Container
 
 
-## 1.14 (next Apache release)
+## Release TBD
 Changes:
 - Initial release
+- Support for async methods. Example:
+
+```csharp
+        public async Task<JObject> MainAsync(JObject args)
+        {
+            await Task.Delay(10); // Just do a delay to have an async/await process occur.
+            return (args);
+        }
+```
diff --git a/core/dotnet3.0/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs b/core/dotnet3.0/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs
@@ -33,6 +33,7 @@ public class Init
         private Type Type { get; set; }
         private MethodInfo Method { get; set; }
         private ConstructorInfo Constructor { get; set; }
+        private bool AwaitableMethod { get; set; }
 
         public Init()
         {
@@ -51,7 +52,7 @@ public async Task<Run> HandleRequest(HttpContext httpContext)
                 {
                     await httpContext.Response.WriteError("Cannot initialize the action more than once.");
                     Console.Error.WriteLine("Cannot initialize the action more than once.");
-                    return (new Run(Type, Method, Constructor));
+                    return (new Run(Type, Method, Constructor, AwaitableMethod));
                 }
 
                 string body = await new StreamReader(httpContext.Request.Body).ReadToEndAsync();
@@ -156,7 +157,9 @@ await httpContext.Response.WriteError(ex.Message
 
                 await httpContext.Response.WriteResponse(200, "OK");
 
-                return (new Run(Type, Method, Constructor));
+                AwaitableMethod = (Method.ReturnType.GetMethod(nameof(Task.GetAwaiter)) != null);
+
+                return (new Run(Type, Method, Constructor, AwaitableMethod));
             }
             catch (Exception ex)
             {
diff --git a/core/dotnet3.0/proxy/Apache.OpenWhisk.Runtime.Common/Run.cs b/core/dotnet3.0/proxy/Apache.OpenWhisk.Runtime.Common/Run.cs
@@ -29,12 +29,14 @@ public class Run
         private readonly Type _type;
         private readonly MethodInfo _method;
         private readonly ConstructorInfo _constructor;
+        private readonly bool _awaitableMethod;
 
-        public Run(Type type, MethodInfo method, ConstructorInfo constructor)
+        public Run(Type type, MethodInfo method, ConstructorInfo constructor, bool awaitableMethod)
         {
             _type = type;
             _method = method;
             _constructor = constructor;
+            _awaitableMethod = awaitableMethod;
         }
 
         public async Task HandleRequest(HttpContext httpContext)
@@ -79,7 +81,14 @@ await Console.Error.WriteLineAsync(
 
                 try
                 {
-                    JObject output = (JObject) _method.Invoke(owObject, new object[] {valObject});
+                    JObject output;
+                    
+                    if(_awaitableMethod) {
+                        output = (JObject) await (dynamic) _method.Invoke(owObject, new object[] {valObject});
+                    }
+                    else {
+                        output = (JObject) _method.Invoke(owObject, new object[] {valObject});
+                    }
 
                     if (output == null)
                     {
diff --git a/tests/dotnetshared/Echo.cs b/tests/dotnetshared/Echo.cs
@@ -17,6 +17,7 @@
 
 using System;
 using Newtonsoft.Json.Linq;
+using System.Threading.Tasks;
 
 namespace Apache.OpenWhisk.Tests.Dotnet
 {
@@ -26,5 +27,11 @@ public JObject Main(JObject args)
         {
             return (args);
         }
+
+        public async Task<JObject> MainAsync(JObject args)
+        {
+            await Task.Delay(10); // Just do a delay to have an async/await process occur.
+            return (args);
+        }
     }
 }
diff --git a/tests/src/test/scala/actionContainers/DotNet2_2ActionContainerTests.scala b/tests/src/test/scala/actionContainers/DotNet2_2ActionContainerTests.scala
@@ -52,7 +52,7 @@ class DotNet2_2ActionContainerTests extends BasicActionRunnerTests with WskActor
   }
 
   val testEchoNoWrite = {
-    TestConfig(functionb64, main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::Main")
+    TestConfig(functionb64, main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::MainAsync")
   }
 
   override val testUnicode = {
diff --git a/tests/src/test/scala/actionContainers/DotNet3_0ActionContainerTests.scala b/tests/src/test/scala/actionContainers/DotNet3_0ActionContainerTests.scala
@@ -52,7 +52,7 @@ class DotNet3_0ActionContainerTests extends BasicActionRunnerTests with WskActor
   }
 
   val testEchoNoWrite = {
-    TestConfig(functionb64, main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::Main")
+    TestConfig(functionb64, main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::MainAsync")
   }
 
   override val testUnicode = {

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public class Init`
`33`	`33`	`private Type Type { get; set; }`
`34`	`34`	`private MethodInfo Method { get; set; }`
`35`	`35`	`private ConstructorInfo Constructor { get; set; }`
	`36`	`+ private bool AwaitableMethod { get; set; }`
`36`	`37`
`37`	`38`	`public Init()`
`38`	`39`	`{`
`@@ -51,7 +52,7 @@ public async Task<Run> HandleRequest(HttpContext httpContext)`
`51`	`52`	`{`
`52`	`53`	`await httpContext.Response.WriteError("Cannot initialize the action more than once.");`
`53`	`54`	`Console.Error.WriteLine("Cannot initialize the action more than once.");`
`54`		`- return (new Run(Type, Method, Constructor));`
	`55`	`+ return (new Run(Type, Method, Constructor, AwaitableMethod));`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`string body = await new StreamReader(httpContext.Request.Body).ReadToEndAsync();`
`@@ -156,7 +157,9 @@ await httpContext.Response.WriteError(ex.Message`
`156`	`157`
`157`	`158`	`await httpContext.Response.WriteResponse(200, "OK");`
`158`	`159`
`159`		`- return (new Run(Type, Method, Constructor));`
	`160`	`+ AwaitableMethod = (Method.ReturnType.GetMethod(nameof(Task.GetAwaiter)) != null);`
	`161`	`+`
	`162`	`+ return (new Run(Type, Method, Constructor, AwaitableMethod));`
`160`	`163`	`}`
`161`	`164`	`catch (Exception ex)`
`162`	`165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`using System;`
`19`	`19`	`using Newtonsoft.Json.Linq;`
	`20`	`+using System.Threading.Tasks;`
`20`	`21`
`21`	`22`	`namespace Apache.OpenWhisk.Tests.Dotnet`
`22`	`23`	`{`
`@@ -26,5 +27,11 @@ public JObject Main(JObject args)`
`26`	`27`	`{`
`27`	`28`	`return (args);`
`28`	`29`	`}`
	`30`	`+`
	`31`	`+ public async Task<JObject> MainAsync(JObject args)`
	`32`	`+ {`
	`33`	`+ await Task.Delay(10); // Just do a delay to have an async/await process occur.`
	`34`	`+ return (args);`
	`35`	`+ }`
`29`	`36`	`}`
`30`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class DotNet2_2ActionContainerTests extends BasicActionRunnerTests with WskActor`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`val testEchoNoWrite = {`
`55`		`- TestConfig(functionb64, main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::Main")`
	`55`	`+ TestConfig(functionb64, main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::MainAsync")`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`override val testUnicode = {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class DotNet3_0ActionContainerTests extends BasicActionRunnerTests with WskActor`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`val testEchoNoWrite = {`
`55`		`- TestConfig(functionb64, main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::Main")`
	`55`	`+ TestConfig(functionb64, main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::MainAsync")`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`override val testUnicode = {`