Switch ad hoc models to be complex types instead of entities; skips validation

Author: commonsensesoftware

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/Conventions/ImplicitModelBoundSettingsConvention.cs

@@ -2,10 +2,7 @@
 
 namespace Asp.Versioning.Conventions;
 
-using Asp.Versioning;
-using Asp.Versioning.OData;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.OData.ModelBuilder;
 
 /// <content>
 /// Provides additional implementation specific to ASP.NET Core.

src/Common/src/Common.OData.ApiExplorer/Conventions/ImplicitModelBoundSettingsConvention.cs

@@ -8,6 +8,7 @@ namespace Asp.Versioning.Conventions;
 using Microsoft.AspNet.OData.Builder;
 #else
 using Microsoft.OData.ModelBuilder;
+using System.Buffers;
 #endif
 
 /// <summary>
@@ -56,28 +57,66 @@ public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string? rou
 
     private static HashSet<Type>? GetExistingTypes( ODataModelBuilder builder )
     {
-        var types = default( HashSet<Type> );
+        HashSet<Type> types;
 
-        foreach ( var entitySet in builder.EntitySets )
+        if ( builder.StructuralTypes is ICollection<StructuralTypeConfiguration> collection )
         {
-            types ??= new();
-            types.Add( entitySet.ClrType );
+            var count = collection.Count;
+
+            if ( count == 0 )
+            {
+                return default;
+            }
+
+#if NETFRAMEWORK
+            var array = new StructuralTypeConfiguration[count];
+            types = new();
+#else
+            var pool = ArrayPool<StructuralTypeConfiguration>.Shared;
+            var array = pool.Rent( count );
+
+            types = new( capacity: count );
+#endif
+
+            collection.CopyTo( array, 0 );
+
+            for ( var i = 0; i < count; i++ )
+            {
+                types.Add( array[i].ClrType );
+            }
+
+#if !NETFRAMEWORK
+            pool.Return( array, clearArray: true );
+#endif
+
+            return types;
+        }
+
+        using var structuralTypes = builder.StructuralTypes.GetEnumerator();
+
+        if ( !structuralTypes.MoveNext() )
+        {
+            return default;
         }
 
-        foreach ( var singleton in builder.Singletons )
+        types = new HashSet<Type>()
+        {
+            structuralTypes.Current.ClrType,
+        };
+
+        while ( structuralTypes.MoveNext() )
         {
-            types ??= new();
-            types.Add( singleton.ClrType );
+            types.Add( structuralTypes.Current.ClrType );
         }
 
         return types;
     }
 
     private void OnModelCreating( ODataModelBuilder builder )
     {
-        foreach ( var entityType in types.Select( builder.AddEntityType ) )
+        foreach ( var type in types )
         {
-            builder.AddEntitySet( entityType.Name, entityType );
+            builder.AddComplexType( type );
         }
     }
 }