chore: additional NRT fixes

baywet · baywet · commit 661b05a6141b · 2025-03-27T15:08:58.000-04:00
Signed-off-by: Vincent Biret &lt;vibiret@microsoft.com&gt;
diff --git a/src/Microsoft.OpenApi.OData.Reader/Common/CryptographyExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/Common/CryptographyExtensions.cs
@@ -22,7 +22,7 @@ public static string GetHashSHA256(this string input)
             Utils.CheckArgumentNull(input, nameof(input));
   
             var inputBytes = Encoding.UTF8.GetBytes(input);
-            var hashBytes = hasher.Value.ComputeHash(inputBytes);
+            if (hasher.Value?.ComputeHash(inputBytes) is not {} hashBytes) return string.Empty;
             var hash = new StringBuilder();
             foreach (var b in hashBytes)
             {
diff --git a/src/Microsoft.OpenApi.OData.Reader/Common/EdmModelHelper.cs b/src/Microsoft.OpenApi.OData.Reader/Common/EdmModelHelper.cs
@@ -95,9 +95,9 @@ internal static bool NavigationRestrictionsAllowsNavigability(
             {
                 items[lastItemIndex] = prefix + Utils.UpperFirstChar(items[lastItemIndex]);
             }
-            else
+            else if (Utils.UpperFirstChar(items[lastItemIndex]) is string lastIdentifier)
             {
-                items[lastItemIndex] = Utils.UpperFirstChar(items[lastItemIndex]);
+                items[lastItemIndex] = lastIdentifier;
             }
 
             return GenerateNavigationPropertyPathOperationId(items);
@@ -122,9 +122,9 @@ internal static bool NavigationRestrictionsAllowsNavigability(
                 {
                     items.Add(prefix + Utils.UpperFirstChar(lastSegmentIdentifier));
                 }
-                else
+                else if (Utils.UpperFirstChar(lastSegmentIdentifier) is string lastIdentifier)
                 {
-                    items.Add(Utils.UpperFirstChar(lastSegmentIdentifier));
+                    items.Add(lastIdentifier);
                 }
 
             return GenerateNavigationPropertyPathOperationId(items);
@@ -327,7 +327,7 @@ internal static string GenerateComplexPropertyPathTagName(ODataPath path, ODataC
 
             List<string> tagNameItems = tagName?.Split('.').ToList() ?? [];
             
-            if (tagNameItems.Count < context.Settings.TagDepth)
+            if (tagNameItems.Count < context.Settings.TagDepth && complexSegment.ComplexType is not null)
             {
                 tagNameItems.Add(complexSegment.ComplexType.Name);
             }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs b/src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs
@@ -45,7 +45,7 @@ public static class Utils
         /// </summary>
         /// <param name="input">The input string.</param>
         /// <returns>The changed string.</returns>
-        public static string? UpperFirstChar(string input)
+        public static string? UpperFirstChar(string? input)
         {
             if (input == null)
             {
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/EdmAnnotationExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/EdmAnnotationExtensions.cs
@@ -128,8 +128,7 @@ internal static class EdmVocabularyAnnotationExtensions
         public static T? GetRecord<T>(this IEdmModel model, IEdmVocabularyAnnotatable target)
             where T : class, IRecord, new()
         {
-            string qualifiedName = Utils.GetTermQualifiedName<T>();
-            return model.GetRecord<T>(target, qualifiedName);
+            return Utils.GetTermQualifiedName<T>() is string qualifiedName ? model.GetRecord<T>(target, qualifiedName) : null;
         }
 
         /// <summary>
@@ -243,8 +242,7 @@ internal static class EdmVocabularyAnnotationExtensions
         public static IEnumerable<T>? GetCollection<T>(this IEdmModel model, IEdmVocabularyAnnotatable target)
             where T : IRecord, new()
         {
-            string qualifiedName = Utils.GetTermQualifiedName<T>();
-            return GetCollection<T>(model, target, qualifiedName);
+            return Utils.GetTermQualifiedName<T>() is string qualifiedName ? GetCollection<T>(model, target, qualifiedName) : null;
         }
 
         /// <summary>
@@ -349,9 +347,8 @@ internal static class EdmVocabularyAnnotationExtensions
                                 Debug.Assert(e.ExpressionKind == EdmExpressionKind.Record);
 
                                 IEdmRecordExpression recordExpression = (IEdmRecordExpression)e;
-                                Authorization auth = Authorization.CreateAuthorization(recordExpression);
-                                return auth;
-                            });
+                                return Authorization.CreateAuthorization(recordExpression);
+                            }).OfType<Authorization>();
                         }
                     }
                 }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
