Changeset 466 for TFP-WebServer

Timestamp:

Aug 17, 2023, 5:49:38 PM (17 months ago)

Author:

alloc

Message:

Cleanup in OpenApiHelpers

File:

• TFP-WebServer/WebServer/src/WebAPI/OpenApiHelpers.cs (modified) (2 diffs)

TFP-WebServer/WebServer/src/WebAPI/OpenApiHelpers.cs

@@ +1 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
@@ -79 +80 @@
 
                 public void LoadOpenApiSpec (AbsWebAPI _api) {
-                        Assembly apiAssembly = _api.GetType ().Assembly;
-                        string apiName = _api.Name;
-                        string apiSpecName = $"{apiName}.openapi.yaml";
-
-                        string specText = ResourceHelpers.GetManifestResourceText (apiAssembly, apiSpecName, true);
+                        loadOpenApiSpec (_api.GetType ().Assembly, _api.Name, null);
+                }
+
+                public void LoadOpenApiSpec (AbsHandler _pathHandler) {
+                        Type type = _pathHandler.GetType ();
+                        loadOpenApiSpec (type.Assembly, type.Name, _pathHandler.UrlBasePath);
+                }
+
+                public void RegisterCustomSpec (Assembly _assembly, string _apiSpecName, string _replaceBasePath = null) {
+                        loadOpenApiSpec (_assembly, _apiSpecName, _replaceBasePath);
+                }
+
+                private void loadOpenApiSpec (Assembly _containingAssembly, string _apiName, string _basePath) {
+                        string apiSpecName = $"{_apiName}.openapi.yaml";
+
+                        string specText = ResourceHelpers.GetManifestResourceText (_containingAssembly, apiSpecName, true);
                         if (specText == null) {
                                 return;
                         }
 
-                        // Log.Out ($"[Web] Loaded OpenAPI spec for '{apiName}'");
-                        OpenApiSpec spec = new OpenApiSpec (specText, findExportedPaths (specText));
-                        specs.Add (apiSpecName, spec);
-                }
-
-                public void LoadOpenApiSpec (AbsHandler _pathHandler) {
-                        Assembly apiAssembly = _pathHandler.GetType ().Assembly;
-                        string apiName = _pathHandler.GetType ().Name;
-                        string apiSpecName = $"{apiName}.openapi.yaml";
-
-                        string specText = ResourceHelpers.GetManifestResourceText (apiAssembly, apiSpecName, true);
-                        if (specText == null) {
-                                return;
-                        }
-
-                        // Log.Out ($"[Web] Loaded OpenAPI spec for '{apiName}'");
-                        OpenApiSpec spec = new OpenApiSpec (specText, findExportedPaths (specText, _pathHandler.UrlBasePath));
-                        specs.Add (apiSpecName, spec);
-                }
-
-                public void RegisterCustomSpec (Assembly _assembly, string _apiSpecName, string _replaceBasePath = null) {
-                        string apiSpecName = $"{_apiSpecName}.openapi.yaml";
-
-                        string specText = ResourceHelpers.GetManifestResourceText (_assembly, apiSpecName, true);
-                        if (specText == null) {
-                                return;
-                        }
-
-                        // Log.Out ($"[Web] Loaded OpenAPI spec for '{_apiSpecName}'");
-                        OpenApiSpec spec = new OpenApiSpec (specText, findExportedPaths (specText, _replaceBasePath));
+                        // Log.Out ($"[Web] Loaded OpenAPI spec for '{_apiName}'");
+                        OpenApiSpec spec = new OpenApiSpec (specText, findExportedPaths (specText, _basePath));
                         specs.Add (apiSpecName, spec);
                 }