chore: additional NRT fixes

baywet · baywet · commit b15301d9e528 · 2025-03-27T15:18:20.000-04:00
Signed-off-by: Vincent Biret &lt;vibiret@microsoft.com&gt;
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataDollarCountSegment.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataDollarCountSegment.cs
@@ -17,10 +17,10 @@ public class ODataDollarCountSegment : ODataSegment
     /// <summary>
     /// Get the static instance of $count segment.
     /// </summary>
-    internal static ODataDollarCountSegment Instance = new();
+    internal static readonly ODataDollarCountSegment Instance = new();
 
     /// <inheritdoc />
-    public override IEdmEntityType EntityType => null;
+    public override IEdmEntityType? EntityType => null;
 
     /// <inheritdoc />
     public override ODataSegmentKind Kind => ODataSegmentKind.DollarCount;
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataKeySegment.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataKeySegment.cs
@@ -59,7 +59,7 @@ public override string Identifier
             get
             {
                 IList<string> keys = IsAlternateKey ? 
-                    KeyMappings.Values.ToList() : 
+                    KeyMappings?.Values.ToList() ?? [] : 
                     EntityType.Key().Select(static x => x.Name).ToList();
 
                 return string.Join(",", keys);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataMetadataSegment.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataMetadataSegment.cs
@@ -16,7 +16,7 @@ namespace Microsoft.OpenApi.OData.Edm
     public class ODataMetadataSegment : ODataSegment
     {
         /// <inheritdoc />
-        public override IEdmEntityType EntityType => null;
+        public override IEdmEntityType? EntityType => null;
         /// <inheritdoc />
         public override ODataSegmentKind Kind => ODataSegmentKind.Metadata;
 
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataNavigationSourceSegment.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataNavigationSourceSegment.cs
@@ -42,7 +42,9 @@ public ODataNavigationSourceSegment(IEdmNavigationSource navigationSource)
         /// <inheritdoc />
 		public override IEnumerable<IEdmVocabularyAnnotatable> GetAnnotables()
 		{
-			return new IEdmVocabularyAnnotatable[] { NavigationSource as IEdmVocabularyAnnotatable, EntityType }.Union(EntityType.FindAllBaseTypes());
+			return (NavigationSource is IEdmVocabularyAnnotatable source ? new IEdmVocabularyAnnotatable[]{source} : [])
+                                                    .Union([EntityType])
+                                                    .Union(EntityType.FindAllBaseTypes());
 		}
 
 		/// <inheritdoc />
diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
@@ -57,34 +57,40 @@ public virtual IEnumerable<ODataPath> GetPaths(IEdmModel model, OpenApiConvertSe
 
            Initialize(model);
 
-           // entity set
-           foreach (IEdmEntitySet entitySet in _model.EntityContainer.EntitySets())
+           if (_model is not null)
            {
-               if (CanFilter(entitySet))
-               {
-                   RetrieveNavigationSourcePaths(entitySet, settings);
-               }
-           }
+                // entity set
+                foreach (var entitySet in _model.EntityContainer.EntitySets())
+                {
+                    if (CanFilter(entitySet))
+                    {
+                        RetrieveNavigationSourcePaths(entitySet, settings);
+                    }
+                }
 
-           // singleton
-           foreach (IEdmSingleton singleton in _model.EntityContainer.Singletons())
-           {
-               if (CanFilter(singleton))
-               {
-                   RetrieveNavigationSourcePaths(singleton, settings);
-               }
+                // singleton
+                foreach (var singleton in _model.EntityContainer.Singletons())
+                {
+                    if (CanFilter(singleton))
+                    {
+                        RetrieveNavigationSourcePaths(singleton, settings);
+                    }
+                }
            }
 
            // bound operations
            RetrieveBoundOperationPaths(settings);
 
-           // unbound operations
-           foreach (IEdmOperationImport import in _model.EntityContainer.OperationImports())
+           if (_model is not null)
            {
-               if (CanFilter(import))
-               {
-                   AppendPath(new ODataPath(new ODataOperationImportSegment(import)));
-               }
+                // unbound operations
+                foreach (IEdmOperationImport import in _model.EntityContainer.OperationImports())
+                {
+                    if (CanFilter(import))
+                    {
+                        AppendPath(new ODataPath(new ODataOperationImportSegment(import)));
+                    }
+                }
            }
 
            return MergePaths();
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiComponentsGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiComponentsGenerator.cs
@@ -32,9 +32,12 @@ public static void AddComponentsToDocument(this ODataContext context, OpenApiDoc
             context.AddRequestBodiesToDocument(document);
             context.AddExamplesToDocument(document);
             context.AddSecuritySchemesToDocument(document);
-            document.Components.Links = null;
-            document.Components.Callbacks = null;
-            document.Components.Extensions = null;
+            if (document.Components is not null)
+            {
+                document.Components.Links = null;
+                document.Components.Callbacks = null;
+                document.Components.Extensions = null;
+            }
         }
     }
 }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiExampleGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiExampleGenerator.cs
@@ -47,7 +47,7 @@ public static void AddExamplesToDocument(this ODataContext context, OpenApiDocum
             }
         }
 
