More refactoring

Author: hhvrc

…/OpenApi/OpenApiSchemaReferenceIdUtil.cs Common/OpenApi/OpenApiSchemaUtils.csCommon/OpenApi/OpenApiSchemaReferenceIdUtil.cs renamed to Common/OpenApi/OpenApiSchemaUtils.cs Common/OpenApi/OpenApiSchemaReferenceIdUtil.cs renamed to Common/OpenApi/OpenApiSchemaUtils.cs

@@ -1,9 +1,10 @@
-using OpenShock.Common.Models;
+using Microsoft.AspNetCore.OpenApi;
+using OpenShock.Common.Models;
 using System.Text.Json.Serialization.Metadata;
 
 namespace OpenShock.Common.OpenApi;
 
-public static class OpenApiSchemaReferenceIdUtil
+public static class OpenApiSchemaUtils
 {
     private static readonly HashSet<Type> CollectionTypes =
     [
@@ -67,7 +68,7 @@ private static bool IsSystemType(Type type)
         return type.Name + suffix;
     }
 
-    public static string? GetFriendlyName(Type type)
+    private static string? GetFriendlyName(Type type)
     {
         if (IsSystemType(type)) return null;
 
@@ -76,8 +77,13 @@ private static bool IsSystemType(Type type)
 
         return type.Name;
     }
-    public static string? GetFriendlyName(JsonTypeInfo jsonTypeInfo)
+    
+
+    public static void ConfigureOptions(OpenApiOptions options)
     {
-        return GetFriendlyName(jsonTypeInfo.Type);
+        options.CreateSchemaReferenceId = (jsonTypeInfo) => GetFriendlyName(jsonTypeInfo.Type);
+
+        options.AddDocumentTransformer<OpenApiDocumentTransformer>();
+        options.AddOperationTransformer<OpenApiOperationTransformer>();
     }
 }

Common/OpenShockServiceHelper.cs

@@ -119,20 +119,8 @@ public static IServiceCollection AddOpenShockServices(this IServiceCollection se
             x.JsonSerializerOptions.Converters.Add(new CustomJsonStringEnumConverter());
         });
 
-        services.AddOpenApi("1", options =>
-        {
-            options.CreateSchemaReferenceId = OpenApiSchemaReferenceIdUtil.GetFriendlyName;
-
-            options.AddDocumentTransformer<OpenApiDocumentTransformer>();
-            options.AddOperationTransformer<OpenApiOperationTransformer>();
-        });
-        services.AddOpenApi("2", options =>
-        {
-            options.CreateSchemaReferenceId = OpenApiSchemaReferenceIdUtil.GetFriendlyName;
-
-            options.AddDocumentTransformer<OpenApiDocumentTransformer>();
-            options.AddOperationTransformer<OpenApiOperationTransformer>();
-        });
+        services.AddOpenApi("1", OpenApiSchemaUtils.ConfigureOptions);
+        services.AddOpenApi("2", OpenApiSchemaUtils.ConfigureOptions);
 
         var apiVersioningBuilder = services.AddApiVersioning(options =>
         {