fix: allow PropertyNamingPolicy = null

tochka-public · Sep 19, 2024 · 6eba02d · 6eba02d
1 parent d8d0c5c
commit 6eba02d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Tochka.JsonRpc.Server/Binding/JsonRpcParameterModelConvention.cs b/src/Tochka.JsonRpc.Server/Binding/JsonRpcParameterModelConvention.cs
@@ -44,7 +44,7 @@ public void Apply(ParameterModel parameter)
         foreach (var actionSelector in parameter.Action.Selectors)
         {
             var jsonSerializerOptions = ServerUtils.GetDataJsonSerializerOptions(actionSelector.EndpointMetadata, options, serializerOptionsProviders);
-            var propertyName = jsonSerializerOptions.PropertyNamingPolicy!.ConvertName(parameter.ParameterName);
+            var propertyName = jsonSerializerOptions.ConvertName(parameter.ParameterName);
             var parametersMetadata = actionSelector.EndpointMetadata.Get<JsonRpcActionParametersMetadata>();
             if (parametersMetadata == null)
             {

diff --git a/src/Tochka.JsonRpc.Server/Routing/JsonRpcActionModelConvention.cs b/src/Tochka.JsonRpc.Server/Routing/JsonRpcActionModelConvention.cs
@@ -75,8 +75,8 @@ private string GetMethodName(ActionModel action, SelectorModel selector)
         var methodStyleAttribute = selector.EndpointMetadata.Get<JsonRpcMethodStyleAttribute>();
         var methodStyle = methodStyleAttribute?.MethodStyle ?? options.DefaultMethodStyle;
 
-        var controllerName = jsonSerializerOptions.PropertyNamingPolicy!.ConvertName(action.Controller.ControllerName);
-        var actionName = jsonSerializerOptions.PropertyNamingPolicy.ConvertName(action.ActionName);
+        var controllerName = jsonSerializerOptions.ConvertName(action.Controller.ControllerName);
+        var actionName = jsonSerializerOptions.ConvertName(action.ActionName);
         return methodStyle switch
         {
             JsonRpcMethodStyle.ControllerAndAction => $"{controllerName}{JsonRpcConstants.ControllerMethodSeparator}{actionName}",

diff --git a/src/tests/Tochka.JsonRpc.OpenRpc.Tests/Services/OpenRpcDocumentGeneratorTests.cs b/src/tests/Tochka.JsonRpc.OpenRpc.Tests/Services/OpenRpcDocumentGeneratorTests.cs
@@ -1028,7 +1028,7 @@ private static void ValidMethod()
     {
     }
 
-    private class ValidJsonRpcController : JsonRpcControllerBase
+    private sealed class ValidJsonRpcController : JsonRpcControllerBase
     {
         public void ValidJsonRpcMethod()
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1028,7 +1028,7 @@ private static void ValidMethod() @@
         {
         }
-        private class ValidJsonRpcController : JsonRpcControllerBase
+        private sealed class ValidJsonRpcController : JsonRpcControllerBase
         {
             public void ValidJsonRpcMethod()
             {
@@ Expand Down @@