chore: another batch of NRT fixes

Signed-off-by: Vincent Biret <[email protected]>

Author: baywet

src/Microsoft.OpenApi.OData.Reader/Edm/ODataPath.cs

@@ -20,7 +20,7 @@ namespace Microsoft.OpenApi.OData.Edm
     public class ODataPath : IEnumerable<ODataSegment>, IComparable<ODataPath>
     {
         private ODataPathKind? _pathKind;
-        private string _defaultPathItemName;
+        private string? _defaultPathItemName;
 
         /// <summary>
         /// Initializes a new instance of <see cref="ODataPath"/> class.
@@ -54,7 +54,7 @@ public ODataPath(params ODataSegment[] segments)
         /// Gets/Sets the path template for this path.
         /// If it is set, it will be used to generate the path item.
         /// </summary>
-        public string PathTemplate { get; set; }
+        public string? PathTemplate { get; set; }
 
         /// <summary>
         /// Gets the segments.
@@ -80,12 +80,12 @@ public virtual ODataPathKind Kind
         /// <summary>
         /// Gets the first segment in the path. Returns null if the path is empty.
         /// </summary>
-        public ODataSegment FirstSegment => Segments.Count == 0 ? null : Segments[0];
+        public ODataSegment? FirstSegment => Segments is null || Segments.Count == 0 ? null : Segments[0];
 
         /// <summary>
         /// Get the last segment in the path. Returns null if the path is empty.
         /// </summary>
-        public ODataSegment LastSegment => Segments.Count == 0 ? null : this.Segments[Segments.Count - 1];
+        public ODataSegment? LastSegment => Segments is null || Segments.Count == 0 ? null : this.Segments[Segments.Count - 1];
 
         /// <summary>
         /// Get the number of segments in this path.
@@ -365,7 +365,7 @@ private ODataPathKind CalcPathType()
         /// </summary>
         /// <param name="settings">The settings.</param>
         ///<returns>The suffix.</returns>
-        public string GetPathHash(OpenApiConvertSettings settings) =>
-            LastSegment.GetPathHash(settings, this);
+        public string? GetPathHash(OpenApiConvertSettings settings) =>
+            LastSegment?.GetPathHash(settings, this);
     }
 }

src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs

@@ -113,8 +113,12 @@ protected override void SetExtensions(OpenApiOperation operation)
             base.SetExtensions(operation);
         }
 
-        internal string GetOperationId(string? prefix = null)
-        {            
+        internal string? GetOperationId(string? prefix = null)
+        {
+            if (Context is null || Path is null)
+            {
+                return null;
+            }
             return EdmModelHelper.GenerateNavigationPropertyPathOperationId(Path, Context, prefix);
         }               
 

src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs

@@ -371,14 +371,12 @@ protected override void SetParameters(OpenApiOperation operation)
 
 	protected override void SetSecurity(OpenApiOperation operation)
 	{
-		if (restriction == null || restriction.ReadRestrictions == null)
+		if (restriction is not {ReadRestrictions.Permissions: not null})
 		{
 			return;
 		}
 
-		ReadRestrictionsBase readBase = restriction.ReadRestrictions;
-
-		operation.Security = Context?.CreateSecurityRequirements(readBase.Permissions, _document).ToList();
+		operation.Security = Context?.CreateSecurityRequirements(restriction.ReadRestrictions.Permissions, _document).ToList();
 	}
 
 	protected override void SetExtensions(OpenApiOperation operation)

src/Microsoft.OpenApi.OData.Reader/PublicAPI.Unshipped.txt

@@ -47,17 +47,17 @@ Microsoft.OpenApi.OData.Edm.ODataPath
 Microsoft.OpenApi.OData.Edm.ODataPath.Clone() -> Microsoft.OpenApi.OData.Edm.ODataPath!
 Microsoft.OpenApi.OData.Edm.ODataPath.CompareTo(Microsoft.OpenApi.OData.Edm.ODataPath! other) -> int
 Microsoft.OpenApi.OData.Edm.ODataPath.Count.get -> int
-Microsoft.OpenApi.OData.Edm.ODataPath.FirstSegment.get -> Microsoft.OpenApi.OData.Edm.ODataSegment!
+Microsoft.OpenApi.OData.Edm.ODataPath.FirstSegment.get -> Microsoft.OpenApi.OData.Edm.ODataSegment?
 Microsoft.OpenApi.OData.Edm.ODataPath.GetCount(bool keySegmentAsDepth) -> int
 Microsoft.OpenApi.OData.Edm.ODataPath.GetEnumerator() -> System.Collections.Generic.IEnumerator<Microsoft.OpenApi.OData.Edm.ODataSegment!>!
-Microsoft.OpenApi.OData.Edm.ODataPath.GetPathHash(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings) -> string!
+Microsoft.OpenApi.OData.Edm.ODataPath.GetPathHash(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings) -> string?
 Microsoft.OpenApi.OData.Edm.ODataPath.GetPathItemName() -> string!
 Microsoft.OpenApi.OData.Edm.ODataPath.GetPathItemName(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings) -> string!
 Microsoft.OpenApi.OData.Edm.ODataPath.HttpMethods.get -> System.Collections.Generic.ISet<string!>!
-Microsoft.OpenApi.OData.Edm.ODataPath.LastSegment.get -> Microsoft.OpenApi.OData.Edm.ODataSegment!
+Microsoft.OpenApi.OData.Edm.ODataPath.LastSegment.get -> Microsoft.OpenApi.OData.Edm.ODataSegment?
 Microsoft.OpenApi.OData.Edm.ODataPath.ODataPath(params Microsoft.OpenApi.OData.Edm.ODataSegment![]! segments) -> void
 Microsoft.OpenApi.OData.Edm.ODataPath.ODataPath(System.Collections.Generic.IEnumerable<Microsoft.OpenApi.OData.Edm.ODataSegment!>! segments) -> void
-Microsoft.OpenApi.OData.Edm.ODataPath.PathTemplate.get -> string!
+Microsoft.OpenApi.OData.Edm.ODataPath.PathTemplate.get -> string?
 Microsoft.OpenApi.OData.Edm.ODataPath.PathTemplate.set -> void
 Microsoft.OpenApi.OData.Edm.ODataPath.Segments.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OData.Edm.ODataSegment!>!
 Microsoft.OpenApi.OData.Edm.ODataPathKind