updates

OData · Mar 3, 2022 · 14e5111 · 14e5111
1 parent 3792f0c
commit 14e5111
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/src/Microsoft.AspNet.OData.Shared/EdmChangedObjectCollection.cs b/src/Microsoft.AspNet.OData.Shared/EdmChangedObjectCollection.cs
@@ -101,7 +101,7 @@ internal EdmChangedObjectCollection Patch(EdmODataAPIHandler apiHandler, ODataEd
         internal EdmChangedObjectCollection CopyChangedValues(EdmODataAPIHandler apiHandler, ODataEdmAPIHandlerFactory apiHandlerFactory = null)
         {
             EdmChangedObjectCollection changedObjectCollection = new EdmChangedObjectCollection(_entityType);
-            IEdmStructuralProperty[] keys = _entityType.Key().ToArray();
+            string[] keys = _entityType.Key().Select(x=>x.Name).ToArray();
 
             foreach (IEdmChangedObject changedObj in Items)
             {
@@ -199,18 +199,18 @@ internal EdmChangedObjectCollection CopyChangedValues(EdmODataAPIHandler apiHand
             return changedObjectCollection;
         }
 
-        private static IDictionary<string, object> GetKeyValues(IEdmStructuralProperty[] keys, IEdmChangedObject changedObj)
+        private static IDictionary<string, object> GetKeyValues(string[] keys, IEdmChangedObject changedObj)
         {
             IDictionary<string, object> keyValues = new Dictionary<string, object>();
 
-            foreach (IEdmStructuralProperty key in keys)
+            foreach (string key in keys)
             {
                 object value;
-                changedObj.TryGetPropertyValue(key.Name, out value);
+                changedObj.TryGetPropertyValue(key, out value);
 
                 if (value != null)
                 {
-                    keyValues.Add(key.Name, value);
+                    keyValues.Add(key, value);
                 }
             }
 
@@ -323,7 +323,7 @@ private void ApplyProperties(EdmStructuredObject changedObj, EdmStructuredObject
         }
 
         private IEdmChangedObject HandleFailedOperation(EdmEntityObject changedObj, DataModificationOperationKind operation, IEdmStructuredObject originalObj,
-            IEdmStructuralProperty[] keys, string errorMessage, EdmODataAPIHandler apiHandler)
+            string[] keys, string errorMessage, EdmODataAPIHandler apiHandler)
         {
             IEdmChangedObject edmChangedObject = null;
             DataModificationExceptionType dataModificationExceptionType = new DataModificationExceptionType(operation);
@@ -368,13 +368,13 @@ private IEdmChangedObject HandleFailedOperation(EdmEntityObject changedObj, Data
         }
 
         //This is for ODL to work to set id as empty, because if there are missing keys, id wouldnt be set and we need to set it as empty.
-        private static void ValidateForDeletedEntityId(IEdmStructuralProperty[] keys, EdmDeltaDeletedEntityObject edmDeletedObject)
+        private static void ValidateForDeletedEntityId(string[] keys, EdmDeltaDeletedEntityObject edmDeletedObject)
         {
             bool hasNullKeys = false;
             for (int i = 0; i < keys.Length; i++)
             {
                 object value;
-                if (edmDeletedObject.TryGetPropertyValue(keys[i].Name, out value))
+                if (edmDeletedObject.TryGetPropertyValue(keys[i], out value))
                 {
                     hasNullKeys = true;
                     break;

diff --git a/src/Microsoft.AspNet.OData.Shared/EdmDeltaDeletedEntityObject.cs b/src/Microsoft.AspNet.OData.Shared/EdmDeltaDeletedEntityObject.cs
@@ -21,7 +21,6 @@ public class EdmDeltaDeletedEntityObject : EdmEntityObject, IEdmDeltaDeletedEnti
     {
         private string _id;
         private DeltaDeletedEntryReason _reason;
-        private EdmDeltaType _edmType;
         private IEdmNavigationSource _navigationSource;
 
         /// <summary>
@@ -50,7 +49,7 @@ public EdmDeltaDeletedEntityObject(IEdmEntityTypeReference entityTypeReference)
         public EdmDeltaDeletedEntityObject(IEdmEntityType entityType, bool isNullable)
             : base(entityType, isNullable)
         {
-            _edmType = new EdmDeltaType(entityType, EdmDeltaEntityKind.DeletedEntry);
+
         }
 
         /// <inheritdoc />

diff --git a/src/Microsoft.AspNet.OData.Shared/EdmDeltaDeletedLink.cs b/src/Microsoft.AspNet.OData.Shared/EdmDeltaDeletedLink.cs
@@ -21,7 +21,6 @@ public class EdmDeltaDeletedLink : EdmEntityObject, IEdmDeltaDeletedLink
         private Uri _source;
         private Uri _target;
         private string _relationship;
-        private EdmDeltaType _edmType;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EdmDeltaDeletedLink"/> class.
@@ -49,7 +48,7 @@ public EdmDeltaDeletedLink(IEdmEntityTypeReference entityTypeReference)
         public EdmDeltaDeletedLink(IEdmEntityType entityType, bool isNullable)
             : base(entityType, isNullable)
         {
-            _edmType = new EdmDeltaType(entityType, EdmDeltaEntityKind.DeletedLinkEntry);
+
         }
 
         /// <inheritdoc />

diff --git a/src/Microsoft.AspNet.OData.Shared/EdmDeltaEntityObject.cs b/src/Microsoft.AspNet.OData.Shared/EdmDeltaEntityObject.cs
@@ -17,8 +17,7 @@ namespace Microsoft.AspNet.OData
     /// </summary>
     [NonValidatingParameterBinding]
     public class EdmDeltaEntityObject : EdmEntityObject, IEdmChangedObject
-    {
-        private EdmDeltaType _edmType;
+    {        
         private IEdmNavigationSource _navigationSource;
 
         /// <summary>
@@ -47,7 +46,7 @@ public EdmDeltaEntityObject(IEdmEntityTypeReference entityTypeReference)
         public EdmDeltaEntityObject(IEdmEntityType entityType, bool isNullable)
             : base(entityType, isNullable)
         {
-            _edmType = new EdmDeltaType(entityType, EdmDeltaEntityKind.Entry);
+
         }
 
         /// <inheritdoc />