@@ -109,7 +109,7 @@ public static Dictionary<IEdmEntityType, IList<IEdmNavigationSource>> LoadAllNav
         /// </summary>
         /// <param name="entityType">The given entity type.</param>
         /// <returns>All base types or null.</returns>
-        public static IEnumerable<IEdmEntityType>? FindAllBaseTypes(this IEdmEntityType entityType)
+        public static IEnumerable<IEdmEntityType> FindAllBaseTypes(this IEdmEntityType entityType)
         {
             if (entityType == null)
             {
@@ -129,7 +129,7 @@ public static Dictionary<IEdmEntityType, IList<IEdmNavigationSource>> LoadAllNav
         /// </summary>
         /// <param name="complexType">The given complex type.</param>
         /// <returns>All base types or null.</returns>
-        public static IEnumerable<IEdmComplexType>? FindAllBaseTypes(this IEdmComplexType complexType)
+        public static IEnumerable<IEdmComplexType> FindAllBaseTypes(this IEdmComplexType complexType)
         {
             if (complexType == null)
             {
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataNavigationPropertySegment.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataNavigationPropertySegment.cs
@@ -42,7 +42,7 @@ public ODataNavigationPropertySegment(IEdmNavigationProperty navigationProperty)
         /// <inheritdoc />
 		public override IEnumerable<IEdmVocabularyAnnotatable> GetAnnotables()
 		{
-			return new IEdmVocabularyAnnotatable[] { NavigationProperty, EntityType }.Union(EntityType.FindAllBaseTypes());
+			return new IEdmVocabularyAnnotatable[] { NavigationProperty, EntityType }.Union(EntityType.FindAllBaseTypes() ?? []);
 		}
 
 		/// <inheritdoc />
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataRefSegment.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataRefSegment.cs
@@ -28,7 +28,7 @@ private ODataRefSegment()
         }
 
         /// <inheritdoc />
-        public override IEdmEntityType EntityType => null;
+        public override IEdmEntityType? EntityType => null;
 
         /// <inheritdoc />
         public override ODataSegmentKind Kind => ODataSegmentKind.Ref;
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataStreamContentSegment.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataStreamContentSegment.cs
@@ -16,7 +16,7 @@ namespace Microsoft.OpenApi.OData.Edm
     public class ODataStreamContentSegment : ODataSegment
     {
         /// <inheritdoc />
-        public override IEdmEntityType EntityType => null;
+        public override IEdmEntityType? EntityType => null;
         /// <inheritdoc />
         public override ODataSegmentKind Kind => ODataSegmentKind.StreamContent;
 
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataStreamPropertySegment.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataStreamPropertySegment.cs
@@ -26,7 +26,7 @@ public ODataStreamPropertySegment(string streamPropertyName)
         }
 
         /// <inheritdoc />
-        public override IEdmEntityType EntityType => null;
+        public override IEdmEntityType? EntityType => null;
 
         /// <inheritdoc />
         public override ODataSegmentKind Kind => ODataSegmentKind.StreamProperty;
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSecurityRequirementGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSecurityRequirementGenerator.cs
@@ -8,7 +8,6 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
 using Microsoft.OpenApi.OData.Edm;
-using Microsoft.OpenApi.OData.Vocabulary.Authorization;
 using Microsoft.OpenApi.OData.Vocabulary.Capabilities;
 using Microsoft.OpenApi.Models.References;
 
@@ -36,12 +35,16 @@ public static IEnumerable<OpenApiSecurityRequirement> CreateSecurityRequirements
             {
                 foreach (PermissionType permission in permissions)
                 {
+                    if (string.IsNullOrEmpty(permission.SchemeName))
+                    {
+                        continue;
+                    }
                     yield return new OpenApiSecurityRequirement
                     {
                         [
                             new OpenApiSecuritySchemeReference(permission.SchemeName, document)
-                        ] = new List<string>(permission.Scopes?.Select(c => c.Scope) ?? new List<string>())
-                    };
+                        ] = [.. permission.Scopes?.Select(c => c.Scope).OfType<string>() ?? []]
+					};
                 }
             }
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSecuritySchemeGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSecuritySchemeGenerator.cs
@@ -130,8 +130,8 @@ private static void AppendOAuth2(OpenApiSecurityScheme scheme, OAuthAuthorizatio
                     scheme.Flows.AuthorizationCode = flow;
                     break;
 
-                case OAuth2Type.Password: // Password
-                    OAuth2Password password = (OAuth2Password)oAuth2;
+                case OAuth2Type.Password when oAuth2 is OAuth2Password { TokenUrl: not null} password:
+                    // Password
                     flow = new OpenApiOAuthFlow
                     {
                         TokenUrl = new Uri(password.TokenUrl)
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiTagGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiTagGenerator.cs
@@ -66,15 +66,15 @@ public static ISet<OpenApiTag> CreateTags(this ODataContext context)
                         // The tags array can contain additional Tag Objects for other logical groups,
                         // e.g. for action imports or function imports that are not associated with an entity set.
                         case EdmContainerElementKind.ActionImport: // Action Import
-                            OpenApiTag actionImportTag = context.CreateOperationImportTag((IEdmActionImport)element);
+                            var actionImportTag = context.CreateOperationImportTag((IEdmActionImport)element);
                             if (actionImportTag != null)
                             {
                                 tags.Add(actionImportTag);
                             }
                             break;
 
                         case EdmContainerElementKind.FunctionImport: // Function Import
-                            OpenApiTag functionImportTag = context.CreateOperationImportTag((IEdmFunctionImport)element);
+                            var functionImportTag = context.CreateOperationImportTag((IEdmFunctionImport)element);
                             if (functionImportTag != null)
                             {
                                 tags.Add(functionImportTag);
@@ -87,7 +87,7 @@ public static ISet<OpenApiTag> CreateTags(this ODataContext context)
             return tags;
         }
 
-        private static OpenApiTag CreateOperationImportTag(this ODataContext context, IEdmOperationImport operationImport)
+        private static OpenApiTag? CreateOperationImportTag(this ODataContext context, IEdmOperationImport operationImport)
         {
             Debug.Assert(context != null);
 
diff --git a/src/Microsoft.OpenApi.OData.Reader/OData/IEdmExpressionExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/OData/IEdmExpressionExtensions.cs
@@ -21,7 +21,7 @@ internal static class IEdmExpressionExtensions
         /// </summary>
         /// <param name="expression">The <see cref="IEdmExpression"/>.</param>
         /// <returns>The null or <see cref="ODataValue"/>.</returns>
-        public static ODataValue Convert(this IEdmExpression expression)
+        public static ODataValue? Convert(this IEdmExpression expression)
         {
             if (expression == null)
             {
@@ -112,7 +112,7 @@ public static ODataValue Convert(this IEdmExpression expression)
                     return new ODataResourceValue
                     {
                         TypeReference = recordExpression.DeclaredType,
-                        Properties = recordExpression.Properties.ToDictionary(p => p.Name, p => p.Value.Convert())
+                        Properties = recordExpression.Properties.Select(p => (p.Name, p.Value.Convert())).Where(p => p.Item2 is not null).ToDictionary(p => p.Item1, p => p.Item2!)
                     };
 
                 case EdmExpressionKind.Collection:
@@ -122,7 +122,7 @@ public static ODataValue Convert(this IEdmExpression expression)
                         TypeReference = collectionExpression.DeclaredType
                     };
 
-                    collectionValue.Elements = collectionExpression.Elements.Select(e => e.Convert()).ToList();
+                    collectionValue.Elements = collectionExpression.Elements.Select(e => e.Convert()).OfType<ODataValue>().ToList();
                     return collectionValue;
 
                 case EdmExpressionKind.Path:
diff --git a/src/Microsoft.OpenApi.OData.Reader/OData/ODataCollectValue.cs b/src/Microsoft.OpenApi.OData.Reader/OData/ODataCollectValue.cs
@@ -12,6 +12,6 @@ namespace Microsoft.OpenApi.OData
     /// </summary>
     internal class ODataCollectValue : ODataValue
     {
-        public IList<ODataValue> Elements { get; set; }
+        public IList<ODataValue>? Elements { get; set; }
     }
 }
diff --git a/src/Microsoft.OpenApi.OData.Reader/OData/ODataPrimitiveValue.cs b/src/Microsoft.OpenApi.OData.Reader/OData/ODataPrimitiveValue.cs
@@ -20,7 +20,7 @@ public ODataPrimitiveValue(object value)
         /// </summary>
         public object Value { get; private set; }
 
-        public override string ToString()
+        public override string? ToString()
         {
             return Value.ToString();
         }
diff --git a/src/Microsoft.OpenApi.OData.Reader/PathItem/MediaEntityPathItemHandler.cs b/src/Microsoft.OpenApi.OData.Reader/PathItem/MediaEntityPathItemHandler.cs
@@ -40,10 +40,10 @@ public MediaEntityPathItemHandler(OpenApiDocument document) : base(document)
         /// <inheritdoc/>
         protected override void SetOperations(OpenApiPathItem item)
         {
-            var readRestrictions = Context?.Model.GetRecord<ReadRestrictionsType>(TargetPath, CapabilitiesConstants.ReadRestrictions);
+            var readRestrictions = string.IsNullOrEmpty(TargetPath) ? null :Context?.Model.GetRecord<ReadRestrictionsType>(TargetPath, CapabilitiesConstants.ReadRestrictions);
             var navSourceReadRestrictions = EntitySet != null
-                ? Context.Model.GetRecord<ReadRestrictionsType>(EntitySet)
-                : (Singleton is null ? null : Context.Model.GetRecord<ReadRestrictionsType>(Singleton));
+                ? Context?.Model.GetRecord<ReadRestrictionsType>(EntitySet)
+                : (Singleton is null ? null : Context?.Model.GetRecord<ReadRestrictionsType>(Singleton));
             readRestrictions ??= navSourceReadRestrictions;
             if (readRestrictions == null ||
                (readRestrictions.ReadByKeyRestrictions == null && readRestrictions.IsReadable) ||
@@ -52,20 +52,20 @@ protected override void SetOperations(OpenApiPathItem item)
                 AddOperation(item, HttpMethod.Get);
             }
 
-            var updateRestrictions = Context.Model.GetRecord<UpdateRestrictionsType>(TargetPath, CapabilitiesConstants.UpdateRestrictions);
+            var updateRestrictions = string.IsNullOrEmpty(TargetPath) ? null :Context?.Model.GetRecord<UpdateRestrictionsType>(TargetPath, CapabilitiesConstants.UpdateRestrictions);
             var navSourceUpdateRestrictions = EntitySet != null
-                ? Context.Model.GetRecord<UpdateRestrictionsType>(EntitySet)
-                : (Singleton is null ? null : Context.Model.GetRecord<UpdateRestrictionsType>(Singleton));
+                ? Context?.Model.GetRecord<UpdateRestrictionsType>(EntitySet)
+                : (Singleton is null ? null : Context?.Model.GetRecord<UpdateRestrictionsType>(Singleton));
             updateRestrictions ??= navSourceUpdateRestrictions;
             if (updateRestrictions?.IsUpdatable ?? true)
             {
                 AddOperation(item, HttpMethod.Put);
             }
 
-            var deleteRestrictions = Context.Model.GetRecord<DeleteRestrictionsType>(TargetPath, CapabilitiesConstants.DeleteRestrictions);
+            var deleteRestrictions = string.IsNullOrEmpty(TargetPath) ? null :Context?.Model.GetRecord<DeleteRestrictionsType>(TargetPath, CapabilitiesConstants.DeleteRestrictions);
             var navSourceDeleteRestrictions = EntitySet != null
-                ? Context.Model.GetRecord<DeleteRestrictionsType>(EntitySet)
-                : (Singleton is null ? null : Context.Model.GetRecord<DeleteRestrictionsType>(Singleton));
+                ? Context?.Model.GetRecord<DeleteRestrictionsType>(EntitySet)
+                : (Singleton is null ? null : Context?.Model.GetRecord<DeleteRestrictionsType>(Singleton));
             deleteRestrictions ??= navSourceDeleteRestrictions;
             if (deleteRestrictions?.IsDeletable ?? true)
             {
diff --git a/src/Microsoft.OpenApi.OData.Reader/PublicAPI.Unshipped.txt b/src/Microsoft.OpenApi.OData.Reader/PublicAPI.Unshipped.txt
@@ -272,17 +272,17 @@ override Microsoft.OpenApi.OData.Edm.ODataOperationSegment.GetPathItemName(Micro
 override Microsoft.OpenApi.OData.Edm.ODataOperationSegment.Identifier.get -> string?
 override Microsoft.OpenApi.OData.Edm.ODataOperationSegment.Kind.get -> Microsoft.OpenApi.OData.Edm.ODataSegmentKind
 override Microsoft.OpenApi.OData.Edm.ODataPath.ToString() -> string!
-override Microsoft.OpenApi.OData.Edm.ODataRefSegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType!
+override Microsoft.OpenApi.OData.Edm.ODataRefSegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType?
 override Microsoft.OpenApi.OData.Edm.ODataRefSegment.GetAnnotables() -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable!>!
 override Microsoft.OpenApi.OData.Edm.ODataRefSegment.GetPathItemName(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings, System.Collections.Generic.HashSet<string!>! parameters) -> string!
 override Microsoft.OpenApi.OData.Edm.ODataRefSegment.Identifier.get -> string!
 override Microsoft.OpenApi.OData.Edm.ODataRefSegment.Kind.get -> Microsoft.OpenApi.OData.Edm.ODataSegmentKind
-override Microsoft.OpenApi.OData.Edm.ODataStreamContentSegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType!
+override Microsoft.OpenApi.OData.Edm.ODataStreamContentSegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType?
 override Microsoft.OpenApi.OData.Edm.ODataStreamContentSegment.GetAnnotables() -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable!>!
 override Microsoft.OpenApi.OData.Edm.ODataStreamContentSegment.GetPathItemName(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings, System.Collections.Generic.HashSet<string!>! parameters) -> string!
 override Microsoft.OpenApi.OData.Edm.ODataStreamContentSegment.Identifier.get -> string!
 override Microsoft.OpenApi.OData.Edm.ODataStreamContentSegment.Kind.get -> Microsoft.OpenApi.OData.Edm.ODataSegmentKind
-override Microsoft.OpenApi.OData.Edm.ODataStreamPropertySegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType!
+override Microsoft.OpenApi.OData.Edm.ODataStreamPropertySegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType?
 override Microsoft.OpenApi.OData.Edm.ODataStreamPropertySegment.GetAnnotables() -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable!>!
 override Microsoft.OpenApi.OData.Edm.ODataStreamPropertySegment.GetPathItemName(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings, System.Collections.Generic.HashSet<string!>! parameters) -> string!
 override Microsoft.OpenApi.OData.Edm.ODataStreamPropertySegment.Identifier.get -> string!
@@ -294,9 +294,9 @@ override Microsoft.OpenApi.OData.Edm.ODataTypeCastSegment.Identifier.get -> stri
 override Microsoft.OpenApi.OData.Edm.ODataTypeCastSegment.Kind.get -> Microsoft.OpenApi.OData.Edm.ODataSegmentKind
 static Microsoft.OpenApi.OData.Common.Utils.GetTermQualifiedName<T>() -> string?
 static Microsoft.OpenApi.OData.Common.Utils.GetUniqueName(string! input, System.Collections.Generic.HashSet<string!>! set) -> string!
-static Microsoft.OpenApi.OData.Common.Utils.UpperFirstChar(string! input) -> string?
-static Microsoft.OpenApi.OData.Edm.EdmModelExtensions.FindAllBaseTypes(this Microsoft.OData.Edm.IEdmComplexType! complexType) -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.IEdmComplexType!>?
-static Microsoft.OpenApi.OData.Edm.EdmModelExtensions.FindAllBaseTypes(this Microsoft.OData.Edm.IEdmEntityType! entityType) -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.IEdmEntityType!>?
+static Microsoft.OpenApi.OData.Common.Utils.UpperFirstChar(string? input) -> string?
+static Microsoft.OpenApi.OData.Edm.EdmModelExtensions.FindAllBaseTypes(this Microsoft.OData.Edm.IEdmComplexType! complexType) -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.IEdmComplexType!>!
+static Microsoft.OpenApi.OData.Edm.EdmModelExtensions.FindAllBaseTypes(this Microsoft.OData.Edm.IEdmEntityType! entityType) -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.IEdmEntityType!>!
 static Microsoft.OpenApi.OData.Edm.EdmModelExtensions.GetAllElements(this Microsoft.OData.Edm.IEdmModel! model) -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.IEdmSchemaElement!>!
 static Microsoft.OpenApi.OData.Edm.EdmModelExtensions.IsOperationImportOverload(this Microsoft.OData.Edm.IEdmModel! model, Microsoft.OData.Edm.IEdmOperationImport! operationImport) -> bool
 static Microsoft.OpenApi.OData.Edm.EdmModelExtensions.IsOperationOverload(this Microsoft.OData.Edm.IEdmModel! model, Microsoft.OData.Edm.IEdmOperation! operation) -> bool

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static string GetHashSHA256(this string input)`
`22`	`22`	`Utils.CheckArgumentNull(input, nameof(input));`
`23`	`23`
`24`	`24`	`var inputBytes = Encoding.UTF8.GetBytes(input);`
`25`		`- var hashBytes = hasher.Value.ComputeHash(inputBytes);`
	`25`	`+ if (hasher.Value?.ComputeHash(inputBytes) is not {} hashBytes) return string.Empty;`
`26`	`26`	`var hash = new StringBuilder();`
`27`	`27`	`foreach (var b in hashBytes)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,9 @@ internal static bool NavigationRestrictionsAllowsNavigability(`
`95`	`95`	`{`
`96`	`96`	`items[lastItemIndex] = prefix + Utils.UpperFirstChar(items[lastItemIndex]);`
`97`	`97`	`}`
`98`		`- else`
	`98`	`+ else if (Utils.UpperFirstChar(items[lastItemIndex]) is string lastIdentifier)`
`99`	`99`	`{`
`100`		`- items[lastItemIndex] = Utils.UpperFirstChar(items[lastItemIndex]);`
	`100`	`+ items[lastItemIndex] = lastIdentifier;`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`return GenerateNavigationPropertyPathOperationId(items);`
`@@ -122,9 +122,9 @@ internal static bool NavigationRestrictionsAllowsNavigability(`
`122`	`122`	`{`
`123`	`123`	`items.Add(prefix + Utils.UpperFirstChar(lastSegmentIdentifier));`
`124`	`124`	`}`
`125`		`- else`
	`125`	`+ else if (Utils.UpperFirstChar(lastSegmentIdentifier) is string lastIdentifier)`
`126`	`126`	`{`
`127`		`- items.Add(Utils.UpperFirstChar(lastSegmentIdentifier));`
	`127`	`+ items.Add(lastIdentifier);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`return GenerateNavigationPropertyPathOperationId(items);`
`@@ -327,7 +327,7 @@ internal static string GenerateComplexPropertyPathTagName(ODataPath path, ODataC`
`327`	`327`
`328`	`328`	`List<string> tagNameItems = tagName?.Split('.').ToList() ?? [];`
`329`	`329`
`330`		`- if (tagNameItems.Count < context.Settings.TagDepth)`
	`330`	`+ if (tagNameItems.Count < context.Settings.TagDepth && complexSegment.ComplexType is not null)`
`331`	`331`	`{`
`332`	`332`	`tagNameItems.Add(complexSegment.ComplexType.Name);`
`333`	`333`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static class Utils`
`45`	`45`	`/// </summary>`
`46`	`46`	`/// <param name="input">The input string.</param>`
`47`	`47`	`/// <returns>The changed string.</returns>`
`48`		`- public static string? UpperFirstChar(string input)`
	`48`	`+ public static string? UpperFirstChar(string? input)`
`49`	`49`	`{`
`50`	`50`	`if (input == null)`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,7 @@ internal static class EdmVocabularyAnnotationExtensions`
`128`	`128`	`public static T? GetRecord<T>(this IEdmModel model, IEdmVocabularyAnnotatable target)`
`129`	`129`	`where T : class, IRecord, new()`
`130`	`130`	`{`
`131`		`- string qualifiedName = Utils.GetTermQualifiedName<T>();`
`132`		`- return model.GetRecord<T>(target, qualifiedName);`
	`131`	`+ return Utils.GetTermQualifiedName<T>() is string qualifiedName ? model.GetRecord<T>(target, qualifiedName) : null;`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`/// <summary>`
`@@ -243,8 +242,7 @@ internal static class EdmVocabularyAnnotationExtensions`
`243`	`242`	`public static IEnumerable<T>? GetCollection<T>(this IEdmModel model, IEdmVocabularyAnnotatable target)`
`244`	`243`	`where T : IRecord, new()`
`245`	`244`	`{`
`246`		`- string qualifiedName = Utils.GetTermQualifiedName<T>();`
`247`		`- return GetCollection<T>(model, target, qualifiedName);`
	`245`	`+ return Utils.GetTermQualifiedName<T>() is string qualifiedName ? GetCollection<T>(model, target, qualifiedName) : null;`
`248`	`246`	`}`
`249`	`247`
`250`	`248`	`/// <summary>`
`@@ -349,9 +347,8 @@ internal static class EdmVocabularyAnnotationExtensions`
`349`	`347`	`Debug.Assert(e.ExpressionKind == EdmExpressionKind.Record);`
`350`	`348`
`351`	`349`	`IEdmRecordExpression recordExpression = (IEdmRecordExpression)e;`
`352`		`- Authorization auth = Authorization.CreateAuthorization(recordExpression);`
`353`		`- return auth;`
`354`		`- });`
	`350`	`+ return Authorization.CreateAuthorization(recordExpression);`
	`351`	`+ }).OfType<Authorization>();`
`355`	`352`	`}`
`356`	`353`	`}`
`357`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public static Dictionary<IEdmEntityType, IList<IEdmNavigationSource>> LoadAllNav`
`109`	`109`	`/// </summary>`
`110`	`110`	`/// <param name="entityType">The given entity type.</param>`
`111`	`111`	`/// <returns>All base types or null.</returns>`
`112`		`- public static IEnumerable<IEdmEntityType>? FindAllBaseTypes(this IEdmEntityType entityType)`
	`112`	`+ public static IEnumerable<IEdmEntityType> FindAllBaseTypes(this IEdmEntityType entityType)`
`113`	`113`	`{`
`114`	`114`	`if (entityType == null)`
`115`	`115`	`{`
`@@ -129,7 +129,7 @@ public static Dictionary<IEdmEntityType, IList<IEdmNavigationSource>> LoadAllNav`
`129`	`129`	`/// </summary>`
`130`	`130`	`/// <param name="complexType">The given complex type.</param>`
`131`	`131`	`/// <returns>All base types or null.</returns>`
`132`		`- public static IEnumerable<IEdmComplexType>? FindAllBaseTypes(this IEdmComplexType complexType)`
	`132`	`+ public static IEnumerable<IEdmComplexType> FindAllBaseTypes(this IEdmComplexType complexType)`
`133`	`133`	`{`
`134`	`134`	`if (complexType == null)`
`135`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public ODataNavigationPropertySegment(IEdmNavigationProperty navigationProperty)`
`42`	`42`	`/// <inheritdoc />`
`43`	`43`	`public override IEnumerable<IEdmVocabularyAnnotatable> GetAnnotables()`
`44`	`44`	`{`
`45`		`- return new IEdmVocabularyAnnotatable[] { NavigationProperty, EntityType }.Union(EntityType.FindAllBaseTypes());`
	`45`	`+ return new IEdmVocabularyAnnotatable[] { NavigationProperty, EntityType }.Union(EntityType.FindAllBaseTypes() ?? []);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/// <inheritdoc />`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ private ODataRefSegment()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/// <inheritdoc />`
`31`		`- public override IEdmEntityType EntityType => null;`
	`31`	`+ public override IEdmEntityType? EntityType => null;`
`32`	`32`
`33`	`33`	`/// <inheritdoc />`
`34`	`34`	`public override ODataSegmentKind Kind => ODataSegmentKind.Ref;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace Microsoft.OpenApi.OData.Edm`
`16`	`16`	`public class ODataStreamContentSegment : ODataSegment`
`17`	`17`	`{`
`18`	`18`	`/// <inheritdoc />`
`19`		`- public override IEdmEntityType EntityType => null;`
	`19`	`+ public override IEdmEntityType? EntityType => null;`
`20`	`20`	`/// <inheritdoc />`
`21`	`21`	`public override ODataSegmentKind Kind => ODataSegmentKind.StreamContent;`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public ODataStreamPropertySegment(string streamPropertyName)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/// <inheritdoc />`
`29`		`- public override IEdmEntityType EntityType => null;`
	`29`	`+ public override IEdmEntityType? EntityType => null;`
`30`	`30`
`31`	`31`	`/// <inheritdoc />`
`32`	`32`	`public override ODataSegmentKind Kind => ODataSegmentKind.StreamProperty;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using Microsoft.OpenApi.Models;`
`9`	`9`	`using Microsoft.OpenApi.OData.Common;`
`10`	`10`	`using Microsoft.OpenApi.OData.Edm;`
`11`		`-using Microsoft.OpenApi.OData.Vocabulary.Authorization;`
`12`	`11`	`using Microsoft.OpenApi.OData.Vocabulary.Capabilities;`
`13`	`12`	`using Microsoft.OpenApi.Models.References;`
`14`	`13`
`@@ -36,12 +35,16 @@ public static IEnumerable<OpenApiSecurityRequirement> CreateSecurityRequirements`
`36`	`35`	`{`
`37`	`36`	`foreach (PermissionType permission in permissions)`
`38`	`37`	`{`
	`38`	`+ if (string.IsNullOrEmpty(permission.SchemeName))`
	`39`	`+ {`
	`40`	`+ continue;`
	`41`	`+ }`
`39`	`42`	`yield return new OpenApiSecurityRequirement`
`40`	`43`	`{`
`41`	`44`	`[`
`42`	`45`	`new OpenApiSecuritySchemeReference(permission.SchemeName, document)`
`43`		`- ] = new List<string>(permission.Scopes?.Select(c => c.Scope) ?? new List<string>())`
`44`		`- };`
	`46`	`+ ] = [.. permission.Scopes?.Select(c => c.Scope).OfType<string>() ?? []]`
	`47`	`+ };`
`45`	`48`	`}`
`46`	`49`	`}`
`47`	`50`	`}`