chore: another batch of NRT fixes

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

Author: baywet

src/Microsoft.OpenApi.OData.Reader/Common/EdmModelHelper.cs

@@ -60,8 +60,8 @@ internal static class EdmModelHelper
         /// <param name="restrictionProperty">The <see cref="NavigationPropertyRestriction"/>.</param>
         /// <returns>true, if navigability is allowed, otherwise false.</returns>
         internal static bool NavigationRestrictionsAllowsNavigability(
-            NavigationRestrictionsType restrictionType,
-            NavigationPropertyRestriction restrictionProperty)
+            NavigationRestrictionsType? restrictionType,
+            NavigationPropertyRestriction? restrictionProperty)
         {
             // Verify using individual navigation restriction first
             if (restrictionProperty?.Navigability != null && restrictionProperty.Navigability.Value == NavigationType.None)

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

@@ -287,17 +287,17 @@ public override string ToString()
                 return PathTemplate;
             }
 
-            return "/" + String.Join("/", Segments.Select(e => e.Kind));
+            return "/" + string.Join("/", Segments.Select(e => e.Kind));
         }
 
         /// <summary>
         /// Compare between two ODataPath using its path item name.
         /// </summary>
         /// <param name="other">The compare to ODataPath.</param>
         /// <returns>true/false</returns>
-        public int CompareTo(ODataPath other)
+        public int CompareTo(ODataPath? other)
         {
-            return GetPathItemName().CompareTo(other.GetPathItemName());
+            return GetPathItemName().CompareTo(other?.GetPathItemName());
         }
 
         private ODataPathKind CalcPathType()

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

@@ -142,9 +142,9 @@ private void AppendPath(ODataPath path)
                 case ODataPathKind.MediaEntity:
                     if (path.FirstSegment is ODataNavigationSourceSegment navigationSourceSegment)
                     {
-                        if(!_allNavigationSourcePaths.TryGetValue(navigationSourceSegment.EntityType, out IList<ODataPath> nsList))
+                        if(!_allNavigationSourcePaths.TryGetValue(navigationSourceSegment.EntityType, out var nsList))
                         {
-                            nsList = new List<ODataPath>();
+                            nsList = [];
                             _allNavigationSourcePaths[navigationSourceSegment.EntityType] = nsList;
                         }
 
@@ -157,9 +157,9 @@ private void AppendPath(ODataPath path)
                             }
                             else
                             {
-                                if (!_dollarCountPaths.TryGetValue(navigationSourceSegment.EntityType, out IList<ODataPath> dollarPathList))
+                                if (!_dollarCountPaths.TryGetValue(navigationSourceSegment.EntityType, out var dollarPathList))
                                 {
-                                    dollarPathList = new List<ODataPath>();
+                                    dollarPathList = [];
                                     _dollarCountPaths[navigationSourceSegment.EntityType] = dollarPathList;
                                 }
                                 dollarPathList.Add(path);
@@ -174,9 +174,9 @@ private void AppendPath(ODataPath path)
                 case ODataPathKind.Ref:
                     ODataNavigationPropertySegment navigationPropertySegment = path.OfType<ODataNavigationPropertySegment>().Last();
 
-                    if (!_allNavigationPropertyPaths.TryGetValue(navigationPropertySegment.EntityType, out IList<ODataPath> npList))
+                    if (!_allNavigationPropertyPaths.TryGetValue(navigationPropertySegment.EntityType, out var npList))
                     {
-                        npList = new List<ODataPath>();
+                        npList = [];
                         _allNavigationPropertyPaths[navigationPropertySegment.EntityType] = npList;
                     }
 
@@ -190,7 +190,7 @@ private void AppendPath(ODataPath path)
                         foreach (var kvp in _dollarCountPaths)
                         {
                             if (kvp.Value.FirstOrDefault(p => DollarCountAndOperationPathsSimilar(p, path)) is ODataPath dollarCountPath &&
-                                _allNavigationSourcePaths.TryGetValue(kvp.Key, out IList<ODataPath> dollarPathList))
+                                _allNavigationSourcePaths.TryGetValue(kvp.Key, out var dollarPathList))
                             {
                                 dollarPathList.Remove(dollarCountPath);
                                 break;
@@ -208,19 +208,19 @@ private void AppendPath(ODataPath path)
             bool DollarCountAndOperationPathsSimilar(ODataPath path1, ODataPath path2)
             {
                 if ((path1.Kind == ODataPathKind.DollarCount && 
-                    path2.Kind == ODataPathKind.Operation && path2.LastSegment.Identifier.Equals(Constants.CountSegmentIdentifier, StringComparison.OrdinalIgnoreCase)) ||
+                    path2.Kind == ODataPathKind.Operation && Constants.CountSegmentIdentifier.Equals(path2.LastSegment?.Identifier, StringComparison.OrdinalIgnoreCase)) ||
                     (path2.Kind == ODataPathKind.DollarCount &&
-                    path1.Kind == ODataPathKind.Operation && path1.LastSegment.Identifier.Equals(Constants.CountSegmentIdentifier, StringComparison.OrdinalIgnoreCase)))
+                    path1.Kind == ODataPathKind.Operation && Constants.CountSegmentIdentifier.Equals(path1.LastSegment?.Identifier, StringComparison.OrdinalIgnoreCase)))
                 {
                     return GetModifiedPathItemName(path1)?.Equals(GetModifiedPathItemName(path2), StringComparison.OrdinalIgnoreCase) ?? false;
                 }
 
                 return false;                
             }
 
