Handle null objects in validation helpers.

microsoft · Dec 5, 2023 · 1626b7e · 1626b7e
1 parent fdc2a7e
commit 1626b7e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/lib/Helpers/ValidationHelpers.cs b/src/lib/Helpers/ValidationHelpers.cs
@@ -32,17 +32,17 @@ internal static void ValidateBaseUrl(string parameterName, string? baseUrl)
                 throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, ErrorMessage.BaseUrlIsNotValid, nameof(baseUrl)), parameterName);
         }
 
+        internal static void ThrowIfNull(object? obj, string? paramName = null)
+        {
+            if (obj == null)
+                throw new ArgumentNullException(paramName);
+        }
+
         private static readonly Regex s_emailRegex = new(@"^[^@\s]+@[^@\s]+$", RegexOptions.Compiled, Constants.DefaultRegexTimeout);
         private static void ValidateEmail(string parameterName, string value)
         {
             if (!s_emailRegex.IsMatch(value))
                 throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, ErrorMessage.FieldIsNotValid, parameterName), parameterName);
         }
-
-        public static void ThrowIfNull<T>(T obj, string paramName)
-        {
-            if (obj == null)
-                throw new ArgumentNullException(paramName);
-        }
     }
 }
diff --git a/src/lib/TypeExtensions/ApiManifestDocumentExtensions.cs b/src/lib/TypeExtensions/ApiManifestDocumentExtensions.cs
@@ -32,8 +32,10 @@ public static async Task<OpenAIPluginManifest> ToOpenAIPluginManifestAsync(this
             }
             else
             {
-                var result = await ParsingHelpers.ParseOpenApiAsync(new Uri(apiDependency!.ApiDescriptionUrl), false, cancellationToken).ConfigureAwait(false);
-                return apiManifestDocument.ToOpenAIPluginManifest(result.OpenApiDocument, logoUrl, legalInfoUrl, openApiPath ?? apiDependency.ApiDescriptionUrl!);
+                var result = await ParsingHelpers.ParseOpenApiAsync(new Uri(apiDependency?.ApiDescriptionUrl), false, cancellationToken).ConfigureAwait(false);
+                if (string.IsNullOrWhiteSpace(openApiPath))
+                    openApiPath = apiDependency?.ApiDescriptionUrl;
+                return apiManifestDocument.ToOpenAIPluginManifest(result.OpenApiDocument, logoUrl, legalInfoUrl, openApiPath!);
             }
         }
 

diff --git a/src/lib/apimanifest.csproj b/src/lib/apimanifest.csproj
@@ -13,7 +13,7 @@
     <Company>Microsoft</Company>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-	<LangVersion>10</LangVersion>
+    <LangVersion>10</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <SignAssembly>True</SignAssembly>