Add ad hoc annotation and resolve annotations via extension method

Chris Martinez · commonsensesoftware · commit 0b9a2997958f · 2022-12-27T14:32:38.000-08:00
diff --git a/src/AspNet/OData/src/Asp.Versioning.WebApi.OData/OData/EdmModelSelector.cs b/src/AspNet/OData/src/Asp.Versioning.WebApi.OData/OData/EdmModelSelector.cs
@@ -130,16 +130,12 @@ public EdmModelSelector( IEnumerable<IEdmModel> models, IApiVersionSelector apiV
 
     private static void AddVersionFromModel( IEdmModel model, IList<ApiVersion> versions, IDictionary<ApiVersion, IEdmModel> collection )
     {
-        var annotation = model.GetAnnotationValue<ApiVersionAnnotation>( model );
-
-        if ( annotation == null )
+        if ( model.GetApiVersion() is not ApiVersion version )
         {
             var message = string.Format( CultureInfo.CurrentCulture, SR.MissingAnnotation, typeof( ApiVersionAnnotation ).Name );
             throw new ArgumentException( message );
         }
 
-        var version = annotation.ApiVersion;
-
         collection.Add( version, model );
         versions.Add( version );
     }
diff --git a/src/AspNet/OData/test/Asp.Versioning.WebApi.OData.Tests/OData/VersionedODataModelBuilderTest.cs b/src/AspNet/OData/test/Asp.Versioning.WebApi.OData.Tests/OData/VersionedODataModelBuilderTest.cs
@@ -34,7 +34,7 @@ public void get_edm_models_should_return_expected_results()
         var model = builder.GetEdmModels().Single();
 
         // assert
-        model.GetAnnotationValue<ApiVersionAnnotation>( model ).ApiVersion.Should().Be( apiVersion );
+        model.GetApiVersion().Should().Be( apiVersion );
         modelCreated.Verify( f => f( It.IsAny<ODataModelBuilder>(), model ), Times.Once() );
     }
 
diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/ODataApiDescriptionProvider.cs b/src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/ODataApiDescriptionProvider.cs
@@ -221,7 +221,7 @@ private static bool TryMatchModelVersion(
         for ( var i = 0; i < items.Count; i++ )
         {
             var item = items[i];
-            var otherApiVersion = item.Model.GetAnnotationValue<ApiVersionAnnotation>( item.Model )?.ApiVersion;
+            var otherApiVersion = item.Model.GetApiVersion();
 
             if ( apiVersion.Equals( otherApiVersion ) )
             {
diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/Conventions/ODataQueryOptionDescriptionContext.cs b/src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/Conventions/ODataQueryOptionDescriptionContext.cs
@@ -34,7 +34,7 @@ public partial class ODataQueryOptionDescriptionContext
         foreach ( var item in items )
         {
             var model = item.Model;
-            var otherVersion = model.GetAnnotationValue<ApiVersionAnnotation>( model )?.ApiVersion;
+            var otherVersion = model.GetApiVersion();
 
             if ( version.Equals( otherVersion ) )
             {
diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData/OData/ODataMultiModelApplicationModelProvider.cs b/src/AspNetCore/OData/src/Asp.Versioning.OData/OData/ODataMultiModelApplicationModelProvider.cs
@@ -152,7 +152,11 @@ private void AddRouteComponents(
         for ( var i = 0; i < models.Count; i++ )
         {
             var model = models[i];
-            var version = model.GetAnnotationValue<ApiVersionAnnotation>( model ).ApiVersion;
+
+            if ( model.GetApiVersion() is not ApiVersion version )
+            {
+                continue;
+            }
 
             if ( !mappings.TryGetValue( version, out var options ) )
             {
diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData/OData/VersionedODataTemplateTranslator.cs b/src/AspNetCore/OData/src/Asp.Versioning.OData/OData/VersionedODataTemplateTranslator.cs
@@ -39,7 +39,7 @@ public sealed class VersionedODataTemplateTranslator : IODataTemplateTranslator
         else
         {
             var model = context.Model;
-            var otherApiVersion = model.GetAnnotationValue<ApiVersionAnnotation>( model )?.ApiVersion;
+            var otherApiVersion = model.GetApiVersion();
 
             // HACK: a version-neutral endpoint can fail to match here because odata tries to match the
             // first endpoint metadata when there could be multiple. such an endpoint is expected to be
diff --git a/src/AspNetCore/OData/src/Asp.Versioning.OData/Routing/VersionedAttributeRoutingConvention.cs b/src/AspNetCore/OData/src/Asp.Versioning.OData/Routing/VersionedAttributeRoutingConvention.cs
@@ -55,7 +55,7 @@ public override bool AppliesToAction( ODataControllerActionContext context )
             return false;
         }
 
-        var apiVersion = edm.GetAnnotationValue<ApiVersionAnnotation>( edm )?.ApiVersion;
+        var apiVersion = edm.GetApiVersion();
 
         if ( apiVersion == null || !metadata.IsMappedTo( apiVersion ) )
         {
diff --git a/src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/OData/VersionedODataModelBuilderTest.cs b/src/AspNetCore/OData/test/Asp.Versioning.OData.Tests/OData/VersionedODataModelBuilderTest.cs
@@ -29,7 +29,7 @@ public void get_edm_models_should_return_expected_results()
         var model = builder.GetEdmModels().Single();
 
         // assert
-        model.GetAnnotationValue<ApiVersionAnnotation>( model ).ApiVersion.Should().Be( apiVersion );
+        model.GetApiVersion().Should().Be( apiVersion );
         modelCreated.Verify( f => f( It.IsAny<ODataModelBuilder>(), model ), Once() );
     }
 
diff --git a/src/Common/src/Common.OData.ApiExplorer/OData/DefaultModelTypeBuilder.cs b/src/Common/src/Common.OData.ApiExplorer/OData/DefaultModelTypeBuilder.cs
@@ -25,10 +25,19 @@ namespace Asp.Versioning.OData;
 public sealed class DefaultModelTypeBuilder : IModelTypeBuilder
 {
     private static Type? ienumerableOfT;
+    private readonly bool adHoc;
+    private DefaultModelTypeBuilder? adHocBuilder;
     private ConcurrentDictionary<ApiVersion, ModuleBuilder>? modules;
     private ConcurrentDictionary<ApiVersion, IDictionary<EdmTypeKey, Type>>? generatedEdmTypesPerVersion;
     private ConcurrentDictionary<ApiVersion, ConcurrentDictionary<EdmTypeKey, Type>>? generatedActionParamsPerVersion;
 
+    private DefaultModelTypeBuilder( bool adHoc ) => this.adHoc = adHoc;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DefaultModelTypeBuilder"/> class.
+    /// </summary>
+    public DefaultModelTypeBuilder() { }
+
     /// <inheritdoc />
     public Type NewStructuredType( IEdmModel model, IEdmStructuredType structuredType, Type clrType, ApiVersion apiVersion )
     {
@@ -37,6 +46,12 @@ public Type NewStructuredType( IEdmModel model, IEdmStructuredType structuredTyp
             throw new ArgumentNullException( nameof( model ) );
         }
 
+        if ( !adHoc && model.IsAdHoc() )
+        {
+            adHocBuilder ??= new( adHoc: true );
+            return adHocBuilder.NewStructuredType( model, structuredType, clrType, apiVersion );
+        }
+
         if ( structuredType == null )
         {
             throw new ArgumentNullException( nameof( structuredType ) );
@@ -54,10 +69,9 @@ public Type NewStructuredType( IEdmModel model, IEdmStructuredType structuredTyp
 
         generatedEdmTypesPerVersion ??= new();
 
-        var typeKey = new EdmTypeKey( structuredType, apiVersion );
         var edmTypes = generatedEdmTypesPerVersion.GetOrAdd( apiVersion, key => GenerateTypesForEdmModel( model, key ) );
 
-        return edmTypes[typeKey];
+        return edmTypes[new( structuredType, apiVersion )];
     }
 
     /// <inheritdoc />
@@ -68,6 +82,12 @@ public Type NewActionParameters( IEdmModel model, IEdmAction action, string cont
             throw new ArgumentNullException( nameof( model ) );
         }
 
+        if ( !adHoc && model.IsAdHoc() )
+        {
+            adHocBuilder ??= new( adHoc: true );
+            return adHocBuilder.NewActionParameters( model, action, controllerName, apiVersion );
+        }
+
         if ( action == null )
         {
             throw new ArgumentNullException( nameof( action ) );
@@ -85,7 +105,7 @@ public Type NewActionParameters( IEdmModel model, IEdmAction action, string cont
 
         generatedActionParamsPerVersion ??= new();
 
-        var paramTypes = generatedActionParamsPerVersion.GetOrAdd( apiVersion, _ => new ConcurrentDictionary<EdmTypeKey, Type>() );
+        var paramTypes = generatedActionParamsPerVersion.GetOrAdd( apiVersion, _ => new() );
         var fullTypeName = $"{controllerName}.{action.Namespace}.{controllerName}{action.Name}Parameters";
         var key = new EdmTypeKey( fullTypeName, apiVersion );
         var type = paramTypes.GetOrAdd( key, _ =>
@@ -322,8 +342,7 @@ private static Type ResolveType(
     }
 
     [MethodImpl( MethodImplOptions.AggressiveInlining )]
-    private static Type MakeEnumerable( Type itemType ) =>
-        ( ienumerableOfT ??= typeof( IEnumerable<> ) ).MakeGenericType( itemType );
+    private static Type MakeEnumerable( Type itemType ) => ( ienumerableOfT ??= typeof( IEnumerable<> ) ).MakeGenericType( itemType );
 
     [MethodImpl( MethodImplOptions.AggressiveInlining )]
     private static Type CreateTypeFromSignature( ModuleBuilder moduleBuilder, ClassSignature @class ) =>
@@ -389,7 +408,11 @@ private static IDictionary<EdmTypeKey, Type> ResolveDependencies( BuilderContext
         return edmTypes;
     }
 
-    private static PropertyBuilder AddProperty( TypeBuilder addTo, Type shouldBeAdded, string name, IReadOnlyList<CustomAttributeBuilder> customAttributes )
+    private static PropertyBuilder AddProperty(
+        TypeBuilder addTo,
+        Type shouldBeAdded,
+        string name,
+        IReadOnlyList<CustomAttributeBuilder> customAttributes )
     {
         const MethodAttributes propertyMethodAttributes = MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig;
         var field = addTo.DefineField( "_" + name, shouldBeAdded, FieldAttributes.Private );
@@ -418,7 +441,7 @@ private static PropertyBuilder AddProperty( TypeBuilder addTo, Type shouldBeAdde
         return propertyBuilder;
     }
 
-    private static AssemblyName NewAssemblyName(ApiVersion apiVersion)
+    private static AssemblyName NewAssemblyName( ApiVersion apiVersion, bool adHoc )
     {
         // this is not strictly necessary, but it makes debugging a bit easier as each
         // assembly-qualified type name provides visibility as to which api version a
@@ -455,20 +478,26 @@ private static AssemblyName NewAssemblyName(ApiVersion apiVersion)
         }
 
         name.Insert( 0, 'V' )
-            .Append( NewGuid().ToString( "n", InvariantCulture ) )
-            .Append( ".DynamicModels" );
+            .Append( NewGuid().ToString( "n", InvariantCulture ) );
+
+        if ( adHoc )
+        {
+            name.Append( ".AdHoc" );
+        }
+
+        name.Append( ".DynamicModels" );
 
         return new( name.ToString() );
     }
 
     [MethodImpl( MethodImplOptions.AggressiveInlining )]
-    private static ModuleBuilder CreateModuleForApiVersion( ApiVersion apiVersion )
+    private ModuleBuilder CreateModuleForApiVersion( ApiVersion apiVersion )
     {
-        var name = NewAssemblyName( apiVersion );
+        var assemblyName = NewAssemblyName( apiVersion, adHoc );
 #if NETFRAMEWORK
-        var assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly( name, Run );
+        var assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly( assemblyName, Run );
 #else
-        var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly( name, Run );
+        var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly( assemblyName, Run );
 #endif
         return assemblyBuilder.DefineDynamicModule( "<module>" );
     }
diff --git a/src/Common/src/Common.OData.ApiExplorer/OData/TypeExtensions.cs b/src/Common/src/Common.OData.ApiExplorer/OData/TypeExtensions.cs
@@ -3,11 +3,13 @@
 namespace Asp.Versioning.OData;
 
 #if NETFRAMEWORK
+using Microsoft.OData.Edm;
 using System.Net.Http;
 using System.Web.Http;
 #else
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.OData.Results;
+using Microsoft.OData.Edm;
 #endif
 using System.Reflection;
 using System.Reflection.Emit;
@@ -54,12 +56,11 @@ public static Type SubstituteIfNecessary( this Type type, TypeSubstitutionContex
         var openTypes = new Stack<Type>();
         var apiVersion = context.ApiVersion;
         var resolver = new StructuredTypeResolver( context.Model );
+        IEdmStructuredType? structuredType;
 
         if ( IsSubstitutableGeneric( type, openTypes, out var innerType ) )
         {
-            var structuredType = resolver.GetStructuredType( innerType! );
-
-            if ( structuredType == null )
+            if ( ( structuredType = resolver.GetStructuredType( innerType! ) ) == null )
             {
                 return type;
             }
@@ -74,14 +75,9 @@ public static Type SubstituteIfNecessary( this Type type, TypeSubstitutionContex
             return CloseGeneric( openTypes, newType );
         }
 
-        if ( CanBeSubstituted( type ) )
+        if ( CanBeSubstituted( type ) && ( structuredType = resolver.GetStructuredType( type ) ) != null )
         {
-            var structuredType = resolver.GetStructuredType( type );
-
-            if ( structuredType != null )
-            {
-                type = context.ModelTypeBuilder.NewStructuredType( context.Model, structuredType, type, apiVersion );
-            }
+            type = context.ModelTypeBuilder.NewStructuredType( context.Model, structuredType, type, apiVersion );
         }
 
         return type;
@@ -242,16 +238,15 @@ private static Type CloseGeneric( Stack<Type> openTypes, Type innerType )
         return type;
     }
 
-    private static bool CanBeSubstituted( Type type )
-    {
-        return Type.GetTypeCode( type ) == TypeCode.Object &&
-              !type.IsValueType &&
-              !type.Equals( ActionResultType ) &&
+    [MethodImpl( MethodImplOptions.AggressiveInlining )]
+    private static bool CanBeSubstituted( Type type ) =>
+        Type.GetTypeCode( type ) == TypeCode.Object &&
+        !type.IsValueType &&
+        !type.Equals( ActionResultType ) &&
 #if NETFRAMEWORK
-              !type.Equals( HttpResponseType ) &&
+        !type.Equals( HttpResponseType ) &&
 #endif
-              !type.IsODataActionParameters();
-    }
+        !type.IsODataActionParameters();
 
     internal static bool IsEnumerable(
         this Type type,
@@ -295,6 +290,7 @@ internal static bool IsEnumerable(
         return false;
     }
 
+    [MethodImpl( MethodImplOptions.AggressiveInlining )]
     private static bool IsSingleResult( this Type type ) => type.Is( SingleResultOfT );
 
     private static bool IsODataValue( this Type? type )
@@ -323,6 +319,7 @@ private static bool IsODataValue( this Type? type )
     private static bool Is( this Type type, Type typeDefinition ) =>
         type.IsGenericType && type.GetGenericTypeDefinition().Equals( typeDefinition );
 
+    [MethodImpl( MethodImplOptions.AggressiveInlining )]
     private static bool ShouldExtractInnerType( this Type type ) =>
         type.IsDelta() ||
 #if !NETFRAMEWORK
diff --git a/src/Common/src/Common.OData.ApiExplorer/OData/TypeSubstitutionContext.cs b/src/Common/src/Common.OData.ApiExplorer/OData/TypeSubstitutionContext.cs
@@ -36,7 +36,7 @@ public class TypeSubstitutionContext
     /// Gets API version associated with the source model.
     /// </summary>
     /// <value>The associated <see cref="ApiVersion">API version</see>.</value>
-    public ApiVersion ApiVersion => apiVersion ??= Model.GetAnnotationValue<ApiVersionAnnotation>( Model )?.ApiVersion ?? ApiVersion.Neutral;
+    public ApiVersion ApiVersion => apiVersion ??= Model.GetApiVersion() ?? ApiVersion.Neutral;
 
     /// <summary>
     /// Gets the model type builder used to create substitution types.
diff --git a/src/Common/src/Common.OData/Microsoft.OData.Edm/IEdmModelExtensions.cs b/src/Common/src/Common.OData/Microsoft.OData.Edm/IEdmModelExtensions.cs
@@ -0,0 +1,28 @@
+﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+namespace Microsoft.OData.Edm;
+
+using Asp.Versioning;
+using Asp.Versioning.OData;
+
+/// <summary>
+/// Provides extension methods for <see cref="IEdmModel"/>.
+/// </summary>
+public static class IEdmModelExtensions
+{
+    /// <summary>
+    /// Gets the API version associated with the Entity Data Model (EDM).
+    /// </summary>
+    /// <param name="model">The extended <see cref="IEdmModel">EDM</see>.</param>
+    /// <returns>The associated <see cref="ApiVersion">API version</see> or <c>null</c>.</returns>
+    public static ApiVersion? GetApiVersion( this IEdmModel model ) =>
+        model.GetAnnotationValue<ApiVersionAnnotation>( model )?.ApiVersion;
+
+    /// <summary>
+    /// Gets a value indicating whether the Entity Data Model (EDM) is for defined ad hoc usage.
+    /// </summary>
+    /// <param name="model">The extended <see cref="IEdmModel">EDM</see>.</param>
+    /// <returns>True if the EDM is defined for ad hoc usage; otherwise, false.</returns>
+    public static bool IsAdHoc( this IEdmModel model ) =>
+        model.GetAnnotationValue<AdHocAnnotation>( model ) is not null;
+}
diff --git a/src/Common/src/Common.OData/OData/AdHocAnnotation.cs b/src/Common/src/Common.OData/OData/AdHocAnnotation.cs
@@ -0,0 +1,15 @@
+﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+namespace Asp.Versioning.OData;
+
+/// <summary>
+/// Represents an annotation for ad hoc usage.
+/// </summary>
+public sealed class AdHocAnnotation
+{
+    /// <summary>
+    /// Gets a singleton instance of the annotation.
+    /// </summary>
+    /// <value>A singleton <see cref="AdHocAnnotation">annotation</see> instance.</value>
+    public static AdHocAnnotation Instance { get; } = new();
+}

Original file line number	Diff line number	Diff line change
`@@ -130,16 +130,12 @@ public EdmModelSelector( IEnumerable<IEdmModel> models, IApiVersionSelector apiV`
`130`	`130`
`131`	`131`	`private static void AddVersionFromModel( IEdmModel model, IList<ApiVersion> versions, IDictionary<ApiVersion, IEdmModel> collection )`
`132`	`132`	`{`
`133`		`- var annotation = model.GetAnnotationValue<ApiVersionAnnotation>( model );`
`134`		`-`
`135`		`- if ( annotation == null )`
	`133`	`+ if ( model.GetApiVersion() is not ApiVersion version )`
`136`	`134`	`{`
`137`	`135`	`var message = string.Format( CultureInfo.CurrentCulture, SR.MissingAnnotation, typeof( ApiVersionAnnotation ).Name );`
`138`	`136`	`throw new ArgumentException( message );`
`139`	`137`	`}`
`140`	`138`
`141`		`- var version = annotation.ApiVersion;`
`142`		`-`
`143`	`139`	`collection.Add( version, model );`
`144`	`140`	`versions.Add( version );`
`145`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void get_edm_models_should_return_expected_results()`
`34`	`34`	`var model = builder.GetEdmModels().Single();`
`35`	`35`
`36`	`36`	`// assert`
`37`		`- model.GetAnnotationValue<ApiVersionAnnotation>( model ).ApiVersion.Should().Be( apiVersion );`
	`37`	`+ model.GetApiVersion().Should().Be( apiVersion );`
`38`	`38`	`modelCreated.Verify( f => f( It.IsAny<ODataModelBuilder>(), model ), Times.Once() );`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ private static bool TryMatchModelVersion(`
`221`	`221`	`for ( var i = 0; i < items.Count; i++ )`
`222`	`222`	`{`
`223`	`223`	`var item = items[i];`
`224`		`- var otherApiVersion = item.Model.GetAnnotationValue<ApiVersionAnnotation>( item.Model )?.ApiVersion;`
	`224`	`+ var otherApiVersion = item.Model.GetApiVersion();`
`225`	`225`
`226`	`226`	`if ( apiVersion.Equals( otherApiVersion ) )`
`227`	`227`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public partial class ODataQueryOptionDescriptionContext`
`34`	`34`	`foreach ( var item in items )`
`35`	`35`	`{`
`36`	`36`	`var model = item.Model;`
`37`		`- var otherVersion = model.GetAnnotationValue<ApiVersionAnnotation>( model )?.ApiVersion;`
	`37`	`+ var otherVersion = model.GetApiVersion();`
`38`	`38`
`39`	`39`	`if ( version.Equals( otherVersion ) )`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,11 @@ private void AddRouteComponents(`
`152`	`152`	`for ( var i = 0; i < models.Count; i++ )`
`153`	`153`	`{`
`154`	`154`	`var model = models[i];`
`155`		`- var version = model.GetAnnotationValue<ApiVersionAnnotation>( model ).ApiVersion;`
	`155`	`+`
	`156`	`+ if ( model.GetApiVersion() is not ApiVersion version )`
	`157`	`+ {`
	`158`	`+ continue;`
	`159`	`+ }`
`156`	`160`
`157`	`161`	`if ( !mappings.TryGetValue( version, out var options ) )`
`158`	`162`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public sealed class VersionedODataTemplateTranslator : IODataTemplateTranslator`
`39`	`39`	`else`
`40`	`40`	`{`
`41`	`41`	`var model = context.Model;`
`42`		`- var otherApiVersion = model.GetAnnotationValue<ApiVersionAnnotation>( model )?.ApiVersion;`
	`42`	`+ var otherApiVersion = model.GetApiVersion();`
`43`	`43`
`44`	`44`	`// HACK: a version-neutral endpoint can fail to match here because odata tries to match the`
`45`	`45`	`// first endpoint metadata when there could be multiple. such an endpoint is expected to be`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public override bool AppliesToAction( ODataControllerActionContext context )`
`55`	`55`	`return false;`
`56`	`56`	`}`
`57`	`57`
`58`		`- var apiVersion = edm.GetAnnotationValue<ApiVersionAnnotation>( edm )?.ApiVersion;`
	`58`	`+ var apiVersion = edm.GetApiVersion();`
`59`	`59`
`60`	`60`	`if ( apiVersion == null \|\| !metadata.IsMappedTo( apiVersion ) )`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void get_edm_models_should_return_expected_results()`
`29`	`29`	`var model = builder.GetEdmModels().Single();`
`30`	`30`
`31`	`31`	`// assert`
`32`		`- model.GetAnnotationValue<ApiVersionAnnotation>( model ).ApiVersion.Should().Be( apiVersion );`
	`32`	`+ model.GetApiVersion().Should().Be( apiVersion );`
`33`	`33`	`modelCreated.Verify( f => f( It.IsAny<ODataModelBuilder>(), model ), Once() );`
`34`	`34`	`}`
`35`	`35`