Cleanup ODataIdResolvers and E2E tests

src/Microsoft.AspNet.OData.Shared/Common/ODataPathHelper.cs

@@ -0,0 +1,70 @@
+//-----------------------------------------------------------------------------
+// <copyright file="ODataPathHelper.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;
+using System.Linq;
+using Microsoft.OData.UriParser;
+
+namespace Microsoft.AspNet.OData.Common
+{
+    /// <summary>
+    /// Helper methods for <see cref="ODataPath"/>.
+    /// </summary>
+    internal static class ODataPathHelper
+    {
+        /// <summary>
+        /// Get the keys from a <see cref="KeySegment"/>.
+        /// </summary>
+        /// <param name="keySegment">The <see cref="KeySegment"/> to extract the keys.</param>
+        /// <returns>Dictionary of keys.</returns>
+        public static Dictionary<string, object> KeySegmentAsDictionary(KeySegment keySegment)
+        {
+            if (keySegment == null)
+            {
+                throw Error.ArgumentNull(nameof(keySegment));
+            }
+
+            return keySegment.Keys.ToDictionary(d => d.Key, d => d.Value);
+        }
+
+        /// <summary>
+        /// Get the position of the next <see cref="KeySegment"/> in a list of <see cref="ODataPathSegment"/>.
+        /// </summary>
+        /// <param name="pathSegments">List of <see cref="ODataPathSegment"/>.</param>
+        /// <param name="currentPosition">Current position in the list of <see cref="ODataPathSegment"/>.</param>
+        /// <returns>Position of the next <see cref="KeySegment"/> if it exists, or -1 otherwise.</returns>
+        public static int GetNextKeySegmentPosition(IReadOnlyList<ODataPathSegment> pathSegments, int currentPosition)
+        {
+            if (pathSegments == null)
+            {
+                throw Error.ArgumentNull(nameof(pathSegments));
+            }
+
+            if (currentPosition < 0 || currentPosition >= pathSegments.Count)
+            {
+                return -1;
+            }
+
+            if (pathSegments[currentPosition] is KeySegment)
+            {
+                currentPosition++;
+            }
+
+            for (int i = currentPosition; i < pathSegments.Count; i++)
+            {
+                ODataPathSegment currentSegment = pathSegments[i];
+
+                if (currentSegment is KeySegment)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+    }
+}

src/Microsoft.AspNet.OData.Shared/Extensions/ODataPathExtensions.cs

@@ -6,51 +6,84 @@
 //------------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.AspNet.OData.Common;
 using Microsoft.OData.UriParser;
 
 namespace Microsoft.AspNet.OData.Extensions
 {
+    /// <summary>
+    /// Extensions method for <see cref="ODataPath"/>.
+    /// </summary>
     internal static class ODataPathExtensions
     {
-        public static Dictionary<string, object> GetKeys(this ODataPath path)
+        /// <summary>
+        /// Get keys from the last <see cref="KeySegment"/>.
+        /// </summary>
+        /// <param name="path"><see cref="ODataPath"/>.</param>
+        /// <returns>Dictionary of keys.</returns>
+        internal static Dictionary<string, object> GetKeys(this ODataPath path)
         {
+            Dictionary<string, object> keys = new Dictionary<string, object>();
+
             if (path == null)
             {
                 throw Error.ArgumentNull(nameof(path));
             }
 
-            Dictionary<string, object> keys = new Dictionary<string, object>();
-
-            // Books(1)/Authors(1000)/Namespace.SpecialAuthor
-            if (path.LastSegment is TypeSegment)
+            if (path.Count == 0)
             {
-                ODataPath pathWithoutLastSegmentCastType = path.TrimEndingTypeSegment();
-
-                if (pathWithoutLastSegmentCastType.LastSegment is KeySegment)
-                {
-                    keys = GetKeysFromKeySegment(pathWithoutLastSegmentCastType.LastSegment as KeySegment);
-                }
+                return keys;
             }
-            // Books(1)/Authors/Namespace.SpecialAuthor/(1000)
-            else if (path.LastSegment is KeySegment)
+
+            List<ODataPathSegment> pathSegments = path.AsList();
+
+            KeySegment keySegment = pathSegments.OfType<KeySegment>().LastOrDefault();
+
+            if (keySegment == null)
             {
-                keys = GetKeysFromKeySegment(path.LastSegment as KeySegment);
+                return keys;
             }
 
+            keys = ODataPathHelper.KeySegmentAsDictionary(keySegment);
+
             return keys;
         }
 
-        private static Dictionary<string, object> GetKeysFromKeySegment(KeySegment keySegment)
+        /// <summary>
+        /// Return the last segment in the path, which is not a <see cref="TypeSegment"/> or <see cref="KeySegment"/>.
+        /// </summary>
+        /// <param name="path">The <see cref="ODataPath"/>.</param>
+        /// <returns>An <see cref="ODataPathSegment"/>.</returns>
+        public static ODataPathSegment GetLastNonTypeNonKeySegment(this ODataPath path)
         {
-            Dictionary<string, object> keys = new Dictionary<string, object>();
+            if (path == null)
+            {
+                throw Error.ArgumentNull(nameof(path));
+            }
+
+            // If the path is Employees(2)/NewFriends(2)/Namespace.MyNewFriend where Namespace.MyNewFriend is a type segment,
+            // This method will return NewFriends NavigationPropertySegment.
 
-            foreach (KeyValuePair<string, object> kvp in keySegment.Keys)
+            List<ODataPathSegment> pathSegments = path.AsList();
+            int position = path.Count - 1;
+
+            while (position >= 0 && (pathSegments[position] is TypeSegment || pathSegments[position] is KeySegment))
             {
-                keys.Add(kvp.Key, kvp.Value);
+                --position;
             }
 
-            return keys;
+            return position < 0 ? null : pathSegments[position];
+        }
+
+        /// <summary>
+        /// Returns a list of <see cref="ODataPathSegment"/> in an <see cref="ODataPath"/>.
+        /// </summary>
+        /// <param name="path">The <see cref="ODataPath"/>.</param>
+        /// <returns>List of <see cref="ODataPathSegment"/>.</returns>
+        public static List<ODataPathSegment> GetSegments(this ODataPath path)
+        {
+            return path.AsList();
         }
     }
 }

src/Microsoft.AspNet.OData.Shared/Microsoft.AspNet.OData.Shared.projitems

@@ -25,6 +25,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ClrEnumMemberAnnotation.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\CollectionExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\ListWrapperCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Common\ODataPathHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\PropertyHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\TaskHelpers.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\Error.cs" />

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore/Microsoft.Test.E2E.AspNetCore.OData.csproj

@@ -1402,30 +1402,21 @@
     <Compile Include="..\OpenType\TypedTest.cs">
       <Link>OpenType\TypedTest.cs</Link>
     </Compile>
-    <Compile Include="..\BulkOperation\BulkInsertDataModel.cs">
-      <Link>BulkOperation\BulkInsertDataModel.cs</Link>
+    <Compile Include="..\BulkOperation\BulkOperationTest.cs">
+      <Link>BulkOperation\BulkOperationTest.cs</Link>
     </Compile>
-    <Compile Include="..\BulkOperation\BulkInsertEdmModel.cs">
-      <Link>BulkOperation\BulkInsertEdmModel.cs</Link>
+    <Compile Include="..\BulkOperation\BulkOperationDataModel.cs">
+      <Link>BulkOperation\BulkOperationDataModel.cs</Link>
     </Compile>
-    <Compile Include="..\BulkOperation\BulkInsertController.cs">
-      <Link>BulkOperation\BulkInsertController.cs</Link>
+    <Compile Include="..\BulkOperation\BulkOperationEdmModel.cs">
+      <Link>BulkOperation\BulkOperationEdmModel.cs</Link>
+    </Compile>
+    <Compile Include="..\BulkOperation\BulkOperationController.cs">
+      <Link>BulkOperation\BulkOperationController.cs</Link>
     </Compile>
     <Compile Include="..\BulkOperation\BulkOperationPatchHandlers.cs">
       <Link>BulkOperation\BulkOperationPatchHandlers.cs</Link>
     </Compile>
-	<Compile Include="..\BulkOperation\BulkInsertDataModel.cs">
-		<Link>BulkOperation\BulkInsertDataModel.cs</Link>
-	</Compile>
-	<Compile Include="..\BulkOperation\BulkInsertEdmModel.cs">
-		<Link>BulkOperation\BulkInsertEdmModel.cs</Link>
-	</Compile>
-	<Compile Include="..\BulkOperation\BulkInsertController.cs">
-		<Link>BulkOperation\BulkInsertController.cs</Link>
-	</Compile>
-	<Compile Include="..\BulkOperation\BulkOperationPatchHandlers.cs">
-		<Link>BulkOperation\BulkOperationPatchHandlers.cs</Link>
-	</Compile>
     <Compile Include="..\ParameterAlias\ParameterAliasDataSource.cs">
       <Link>ParameterAlias\ParameterAliasDataSource.cs</Link>
     </Compile>

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNetCore3x/BulkOperation/EFTests/BulkOperationControllerEF.cs

@@ -13,25 +13,24 @@
 using Microsoft.AspNet.OData.Extensions;
 using Microsoft.AspNet.OData.Routing;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Test.E2E.AspNet.OData.BulkOperation;
 using Microsoft.Test.E2E.AspNet.OData.Common.Controllers;
 using Xunit;
 using static Microsoft.Test.E2E.AspNet.OData.BulkOperation.APIHandlerFactoryEF;
 
-namespace Microsoft.Test.E2E.AspNet.OData.BulkInsert
+namespace Microsoft.Test.E2E.AspNet.OData.BulkOperation
 {
     public class EmployeesControllerEF : TestODataController
     {
         public EmployeesControllerEF()
         {
-            
+
         }
-                
+
         public static List<Employee> employees;
         public static List<Friend> friends;
 
         internal DbSet<Employee> GenerateData(EmployeeDBContext context)
-        {            
+        {
             if (context.Employees.Any())
             {
                 return context.Employees;
@@ -59,7 +58,7 @@ internal DbSet<Friend> GenerateDataOrders(EmployeeDBContext context)
             }
 
             friends = new List<Friend>();
-            friends.Add(new Friend { Id = 1, Age = 10 ,  Orders = new List<Order>() { new Order { Id = 1, Price = 5 }, new Order { Id = 2, Price = 5 } } });
+            friends.Add(new Friend { Id = 1, Age = 10, Orders = new List<Order>() { new Order { Id = 1, Price = 5 }, new Order { Id = 2, Price = 5 } } });
             friends.Add(new Friend { Id = 2, Age = 20, Orders = new List<Order>() { new Order { Id = 10, Price = 5 }, new Order { Id = 20, Price = 5 } } });
             friends.Add(new Friend { Id = 3, Age = 30, Orders = new List<Order>() { new Order { Id = 3, Price = 5 }, new Order { Id = 4, Price = 5 } } });
             friends.Add(new Friend { Id = 4, Age = 40, Orders = new List<Order>() { new Order { Id = 30, Price = 5 }, new Order { Id = 40, Price = 5 } } });