update for odataid _temp

src/Microsoft.AspNet.OData.Shared/EdmChangedObjectCollection.cs

@@ -398,25 +398,25 @@ private static void ValidateForDeletedEntityId(IEdmStructuralProperty[] keys, Ed
         /// <returns>ChangedObjectCollection response</returns>
         internal EdmChangedObjectCollection Patch(ICollection<IEdmStructuredObject> originalCollection)
         {
-            EdmPatchMethodHandler patchHandler = new DefaultEdmPatchMethodHandler(originalCollection, _entityType);
+            EdmODataAPIHandler apiHandler = new DefaultEdmODataAPIHandler(originalCollection, _entityType);
 
-            return CopyChangedValues(patchHandler);
+            return CopyChangedValues(apiHandler);
         }
 
         /// <summary>
         /// Patch for EdmChangedObjectCollection, a collection for IEdmChangedObject 
         /// </summary>
         /// <returns>ChangedObjectCollection response</returns>
-        public EdmChangedObjectCollection Patch(EdmPatchMethodHandler patchHandler)
+        public EdmChangedObjectCollection Patch(EdmODataAPIHandler apiHandler)
         {            
-            return CopyChangedValues(patchHandler);
+            return CopyChangedValues(apiHandler);
         }
 
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling")]
-        internal EdmChangedObjectCollection CopyChangedValues(EdmPatchMethodHandler patchHandler)
+        internal EdmChangedObjectCollection CopyChangedValues(EdmODataAPIHandler apiHandler)
         {
             EdmChangedObjectCollection changedObjectCollection = new EdmChangedObjectCollection(_entityType);
             IEdmStructuralProperty[] keys = _entityType.Key().ToArray();
@@ -438,13 +438,13 @@ internal EdmChangedObjectCollection CopyChangedValues(EdmPatchMethodHandler patc
                     {
                         operation = DataModificationOperationKind.Delete;
 
-                        if (patchHandler.TryDelete(keyValues, out errorMessage) != PatchStatus.Success)
+                        if (apiHandler.TryDelete(keyValues, out errorMessage) != ODataAPIResponseStatus.Success)
                         {
                             //Handle Failed Operation - Delete                            
-                            PatchStatus patchStatus = patchHandler.TryGet(keyValues, out original, out getErrorMessage);
-                            if (patchStatus == PatchStatus.Success)
+                            ODataAPIResponseStatus ODataAPIResponseStatus = apiHandler.TryGet(keyValues, out original, out getErrorMessage);
+                            if (ODataAPIResponseStatus == ODataAPIResponseStatus.Success)
                             {
-                                IEdmChangedObject changedObject = HandleFailedOperation(deletedObj, operation, original, keys, errorMessage, patchHandler);
+                                IEdmChangedObject changedObject = HandleFailedOperation(deletedObj, operation, original, keys, errorMessage, apiHandler);
                                 changedObjectCollection.Add(changedObject);
                                 continue;
                             }
@@ -456,42 +456,42 @@ internal EdmChangedObjectCollection CopyChangedValues(EdmPatchMethodHandler patc
                     {
                         EdmEntityObject deltaEntityObject = changedObj as EdmEntityObject;
 
-                        PatchStatus patchStatus = patchHandler.TryGet(keyValues, out original, out getErrorMessage);
+                        ODataAPIResponseStatus ODataAPIResponseStatus = apiHandler.TryGet(keyValues, out original, out getErrorMessage);
 
-                        if (patchStatus == PatchStatus.NotFound)
+                        if (ODataAPIResponseStatus == ODataAPIResponseStatus.NotFound)
                         {
                             operation = DataModificationOperationKind.Insert;
 
-                            if (patchHandler.TryCreate(changedObj, out original, out errorMessage) != PatchStatus.Success)
+                            if (apiHandler.TryCreate(changedObj, out original, out errorMessage) != ODataAPIResponseStatus.Success)
                             {
                                 //Handle failed Opreataion - create
-                                IEdmChangedObject changedObject = HandleFailedOperation(deltaEntityObject, operation, original, keys, errorMessage, patchHandler);
+                                IEdmChangedObject changedObject = HandleFailedOperation(deltaEntityObject, operation, original, keys, errorMessage, apiHandler);
                                 changedObjectCollection.Add(changedObject);
                                 continue;
                             }
                         }
-                        else if (patchStatus == PatchStatus.Success)
+                        else if (ODataAPIResponseStatus == ODataAPIResponseStatus.Success)
                         {
                             operation = DataModificationOperationKind.Update;
                         }
                         else
                         {
                             //Handle failed operation 
-                            IEdmChangedObject changedObject = HandleFailedOperation(deltaEntityObject, operation, null, keys, getErrorMessage, patchHandler);
+                            IEdmChangedObject changedObject = HandleFailedOperation(deltaEntityObject, operation, null, keys, getErrorMessage, apiHandler);
                             changedObjectCollection.Add(changedObject);
                             continue;
                         }                                              
 
                         //Patch for addition/update. 
-                        PatchItem(deltaEntityObject, original as EdmStructuredObject, patchHandler);
+                        PatchItem(deltaEntityObject, original as EdmStructuredObject, apiHandler);
 
                         changedObjectCollection.Add(changedObj);
                     }
                 }
                 catch (Exception ex)
                 {
                     //Handle Failed Operation
-                    IEdmChangedObject changedObject = HandleFailedOperation(changedObj as EdmEntityObject, operation, originalObj, keys, ex.Message, patchHandler);
+                    IEdmChangedObject changedObject = HandleFailedOperation(changedObj as EdmEntityObject, operation, originalObj, keys, ex.Message, apiHandler);
 
                     Contract.Assert(changedObject != null);
                     changedObjectCollection.Add(changedObject);
@@ -519,31 +519,31 @@ private static IDictionary<string, object> GetKeyValues(IEdmStructuralProperty [
             return keyValues;
         }
 
-        private void PatchItem(EdmStructuredObject changedObj, EdmStructuredObject originalObj, EdmPatchMethodHandler patchHandler)
+        private void PatchItem(EdmStructuredObject changedObj, EdmStructuredObject originalObj, EdmODataAPIHandler apiHandler)
         {
             foreach (string propertyName in changedObj.GetChangedPropertyNames())
             {
-                ApplyProperties(changedObj, originalObj, propertyName, patchHandler);
+                ApplyProperties(changedObj, originalObj, propertyName, apiHandler);
             }
 
             foreach (string propertyName in changedObj.GetUnchangedPropertyNames())
             {
-                ApplyProperties(changedObj, originalObj, propertyName, patchHandler);
+                ApplyProperties(changedObj, originalObj, propertyName, apiHandler);
             }
         }
 
-        private void ApplyProperties(EdmStructuredObject changedObj, EdmStructuredObject originalObj, string propertyName, EdmPatchMethodHandler patchHandler)
+        private void ApplyProperties(EdmStructuredObject changedObj, EdmStructuredObject originalObj, string propertyName, EdmODataAPIHandler apiHandler)
         {
             object value;
             if (changedObj.TryGetPropertyValue(propertyName, out value))
             {
                 EdmChangedObjectCollection changedColl = value as EdmChangedObjectCollection;
                 if (changedColl != null)
                 {
-                    EdmPatchMethodHandler patchHandlerNested = patchHandler.GetNestedPatchHandler(originalObj, propertyName);
-                    if (patchHandlerNested != null)
+                    EdmODataAPIHandler apiHandlerNested = apiHandler.GetNestedHandler(originalObj, propertyName);
+                    if (apiHandlerNested != null)
                     {
-                        changedColl.Patch(patchHandlerNested);
+                        changedColl.Patch(apiHandlerNested);
                     }
                     else
                     {
@@ -581,7 +581,7 @@ private void ApplyProperties(EdmStructuredObject changedObj, EdmStructuredObject
                             originalObj.TrySetPropertyValue(propertyName, origStructuredObj);
                         }
 
-                        PatchItem(structuredObj, origStructuredObj, patchHandler);                        
+                        PatchItem(structuredObj, origStructuredObj, apiHandler);                        
                     }
                     else
                     {
@@ -592,7 +592,7 @@ private void ApplyProperties(EdmStructuredObject changedObj, EdmStructuredObject
         }
 
         private IEdmChangedObject HandleFailedOperation(EdmEntityObject changedObj, DataModificationOperationKind operation, IEdmStructuredObject originalObj, 
-            IEdmStructuralProperty[] keys, string errorMessage, EdmPatchMethodHandler patchHandler)
+            IEdmStructuralProperty[] keys, string errorMessage, EdmODataAPIHandler apiHandler)
         {
             IEdmChangedObject edmChangedObject = null;
             DataModificationExceptionType dataModificationExceptionType = new DataModificationExceptionType(operation);
@@ -608,7 +608,7 @@ private IEdmChangedObject HandleFailedOperation(EdmEntityObject changedObj, Data
                 case DataModificationOperationKind.Insert:
                     {
                         EdmDeltaDeletedEntityObject edmDeletedObject = new EdmDeltaDeletedEntityObject(EntityType);
-                        PatchItem(edmDeletedObject, changedObj, patchHandler);
+                        PatchItem(edmDeletedObject, changedObj, apiHandler);
 
                         ValidateForDeletedEntityId(keys, edmDeletedObject);
 
@@ -622,7 +622,7 @@ private IEdmChangedObject HandleFailedOperation(EdmEntityObject changedObj, Data
                 case DataModificationOperationKind.Delete:                
                     {
                         EdmDeltaEntityObject edmEntityObject = new EdmDeltaEntityObject(EntityType);
-                        PatchItem(originalObj as EdmStructuredObject, edmEntityObject, patchHandler);
+                        PatchItem(originalObj as EdmStructuredObject, edmEntityObject, apiHandler);
 
                         edmEntityObject.TransientInstanceAnnotationContainer = changedObj.TransientInstanceAnnotationContainer;
                         edmEntityObject.PersistentInstanceAnnotationsContainer = changedObj.PersistentInstanceAnnotationsContainer;