Temporarily remove typecasts from TargetPath used for fetching annotations until we have a fix in the Edm library

Author: millicentachieng

src/Microsoft.OpenApi.OData.Reader/Edm/EdmAnnotationExtensions.cs

@@ -280,28 +280,6 @@ public static IEnumerable<T> GetCollection<T>(this IEdmModel model, IEdmVocabula
             });
         }
 
-        /// <summary>
-        /// Gets the collection of record value (a complex type) for the given targetPath.
-        /// </summary>
-        /// <typeparam name="T">The CLR mapping type.</typeparam>
-        /// <param name="model">The Edm model.</param>
-        /// <param name="targetPath">The string representation of the Edm target path.</param>
-        /// <param name="qualifiedName">The Term qualified name.</param>
-        /// <returns></returns>
-        public static IEnumerable<T> GetCollection<T>(this IEdmModel model, string targetPath, string qualifiedName)
-            where T : IRecord, new()
-        {
-            Utils.CheckArgumentNull(model, nameof(model));
-            Utils.CheckArgumentNull(targetPath, nameof(targetPath));
-            Utils.CheckArgumentNull(qualifiedName, nameof(qualifiedName));
-
-            IEdmTargetPath target = model.GetTargetPath(targetPath);
-            if (target == null)
-                return null;
-
-            return model.GetCollection<T>(target, qualifiedName);
-        }
-
         /// <summary>
         /// Gets the links record value (a complex type) for the given <see cref="IEdmVocabularyAnnotatable"/>.
         /// </summary>
@@ -329,7 +307,11 @@ public static Link GetLinkRecord(this IEdmModel model, string targetPath, string
             Utils.CheckArgumentNull(model, nameof(model));
             Utils.CheckArgumentNull(targetPath, nameof(targetPath));
 
-            return model.GetCollection<Link>(targetPath, CoreConstants.Links)?.FirstOrDefault(x => x.Rel == linkRel);
+            IEdmTargetPath target = model.GetTargetPath(targetPath);
+            if (target == null)
+                return null;
+
+            return model.GetLinkRecord(target, linkRel);
         }
 
         /// <summary>

src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyBaseOperationHandler.cs

@@ -17,8 +17,8 @@ internal abstract class ComplexPropertyBaseOperationHandler : OperationHandler
     /// <inheritdoc/>
     protected override void Initialize(ODataContext context, ODataPath path)
     {
+        base.Initialize(context, path);
         ComplexPropertySegment = path.LastSegment as ODataComplexPropertySegment ?? throw Error.ArgumentNull(nameof(path));
-        base.SetTargetPath();
     }
 
     /// <inheritdoc/>

src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs

@@ -129,17 +129,6 @@ protected override void SetExternalDocs(OpenApiOperation operation)
             }
         }
 
-        /// <inheritdoc/>
-        protected override void SetTargetPath()
-        {
-            base.SetTargetPath();
-            if (Path.LastSegment is ODataRefSegment)
-            {
-                int lastIndex = TargetPath.LastIndexOf('/');
-                TargetPath = lastIndex > 0 ? TargetPath.Substring(0, lastIndex) : TargetPath;
-            }
-        }
-
         /// <summary>
         /// Retrieves the CRUD restrictions annotations for the navigation property
         /// in context, given a capability annotation term.

src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs

@@ -303,11 +303,16 @@ protected virtual void SetCustomLinkRelType()
         protected virtual void SetTargetPath()
         {
             var targetPath = new StringBuilder(Context.Model.EntityContainer.FullName());
-            foreach (var segment in Path.Segments.Where(segment => segment is not ODataKeySegment))
+
+            bool skipLastSegment = Path.LastSegment is ODataRefSegment;
+            foreach (var segment in Path.Segments.Where(segment => segment is not ODataKeySegment 
+                && segment is not ODataTypeCastSegment // TODO: Presence of type casts in the TargetPath is currently throwing exceptions in Edm lib. Remove after update.
+                && !(skipLastSegment && segment == Path.LastSegment)))
             {
                 targetPath.Append($"/{segment.Identifier}");
             }
             TargetPath = targetPath.ToString();
         }
+
     }
 }