Support SingleResourceCastNode for unquoted type parameters in BindIsOf and BindCastSingleValue

sample/ODataRoutingSample/ODataRoutingSample.csproj

@@ -11,7 +11,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.6" />
-    <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
     <PackageReference Include="Microsoft.OpenApi.OData" Version="1.6.9" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />

src/Microsoft.AspNetCore.OData/Microsoft.AspNetCore.OData.csproj

@@ -28,9 +28,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.OData.ModelBuilder" Version="2.0.0" />
-    <PackageReference Include="Microsoft.OData.Core" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.Spatial" Version="8.2.3" />
+    <PackageReference Include="Microsoft.OData.Core" Version="8.4.0" />
+    <PackageReference Include="Microsoft.OData.Edm" Version="8.4.0" />
+    <PackageReference Include="Microsoft.Spatial" Version="8.4.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Microsoft.AspNetCore.OData/Query/Expressions/ExpressionBinderBase.cs

@@ -307,7 +307,20 @@ private Expression BindIsOf(SingleValueFunctionCallNode node)
             return FalseConstant;
         }
 
-        string typeName = (string)((ConstantNode)node.Parameters.Last()).Value;
+        string typeName = null;
+        QueryNode queryNode = node.Parameters.Last();
+        if (queryNode is ConstantNode constantNode)
+        {
+            typeName = (string)constantNode.Value;
+        }
+        else if (queryNode is SingleResourceCastNode singleResourceCastNode)
+        {
+            typeName = singleResourceCastNode.TypeReference.FullName();
+        }
+        else
+        {
+            throw Error.NotSupported(SRResources.QueryNodeBindingNotSupported, queryNode.Kind, nameof(BindIsOf));
+        }
 
         IEdmType edmType = Model.FindType(typeName);
         Type clrType = null;
@@ -715,7 +728,22 @@ private Expression BindCastSingleValue(SingleValueFunctionCallNode node)
         Contract.Assert(arguments.Length == 1 || arguments.Length == 2);
 
         Expression source = arguments.Length == 1 ? this.Parameter : arguments[0];
-        string targetTypeName = (string)((ConstantNode)node.Parameters.Last()).Value;
+
+        string targetTypeName = null;
+        QueryNode queryNode = node.Parameters.Last();
+        if (queryNode is ConstantNode constantNode)
+        {
+            targetTypeName = (string)constantNode.Value;
+        }
+        else if (queryNode is SingleResourceCastNode singleResourceCastNode)
+        {
+            targetTypeName = singleResourceCastNode.TypeReference.FullName();
+        }
+        else
+        {
+            throw Error.NotSupported(SRResources.QueryNodeBindingNotSupported, queryNode.Kind, nameof(BindCastSingleValue));
+        }
+
         IEdmType targetEdmType = Model.FindType(targetTypeName);
         Type targetClrType = null;
 

src/Microsoft.AspNetCore.OData/Query/Expressions/QueryBinder.SingleValueFunctionCall.cs

