FilterBinder add support extension method

Author: genusP

src/Microsoft.AspNet.OData.Shared/Query/Expressions/FilterBinder.cs

@@ -11,6 +11,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNet.OData.Adapters;
+using Microsoft.AspNet.OData.Builder;
 using Microsoft.AspNet.OData.Common;
 using Microsoft.AspNet.OData.Formatter;
 using Microsoft.AspNet.OData.Interfaces;
@@ -633,15 +634,19 @@ public virtual Expression BindSingleComplexNode(SingleComplexNode singleComplexN
 
         private Expression CreatePropertyAccessExpression(Expression source, IEdmProperty property, string propertyPath = null)
         {
-            string propertyName = EdmLibHelpers.GetClrPropertyName(property, Model);
+            PropertyDescriptor propertyDescriptor = EdmLibHelpers.GetClrPropertyDescriptor(property, Model);
+            string propertyName = propertyDescriptor!=null
+                                    ? propertyDescriptor.MemberInfo.Name
+                                    : EdmLibHelpers.GetClrPropertyName(property, Model);
             propertyPath = propertyPath ?? propertyName;
 
             if (QuerySettings.HandleNullPropagation == HandleNullPropagationOption.True && IsNullable(source.Type) && source != _lambdaParameters[ODataItParameterName])
             {
                 var cleanSource = RemoveInnerNullPropagation(source);
                 Expression propertyAccessExpression = null;
 
-                propertyAccessExpression = GetFlattenedPropertyExpression(propertyPath) ?? Expression.Property(cleanSource, propertyName);
+                propertyAccessExpression = GetFlattenedPropertyExpression(propertyPath) 
+                                                ?? CreatePropertyAccessExpression(source, propertyName, propertyDescriptor);
 
                 // source.property => source == null ? null : [CastToNullable]RemoveInnerNullPropagation(source).property
                 // Notice that we are checking if source is null already. so we can safely remove any null checks when doing source.Property
@@ -655,10 +660,24 @@ private Expression CreatePropertyAccessExpression(Expression source, IEdmPropert
             }
             else
             {
-                return GetFlattenedPropertyExpression(propertyPath) ?? ConvertNonStandardPrimitives(Expression.Property(source, propertyName));
+                return GetFlattenedPropertyExpression(propertyPath) 
+                        ?? ConvertNonStandardPrimitives(CreatePropertyAccessExpression(source, propertyName, propertyDescriptor));
             }
         }
 
+        private Expression CreatePropertyAccessExpression(Expression source, string propertyName, PropertyDescriptor propertyDescriptor)
+        {
+            if (propertyDescriptor != null)
+            {
+                if (propertyDescriptor.MethodInfo != null)
+                    return Expression.Call(null, propertyDescriptor.MethodInfo, source);
+                else
+                    return Expression.Property(source, propertyDescriptor.PropertyInfo);
+            }
+            else
+                return Expression.Property(source, propertyName);
+        }
+
         /// <summary>
         /// Binds a <see cref="UnaryOperatorNode"/> to create a LINQ <see cref="Expression"/> that
         /// represents the semantics of the <see cref="UnaryOperatorNode"/>.