Fix stack overflow when EnableLowerCamelCase is used (fixes #233)

AutoMapper.AspNetCore.OData.EFCore/Expansions/DefaultExpansionsBuilder.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.OData.Query;
 using Microsoft.OData.Edm;
+using Microsoft.OData.ModelBuilder;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -125,12 +126,12 @@ private HashSet<string> GetNavigationProperties(Type type)
             IEdmEntityType entityType = context.Model.SchemaElements.OfType<IEdmEntityType>()
                 .SingleOrDefault(e => GetClrTypeFromEntityType(e).FullName == type.FullName);
             if (entityType != null)
-                return entityType.NavigationProperties().Select(p => p.Name).ToHashSet();
+                return entityType.NavigationProperties().Select(GetNavigationPropertyName).ToHashSet();
 
             IEdmComplexType complexType = context.Model.SchemaElements.OfType<IEdmComplexType>()
                 .SingleOrDefault(e => GetClrTypeFromComplexType(e).FullName == type.FullName);
             if (complexType != null)
-                return complexType.NavigationProperties().Select(p => p.Name).ToHashSet();
+                return complexType.NavigationProperties().Select(GetNavigationPropertyName).ToHashSet();
 
             return [];
 
@@ -139,6 +140,14 @@ Type GetClrTypeFromEntityType(IEdmEntityType entityType)
 
             Type GetClrTypeFromComplexType(IEdmComplexType complexType)
                 => TypeExtensions.GetClrType(new EdmComplexTypeReference(complexType, true), context.Model, TypeExtensions.GetEdmToClrTypeMappings());
+
+            // Look up the name of the corresponding C# property, which may differ from the property name
+            // used in the EDM model, e.g. because the EnableLowerCamelCase option is being used.
+            string GetNavigationPropertyName(IEdmNavigationProperty prop)
+            {
+                var annotation = context.Model.GetAnnotationValue<ClrPropertyInfoAnnotation>(prop);
+                return annotation?.ClrPropertyInfo?.Name ?? prop.Name;
+            }
         }
     }
 }

AutoMapper.OData.EF6.Tests/GetTests.cs

@@ -645,6 +645,8 @@ public static ODataQueryOptions<T> GetODataQueryOptions<T>(string queryString, I
             if (customNamespace != null)
                 builder.Namespace = customNamespace;
 
+            builder.EnableLowerCamelCase();
+
             builder.EntitySet<T>(typeof(T).Name);
             IEdmModel model = builder.GetEdmModel();
             IEdmEntitySet entitySet = model.EntityContainer.FindEntitySet(typeof(T).Name);

AutoMapper.OData.EFCore.Tests/GetTests.cs

@@ -686,6 +686,8 @@ public static ODataQueryOptions<T> GetODataQueryOptions<T>(string queryString, I
             if (customNamespace != null)
                 builder.Namespace = customNamespace;
 
+            builder.EnableLowerCamelCase();
+
             builder.EntitySet<T>(typeof(T).Name);
             IEdmModel model = builder.GetEdmModel();
             IEdmEntitySet entitySet = model.EntityContainer.FindEntitySet(typeof(T).Name);
@@ -706,6 +708,8 @@ public static ODataQueryOptions<T> GetODataQueryOptions<T>(string queryString, I
             if (customNamespace != null)
                 builder.Namespace = customNamespace;
 
+            builder.EnableLowerCamelCase();
+
             builder.EntitySet<X.CategoryModel>(typeof(X.CategoryModel).Name + "X");
             builder.EntitySet<Model.CategoryModel>(nameof(Model.CategoryModel));
             IEdmModel model = builder.GetEdmModel();

ExpressionBuilder.Tests/ODataHelpers.cs

@@ -25,6 +25,7 @@ private static IEdmModel GetModel<T>() where T : class
 
             IEdmModel GetModel(ODataConventionModelBuilder builder)
             {
+                builder.EnableLowerCamelCase();
                 builder.EntitySet<T>(modelType.Name);
                 if (modelType == typeof(Product))
                 {
@@ -51,6 +52,7 @@ public static SelectExpandClause GetSelectExpandClause<T>(IDictionary<string, st
                 entitySet,
                 queryOptions
             );
+            parser.Resolver = new ODataUriResolver { EnableCaseInsensitive = true };
 
             return parser.ParseSelectAndExpand();
         }
@@ -75,6 +77,7 @@ public static FilterClause GetFilterClause<T>(IDictionary<string, string> queryO
                 entitySet,
                 queryOptions
             );
+            parser.Resolver = new ODataUriResolver { EnableCaseInsensitive = true };
 
             if (useFilterOption)
             {
@@ -108,6 +111,7 @@ public static ODataQueryContext GetODataQueryContext<T>() where T : class
         public static ODataQueryOptions<T> GetODataQueryOptions<T>(string queryString, IServiceProvider serviceProvider, IRouteBuilder routeBuilder) where T : class
         {
             ODataConventionModelBuilder builder = new ODataConventionModelBuilder();
+            builder.EnableLowerCamelCase();
 
             builder.EntitySet<T>(typeof(T).Name);
             IEdmModel model = builder.GetEdmModel();

WebAPI.OData.EF6/Startup.cs

@@ -71,6 +71,7 @@ private IEdmModel GetEdmModel()
         {
             var builder = new ODataConventionModelBuilder();
             //builder.Namespace = "com.FooBar";
+            builder.EnableLowerCamelCase();
             builder.EntitySet<OpsTenant>(nameof(OpsTenant));
             builder.EntitySet<CoreBuilding>(nameof(CoreBuilding));
             builder.EntitySet<OpsBuilder>(nameof(OpsBuilder));

WebAPI.OData.EFCore/Startup.cs

@@ -66,6 +66,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         private IEdmModel GetEdmModel()
         {
             var builder = new ODataConventionModelBuilder();
+            builder.EnableLowerCamelCase();
             //builder.Namespace = "com.FooBar";
             builder.EntitySet<OpsTenant>(nameof(OpsTenant));
             builder.EntitySet<CoreBuilding>(nameof(CoreBuilding));