@@ -567,7 +567,22 @@ protected virtual Expression BindCastSingleValue(SingleValueFunctionCallNode nod
         Contract.Assert(arguments.Length == 1 || arguments.Length == 2);
 
         Expression source = arguments.Length == 1 ? context.CurrentParameter : arguments[0];
-        string targetTypeName = (string)((ConstantNode)node.Parameters.Last()).Value;
+
+        string targetTypeName = null;
+        QueryNode queryNode = node.Parameters.Last();
+        if (queryNode is ConstantNode constantNode)
+        {
+            targetTypeName = (string)constantNode.Value;
+        }
+        else if (queryNode is SingleResourceCastNode singleResourceCastNode)
+        {
+            targetTypeName = singleResourceCastNode.TypeReference.FullName();
+        }
+        else
+        {
+            throw Error.NotSupported(SRResources.QueryNodeBindingNotSupported, queryNode.Kind, nameof(BindCastSingleValue));
+        }
+
         IEdmType targetEdmType = context.Model.FindType(targetTypeName);
         Type targetClrType = null;
 
@@ -650,7 +665,20 @@ protected virtual Expression BindIsOf(SingleValueFunctionCallNode node, QueryBin
             return FalseConstant;
         }
 
-        string typeName = (string)((ConstantNode)node.Parameters.Last()).Value;
+        string typeName = null;
+        QueryNode queryNode = node.Parameters.Last();
+        if (queryNode is ConstantNode constantNode)
+        {
+            typeName = (string)constantNode.Value;
+        }
+        else if (queryNode is SingleResourceCastNode singleResourceCastNode)
+        {
+            typeName = singleResourceCastNode.TypeReference.FullName();
+        }
+        else
+        {
+            throw Error.NotSupported(SRResources.QueryNodeBindingNotSupported, queryNode.Kind, nameof(BindIsOf));
+        }
 
         IEdmType edmType = context.Model.FindType(typeName);
         Type clrType = null;

test/Microsoft.AspNetCore.OData.E2E.Tests/IsOfAndCast/IsOfAndCastController.cs

@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+// <copyright file="IsOfAndCastController.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved.
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
+
+namespace Microsoft.AspNetCore.OData.E2E.Tests.IsOfAndCast;
+
+public class IsOfAndCastController : ODataController
+{
+    private static IsOfAndCastDataSource _dataSource = new IsOfAndCastDataSource();
+
+    [EnableQuery]
+    [HttpGet("odata/products")]
+    public IActionResult GetProducts()
+    {
+        return Ok(_dataSource.Products);
+    }
+
+    [EnableQuery]
+    [HttpGet("odata/orders")]
+    public IActionResult GetOrders()
+    {
+        return Ok(_dataSource.Orders);
+    }
+}

test/Microsoft.AspNetCore.OData.E2E.Tests/IsOfAndCast/IsOfAndCastDataModel.cs

@@ -0,0 +1,59 @@
+//-----------------------------------------------------------------------------
+// <copyright file="IsOfAndCastDataModel.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved.
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.OData.E2E.Tests.IsOfAndCast;
+
+public class Product
+{
+    [Key]
+    public int ID { get; set; }
+    public string Name { get; set; }
+    public Domain Domain { get; set; }
+    public Double Weight { get; set; }
+}
+
+[Flags]
+public enum Domain
+{
+    Military = 1,
+    Civil = 2,
+    Both = 3,
+}
+
+public class AirPlane : Product
+{
+    public int Speed { get; set; }
+    public string Model { get; set; }
+}
+
+public class JetPlane : AirPlane
+{
+    public string JetType { get; set; }
+}
+
+public class Order
+{
+    [Key]
+    public int OrderID { get; set; }
+    public Address Location { get; set; }
+    public IList<Product> Products { get; set; }
+}
+
+public class Address
+{
+    public string City { get; set; }
+}
+
+public class HomeAddress : Address
+{
+    public string HomeNo { get; set; }
+}
+

test/Microsoft.AspNetCore.OData.E2E.Tests/IsOfAndCast/IsOfAndCastDataSource.cs

@@ -0,0 +1,106 @@
+//-----------------------------------------------------------------------------
+// <copyright file="IsOfAndCastDataSource.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved.
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.OData.E2E.Tests.IsOfAndCast;
+
+public class IsOfAndCastDataSource
+{
+    public IsOfAndCastDataSource()
+    {
+        ResetData();
+        InitializeData();
+    }
+
+    private void ResetData()
+    {
+        this.Products?.Clear();
+        this.Orders?.Clear();
+    }
+
+    public IList<Product> Products { get; private set; }
+    public IList<Order> Orders { get; private set; }
+
+    private void InitializeData()
+    {
+        this.Products = new List<Product>
+        {
+            new Product
+            {
+                ID = 1,
+                Name = "Product1",
+                Domain = Domain.Civil,
+                Weight = 1000
+            },
+            new Product 
+            {
+                ID = 2,
+                Name = "Product2",
+                Domain = Domain.Military,
+                Weight = 2000,
+            },
+            new AirPlane
+            {
+                ID = 3,
+                Name = "Product3",
+                Domain = Domain.Both,
+                Weight = 1500,
+                Speed = 900,
+                Model = "Boeing 737"
+            },
+            new JetPlane
+            {
+                ID = 4,
+                Name = "Product4",
+                Domain = Domain.Civil,
+                Weight = 1200,
+                Speed = 1000,
+                Model = "Airbus A320",
+                JetType = "Turbofan"
+            },
+            new JetPlane
+            {
+                ID = 5,
+                Name = "Product5",
+                Domain = Domain.Military,
+                Weight = 1800,
+                Speed = 1500,
+                Model = "F-22 Raptor",
+                JetType = "Afterburning Turbofan"
+            }
+        };
+
+        this.Orders = new List<Order>
+        {
+            new Order
+            {
+                OrderID = 1,
+                Location = new Address { City = "City1" },
+                Products = new List<Product> { this.Products[0], this.Products[2] }
+            },
+            new Order
+            {
+                OrderID = 2,
+                Location = new HomeAddress { City = "City2", HomeNo = "100NO" },
+                Products = new List<Product> { this.Products[1], this.Products[3], this.Products[4] }
+            },
+            new Order
+            {
+                OrderID = 3,
+                Location = new Address { City = "City3" },
+                Products = new List<Product> { this.Products[0], this.Products[2], this.Products[3] }
+            },
+            new Order
+            {
+                OrderID = 4,
+                Location = new HomeAddress { City = "City4", HomeNo = "200NO" },
+                Products = new List<Product> { this.Products[1], this.Products[4] }
+            }
+        };
+    }
+}

test/Microsoft.AspNetCore.OData.E2E.Tests/IsOfAndCast/IsOfAndCastEdmModel.cs

@@ -0,0 +1,26 @@
+//-----------------------------------------------------------------------------
+// <copyright file="IsOfAndCastEdmModel.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved.
+//      See License.txt in the project root for license information.
+// </copyright>
+//------------------------------------------------------------------------------
+
+using Microsoft.OData.Edm;
+using Microsoft.OData.ModelBuilder;
+
+namespace Microsoft.AspNetCore.OData.E2E.Tests.IsOfAndCast;
+
+public class IsOfAndCastEdmModel
+{
+    public static IEdmModel GetEdmModel()
+    {
+        var builder = new ODataConventionModelBuilder();
+        builder.EntitySet<Order>("Orders");
+        builder.EntitySet<Product>("Products");
+        var airPlaneType = builder.EntityType<AirPlane>();
+        airPlaneType.DerivesFrom<Product>();
+
+        builder.Namespace = typeof(Product).Namespace;
+        return builder.GetEdmModel();
+    }
+}