-            string GetModifiedPathItemName(ODataPath path)
+            string? GetModifiedPathItemName(ODataPath path)
             {
-                if (!path.Any()) return null;
+                if (path.Count == 0) return null;
 
                 IEnumerable<ODataSegment> modifiedSegments = path.Take(path.Count - 1);
                 ODataPath modifiedPath = new(modifiedSegments);
@@ -242,14 +242,15 @@ private void RetrieveNavigationSourcePaths(IEdmNavigationSource navigationSource
             ODataPath path = new(new ODataNavigationSourceSegment(navigationSource));
             AppendPath(path.Clone());
 
-            IEdmEntitySet entitySet = navigationSource as IEdmEntitySet;
             IEdmEntityType entityType = navigationSource.EntityType;
-            CountRestrictionsType count = null;
+            CountRestrictionsType? count = null;
             bool? indexableByKey = false;
+            var entitySetIsNull = true;
 
             // for entity set, create a path with key and a $count path
-            if (entitySet != null)
+            if (navigationSource is IEdmEntitySet entitySet && _model is not null)
             {
+                entitySetIsNull = false;
                 string targetPath = path.GetTargetPath(_model);
                 count = _model.GetRecord<CountRestrictionsType>(targetPath, CapabilitiesConstants.CountRestrictions)
                     ?? _model.GetRecord<CountRestrictionsType>(entitySet, CapabilitiesConstants.CountRestrictions);
@@ -291,13 +292,13 @@ private void RetrieveNavigationSourcePaths(IEdmNavigationSource navigationSource
                 }
             }
 
-            if (entitySet != null && (indexableByKey ?? true))
+            if (!entitySetIsNull && (indexableByKey ?? true))
             {
                 path.Pop(); // end of entity
             }
 
             path.Pop(); // end of navigation source.
-            Debug.Assert(path.Any() == false);
+            Debug.Assert(path.Count == 0);
         }
 
         /// <summary>
@@ -312,7 +313,7 @@ private void RetrieveComplexPropertyPaths(IEdmEntityType entityType, ODataPath c
             Utils.CheckArgumentNull(currentPath, nameof(currentPath));
             Utils.CheckArgumentNull(convertSettings, nameof(convertSettings));
 
-            if (!convertSettings.EnableNavigationPropertyPath) return;
+            if (!convertSettings.EnableNavigationPropertyPath || _model is null) return;
 
             foreach (IEdmStructuralProperty sp in entityType.StructuralProperties()
                                                     .Where(x => x.Type.IsComplex() ||
@@ -327,9 +328,9 @@ private void RetrieveComplexPropertyPaths(IEdmEntityType entityType, ODataPath c
                 }
                 AppendPath(currentPath.Clone());
 
-                if (sp.Type.IsCollection())
+                if (sp.Type.IsCollection() && sp.Type.Definition.AsElementType() is IEdmComplexType elemType)
                 {
-                    CreateTypeCastPaths(currentPath, convertSettings, sp.Type.Definition.AsElementType() as IEdmComplexType, sp, true);
+                    CreateTypeCastPaths(currentPath, convertSettings, elemType, sp, true);
                     var isCountable = _model.GetRecord<CountRestrictionsType>(targetPath, CapabilitiesConstants.CountRestrictions)?.IsCountable
                         ?? _model.GetRecord<CountRestrictionsType>(sp, CapabilitiesConstants.CountRestrictions)?.IsCountable
                         ?? true;
@@ -373,7 +374,7 @@ private bool RetrieveComplexTypeNavigationPropertyPaths(IEdmComplexType complexT
                                         .Distinct()
                                         .Where(CanFilter);
 
-            if (!navigationProperties.Any()) return false;
+            if (!navigationProperties.Any() || _model is null) return false;
 
             foreach (var np in navigationProperties)
             {
@@ -434,14 +435,14 @@ private bool ShouldCreateComplexPropertyPaths(IEdmStructuralProperty complexProp
             if (!convertSettings.RequireRestrictionAnnotationsToGenerateComplexPropertyPaths)
                 return true;
 
-            bool isReadable = _model.GetRecord<ReadRestrictionsType>(targetPath, CapabilitiesConstants.ReadRestrictions)?.Readable 
-                ?? _model.GetRecord<ReadRestrictionsType>(complexProperty, CapabilitiesConstants.ReadRestrictions)?.Readable 
+            bool isReadable = _model?.GetRecord<ReadRestrictionsType>(targetPath, CapabilitiesConstants.ReadRestrictions)?.Readable 
+                ?? _model?.GetRecord<ReadRestrictionsType>(complexProperty, CapabilitiesConstants.ReadRestrictions)?.Readable 
                 ?? false;
-            bool isUpdatable = _model.GetRecord<UpdateRestrictionsType>(targetPath, CapabilitiesConstants.UpdateRestrictions)?.Updatable 
-                ??_model.GetRecord<UpdateRestrictionsType>(complexProperty, CapabilitiesConstants.UpdateRestrictions)?.Updatable 
+            bool isUpdatable = _model?.GetRecord<UpdateRestrictionsType>(targetPath, CapabilitiesConstants.UpdateRestrictions)?.Updatable 
+                ??_model?.GetRecord<UpdateRestrictionsType>(complexProperty, CapabilitiesConstants.UpdateRestrictions)?.Updatable 
                 ?? false;
-            bool isInsertable = _model.GetRecord<InsertRestrictionsType>(targetPath, CapabilitiesConstants.InsertRestrictions)?.Insertable
-                ?? _model.GetRecord<InsertRestrictionsType>(complexProperty, CapabilitiesConstants.InsertRestrictions)?.Insertable 
+            bool isInsertable = _model?.GetRecord<InsertRestrictionsType>(targetPath, CapabilitiesConstants.InsertRestrictions)?.Insertable
+                ?? _model?.GetRecord<InsertRestrictionsType>(complexProperty, CapabilitiesConstants.InsertRestrictions)?.Insertable 
                 ?? false;
 
             return isReadable || isUpdatable || isInsertable;
@@ -494,10 +495,10 @@ private void RetrieveMediaEntityStreamPaths(IEdmEntityType entityType, ODataPath
         /// <param name="visitedNavigationProperties">A stack that holds the visited navigation properties in the <paramref name="currentPath"/>.</param>
         private void RetrieveNavigationPropertyPaths(
             IEdmNavigationProperty navigationProperty,
-            CountRestrictionsType count,
+            CountRestrictionsType? count,
             ODataPath currentPath,
             OpenApiConvertSettings convertSettings,
-            Stack<string> visitedNavigationProperties = null)
+            Stack<string>? visitedNavigationProperties = null)
         {
             Utils.CheckArgumentNull(navigationProperty, nameof(navigationProperty));
             Utils.CheckArgumentNull(currentPath, nameof(currentPath));
@@ -519,17 +520,17 @@ private void RetrieveNavigationPropertyPaths(
 
             // Get the annotatable navigation source for this navigation property.
             IEdmVocabularyAnnotatable annotatableNavigationSource = (currentPath.FirstSegment as ODataNavigationSourceSegment)?.NavigationSource as IEdmVocabularyAnnotatable;                   
-            NavigationRestrictionsType navSourceRestrictionType = null;
-            NavigationRestrictionsType navPropRestrictionType = null;
+            NavigationRestrictionsType? navSourceRestrictionType = null;
+            NavigationRestrictionsType? navPropRestrictionType = null;
 
             // Get the NavigationRestrictions referenced by this navigation property: Can be defined in the navigation source or in-lined in the navigation property.
-            if (annotatableNavigationSource != null)
+            if (annotatableNavigationSource != null && _model is not null)
             {
                 navSourceRestrictionType = _model.GetRecord<NavigationRestrictionsType>(annotatableNavigationSource, CapabilitiesConstants.NavigationRestrictions);
                 navPropRestrictionType = _model.GetRecord<NavigationRestrictionsType>(navigationProperty, CapabilitiesConstants.NavigationRestrictions);
             }            
 
-            NavigationPropertyRestriction restriction = navSourceRestrictionType?.RestrictedProperties?
+            NavigationPropertyRestriction? restriction = navSourceRestrictionType?.RestrictedProperties?
                 .FirstOrDefault(r => r.NavigationProperty == currentPath.NavigationPropertyPath(navigationProperty.Name))
                 ?? navPropRestrictionType?.RestrictedProperties?.FirstOrDefault();
 
@@ -1162,10 +1163,13 @@ private void AppendBoundOperationOnDerivedNavigationPropertyPath(
                             continue;
                         }
 
-                        ODataPath newPath = path.Clone();
-                        newPath.Push(new ODataTypeCastSegment(bindingEntityType, _model));
-                        newPath.Push(new ODataOperationSegment(edmOperation, isEscapedFunction, _model));
-                        AppendPath(newPath);
+                        if (_model is not null)
+                        {
+                            ODataPath newPath = path.Clone();
+                            newPath.Push(new ODataTypeCastSegment(bindingEntityType, _model));
+                            newPath.Push(new ODataOperationSegment(edmOperation, isEscapedFunction, _model));
+                            AppendPath(newPath);
+                        }
                     }
                 }
             }

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

@@ -41,8 +41,8 @@ protected override void SetBasicInfo(OpenApiOperation operation)
         {
             base.SetBasicInfo(operation);
 
-            ReadRestrictionsType readRestrictions = Context.Model.GetRecord<ReadRestrictionsType>(TargetPath, CapabilitiesConstants.ReadRestrictions);
-            ReadRestrictionsType operationReadRestrictions = Context.Model.GetRecord<ReadRestrictionsType>(EdmOperation, CapabilitiesConstants.ReadRestrictions);
+            var readRestrictions = string.IsNullOrEmpty(TargetPath) ? null : Context?.Model.GetRecord<ReadRestrictionsType>(TargetPath, CapabilitiesConstants.ReadRestrictions);
+            var operationReadRestrictions = Context?.Model.GetRecord<ReadRestrictionsType>(EdmOperation, CapabilitiesConstants.ReadRestrictions);
             readRestrictions?.MergePropertiesIfNull(operationReadRestrictions);
             readRestrictions ??= operationReadRestrictions;