-        private static OpenApiExample CreateExample(this ODataContext context, IEdmType edmType, OpenApiDocument document)
+        private static OpenApiExample? CreateExample(this ODataContext context, IEdmType edmType, OpenApiDocument document)
         {
             Debug.Assert(context != null);
             Debug.Assert(edmType != null);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiPathItemGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiPathItemGenerator.cs
@@ -39,7 +39,7 @@ public static void AddPathItemsToDocument(this ODataContext context, OpenApiDocu
             settings.EnableKeyAsSegment = context.KeyAsSegment;
             foreach (ODataPath path in context.AllPaths)
             {
-                IPathItemHandler handler = context.PathItemHandlerProvider.GetHandler(path.Kind, document);
+                var handler = context.PathItemHandlerProvider.GetHandler(path.Kind, document);
                 if (handler == null)
                 {
                     continue;
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiResponseGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiResponseGenerator.cs
@@ -121,9 +121,9 @@ public static OpenApiResponses CreateResponses(this ODataContext context, IEdmOp
 
             OpenApiResponses responses = new();
             
-            if (operation.IsAction() && operation.ReturnType == null)
+            if (operation.IsAction() && operation.ReturnType == null && Constants.StatusCode204.GetResponse(document) is {} x204Response)
             {
-                responses.Add(Constants.StatusCode204, Constants.StatusCode204.GetResponse(document));
+                responses.Add(Constants.StatusCode204, x204Response);
             }
             else if (context.Model.OperationTargetsMultiplePaths(operation))
             {
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionImportOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionImportOperationHandler.cs
@@ -40,7 +40,7 @@ protected override void SetParameters(OpenApiOperation operation)
                 return;
             }
 
-            if (OperationImportSegment.ParameterMappings != null &&
+            if (OperationImportSegment?.ParameterMappings != null &&
                 Context?.CreateParameters(functionImport.Function, _document, OperationImportSegment.ParameterMappings) is {} functionParamMappings)
             {
                 operation.Parameters ??= [];
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyDeleteOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyDeleteOperationHandler.cs
@@ -79,7 +79,7 @@ protected override void SetParameters(OpenApiOperation operation)
         /// <inheritdoc/>
         protected override void SetSecurity(OpenApiOperation operation)
         {
-            if (_deleteRestriction == null)
+            if (_deleteRestriction?.Permissions == null)
             {
                 return;
             }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyUpdateOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyUpdateOperationHandler.cs
@@ -84,7 +84,7 @@ protected override void SetResponses(OpenApiOperation operation)
 
         protected override void SetSecurity(OpenApiOperation operation)
         {
-            if (_updateRestriction == null)
+            if (_updateRestriction?.Permissions == null)
             {
                 return;
             }
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs
@@ -283,7 +283,7 @@ protected static void AppendCustomParameters(OpenApiOperation operation, IList<C
                         };
 
                         // maybe call convert to Uri literal
-                        ex.Value = example.Value.ToString();
+                        ex.Value = example.Value?.ToString();
 
                         parameter.Examples.Add("example-" + index++, ex);
                     }
diff --git a/src/Microsoft.OpenApi.OData.Reader/PathItem/IPathItemHandlerProvider.cs b/src/Microsoft.OpenApi.OData.Reader/PathItem/IPathItemHandlerProvider.cs
@@ -19,6 +19,6 @@ internal interface IPathItemHandlerProvider
         /// <param name="pathKind">The path kind.</param>
         /// <param name="document">The Open API document to use to lookup references.</param>
         /// <returns>The <see cref="IPathItemHandler"/>.</returns>
-        IPathItemHandler GetHandler(ODataPathKind pathKind, OpenApiDocument document);
+        IPathItemHandler? GetHandler(ODataPathKind pathKind, OpenApiDocument document);
     }
 }
diff --git a/src/Microsoft.OpenApi.OData.Reader/PathItem/PathItemHandlerProvider.cs b/src/Microsoft.OpenApi.OData.Reader/PathItem/PathItemHandlerProvider.cs
@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.OData.PathItem
     internal class PathItemHandlerProvider : IPathItemHandlerProvider
     {
         /// <inheritdoc/>
-        public IPathItemHandler GetHandler(ODataPathKind pathKind, OpenApiDocument document)
+        public IPathItemHandler? GetHandler(ODataPathKind pathKind, OpenApiDocument document)
         {
             return pathKind switch {
             // EntitySet
diff --git a/src/Microsoft.OpenApi.OData.Reader/PublicAPI.Unshipped.txt b/src/Microsoft.OpenApi.OData.Reader/PublicAPI.Unshipped.txt
@@ -236,7 +236,7 @@ override Microsoft.OpenApi.OData.Edm.ODataComplexPropertySegment.GetAnnotables()
 override Microsoft.OpenApi.OData.Edm.ODataComplexPropertySegment.GetPathItemName(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings, System.Collections.Generic.HashSet<string!>! parameters) -> string!
 override Microsoft.OpenApi.OData.Edm.ODataComplexPropertySegment.Identifier.get -> string!
 override Microsoft.OpenApi.OData.Edm.ODataComplexPropertySegment.Kind.get -> Microsoft.OpenApi.OData.Edm.ODataSegmentKind
-override Microsoft.OpenApi.OData.Edm.ODataDollarCountSegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType!
+override Microsoft.OpenApi.OData.Edm.ODataDollarCountSegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType?
 override Microsoft.OpenApi.OData.Edm.ODataDollarCountSegment.GetAnnotables() -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable!>!
 override Microsoft.OpenApi.OData.Edm.ODataDollarCountSegment.GetPathItemName(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings, System.Collections.Generic.HashSet<string!>! parameters) -> string!
 override Microsoft.OpenApi.OData.Edm.ODataDollarCountSegment.Identifier.get -> string!
@@ -246,7 +246,7 @@ override Microsoft.OpenApi.OData.Edm.ODataKeySegment.GetAnnotables() -> System.C
 override Microsoft.OpenApi.OData.Edm.ODataKeySegment.GetPathItemName(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings, System.Collections.Generic.HashSet<string!>! parameters) -> string!
 override Microsoft.OpenApi.OData.Edm.ODataKeySegment.Identifier.get -> string!
 override Microsoft.OpenApi.OData.Edm.ODataKeySegment.Kind.get -> Microsoft.OpenApi.OData.Edm.ODataSegmentKind
-override Microsoft.OpenApi.OData.Edm.ODataMetadataSegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType!
+override Microsoft.OpenApi.OData.Edm.ODataMetadataSegment.EntityType.get -> Microsoft.OData.Edm.IEdmEntityType?
 override Microsoft.OpenApi.OData.Edm.ODataMetadataSegment.GetAnnotables() -> System.Collections.Generic.IEnumerable<Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable!>!
 override Microsoft.OpenApi.OData.Edm.ODataMetadataSegment.GetPathItemName(Microsoft.OpenApi.OData.OpenApiConvertSettings! settings, System.Collections.Generic.HashSet<string!>! parameters) -> string!
 override Microsoft.OpenApi.OData.Edm.ODataMetadataSegment.Identifier.get -> string!

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public override string Identifier`
`59`	`59`	`get`
`60`	`60`	`{`
`61`	`61`	`IList<string> keys = IsAlternateKey ?`
`62`		`- KeyMappings.Values.ToList() :`
	`62`	`+ KeyMappings?.Values.ToList() ?? [] :`
`63`	`63`	`EntityType.Key().Select(static x => x.Name).ToList();`
`64`	`64`
`65`	`65`	`return string.Join(",", keys);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace Microsoft.OpenApi.OData.Edm`
`16`	`16`	`public class ODataMetadataSegment : 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.Metadata;`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ public ODataNavigationSourceSegment(IEdmNavigationSource navigationSource)`
`42`	`42`	`/// <inheritdoc />`
`43`	`43`	`public override IEnumerable<IEdmVocabularyAnnotatable> GetAnnotables()`
`44`	`44`	`{`
`45`		`- return new IEdmVocabularyAnnotatable[] { NavigationSource as IEdmVocabularyAnnotatable, EntityType }.Union(EntityType.FindAllBaseTypes());`
	`45`	`+ return (NavigationSource is IEdmVocabularyAnnotatable source ? new IEdmVocabularyAnnotatable[]{source} : [])`
	`46`	`+ .Union([EntityType])`
	`47`	`+ .Union(EntityType.FindAllBaseTypes());`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`/// <inheritdoc />`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,12 @@ public static void AddComponentsToDocument(this ODataContext context, OpenApiDoc`
`32`	`32`	`context.AddRequestBodiesToDocument(document);`
`33`	`33`	`context.AddExamplesToDocument(document);`
`34`	`34`	`context.AddSecuritySchemesToDocument(document);`
`35`		`- document.Components.Links = null;`
`36`		`- document.Components.Callbacks = null;`
`37`		`- document.Components.Extensions = null;`
	`35`	`+ if (document.Components is not null)`
	`36`	`+ {`
	`37`	`+ document.Components.Links = null;`
	`38`	`+ document.Components.Callbacks = null;`
	`39`	`+ document.Components.Extensions = null;`
	`40`	`+ }`
`38`	`41`	`}`
`39`	`42`	`}`
`40`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static void AddExamplesToDocument(this ODataContext context, OpenApiDocum`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- private static OpenApiExample CreateExample(this ODataContext context, IEdmType edmType, OpenApiDocument document)`
	`50`	`+ private static OpenApiExample? CreateExample(this ODataContext context, IEdmType edmType, OpenApiDocument document)`
`51`	`51`	`{`
`52`	`52`	`Debug.Assert(context != null);`
`53`	`53`	`Debug.Assert(edmType != null);`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static void AddPathItemsToDocument(this ODataContext context, OpenApiDocu`
`39`	`39`	`settings.EnableKeyAsSegment = context.KeyAsSegment;`
`40`	`40`	`foreach (ODataPath path in context.AllPaths)`
`41`	`41`	`{`
`42`		`- IPathItemHandler handler = context.PathItemHandlerProvider.GetHandler(path.Kind, document);`
	`42`	`+ var handler = context.PathItemHandlerProvider.GetHandler(path.Kind, document);`
`43`	`43`	`if (handler == null)`
`44`	`44`	`{`
`45`	`45`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,9 @@ public static OpenApiResponses CreateResponses(this ODataContext context, IEdmOp`
`121`	`121`
`122`	`122`	`OpenApiResponses responses = new();`
`123`	`123`
`124`		`- if (operation.IsAction() && operation.ReturnType == null)`
	`124`	`+ if (operation.IsAction() && operation.ReturnType == null && Constants.StatusCode204.GetResponse(document) is {} x204Response)`
`125`	`125`	`{`
`126`		`- responses.Add(Constants.StatusCode204, Constants.StatusCode204.GetResponse(document));`
	`126`	`+ responses.Add(Constants.StatusCode204, x204Response);`
`127`	`127`	`}`
`128`	`128`	`else if (context.Model.OperationTargetsMultiplePaths(operation))`
`129`	`129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected override void SetParameters(OpenApiOperation operation)`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (OperationImportSegment.ParameterMappings != null &&`
	`43`	`+ if (OperationImportSegment?.ParameterMappings != null &&`
`44`	`44`	`Context?.CreateParameters(functionImport.Function, _document, OperationImportSegment.ParameterMappings) is {} functionParamMappings)`
`45`	`45`	`{`
`46`	`46`	`operation.Parameters ??= [];`