Merge pull request #95 from tochka-public/CSHARP-182/master

Don't break on void and task methods

src/Tochka.JsonRpc.ApiExplorer/TypeEmitter.cs

@@ -60,6 +60,11 @@ public Type CreateResponseType(string actionFullName, string methodName, Type re
                 return definedType;
             }
 
+            if (resultType == typeof(void))
+            {
+                resultType = typeof(object);
+            }
+
             var responseType = typeof(Response<>).MakeGenericType(resultType);
             return GenerateTypeWithInfoAttribute(responseTypeName, responseType, resultType, serializerOptionsProviderType, methodName);
         }

src/Tochka.JsonRpc.Server/Filters/JsonRpcResultFilter.cs

@@ -83,6 +83,7 @@ public void OnResultExecuted(ResultExecutedContext context)
         ObjectResult { StatusCode: >= 400 } result => errorFactory.HttpError(result.StatusCode.Value, result.Value),
         ObjectResult result => result.Value,
         StatusCodeResult { StatusCode: >= 400 } result => errorFactory.HttpError(result.StatusCode, null),
+        StatusCodeResult { StatusCode: >= 200 and < 300 } => null,
         EmptyResult => null,
         _ => actionResult
     };

src/tests/Tochka.JsonRpc.ApiExplorer.Tests/TypeEmitterTests.cs

@@ -417,6 +417,17 @@ public void CreateResponseType_ResultTypeWithoutEmptyConstructor_HasMetadataAttr
         attributes.Should().ContainEquivalentOf(new JsonRpcTypeMetadataAttribute(serializerOptionsProviderType, MethodName));
     }
 
+    [Test]
+    public void CreateResponseType_ResultTypeIsVoid_GenericArgumentIsObject()
+    {
+        var resultType = typeof(void);
+        var serializerOptionsProviderType = typeof(SnakeCaseJsonSerializerOptionsProvider);
+
+        var responseType = typeEmitter.CreateResponseType(ActionFullName, MethodName, resultType, serializerOptionsProviderType);
+
+        responseType.Should().BeAssignableTo<Response<object>>();
+    }
+
     private const string ActionFullName = "namespace.controller.action";
     private const string MethodName = "method";
 

src/tests/Tochka.JsonRpc.OpenRpc.Tests.Integration/IntegrationTests.cs

@@ -34,6 +34,9 @@ internal class IntegrationTests : IntegrationTestsBase<Program>
     [TestCase("return_error_from_factory")]
     [TestCase("return_mvc_error")]
     [TestCase("error_throw_as_response_exception")]
+    [TestCase("void_method")]
+    [TestCase("task_method")]
+    [TestCase("empty_ok")]
     public async Task GetDocument_ReturnsAllMethods(string method)
     {
         var response = await ApiClient.GetAsync("/openrpc/jsonrpc_v1.json");