Merge branch 'support/v1' into fix/port-590

Signed-off-by: GitHub <[email protected]>

Author: baywet

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

@@ -23,9 +23,9 @@ protected override void Initialize(ODataContext context, ODataPath path)
     {
         base.Initialize(context, path);
 
-        _updateRestrictions = Context.Model.GetRecord<UpdateRestrictionsType>(TargetPath, CapabilitiesConstants.UpdateRestrictions);
-        var complexPropertyUpdateRestrictions = Context.Model.GetRecord<UpdateRestrictionsType>(ComplexPropertySegment.Property, CapabilitiesConstants.UpdateRestrictions);
-        _updateRestrictions?.MergePropertiesIfNull(complexPropertyUpdateRestrictions);
+        _updateRestrictions = Context.Model.GetRecord<UpdateRestrictionsType>(TargetPath, CapabilitiesConstants.UpdateRestrictions);
+        var complexPropertyUpdateRestrictions = Context.Model.GetRecord<UpdateRestrictionsType>(ComplexPropertySegment.Property, CapabilitiesConstants.UpdateRestrictions);
+        _updateRestrictions?.MergePropertiesIfNull(complexPropertyUpdateRestrictions);
         _updateRestrictions ??= complexPropertyUpdateRestrictions;
     }
 
@@ -40,7 +40,8 @@ protected override void SetBasicInfo(OpenApiOperation operation)
         // OperationId
         if (Context.Settings.EnableOperationId)
         {
-            operation.OperationId = EdmModelHelper.GenerateComplexPropertyPathOperationId(Path, "Update");
+            string prefix = OperationType == OperationType.Patch ? "Update" : "Set";
+            operation.OperationId = EdmModelHelper.GenerateComplexPropertyPathOperationId(Path, prefix);
         }
     }
 
@@ -101,37 +102,37 @@ protected override void AppendCustomParameters(OpenApiOperation operation)
 
     private OpenApiSchema GetOpenApiSchema()
     {
-        var schema = new OpenApiSchema
-        {
-            UnresolvedReference = true,
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.Schema,
-                Id = ComplexPropertySegment.ComplexType.FullName()
-            }
-        };
-
-        if (ComplexPropertySegment.Property.Type.IsCollection())
-        {
+        var schema = new OpenApiSchema
+        {
+            UnresolvedReference = true,
+            Reference = new OpenApiReference
+            {
+                Type = ReferenceType.Schema,
+                Id = ComplexPropertySegment.ComplexType.FullName()
+            }
+        };
+
+        if (ComplexPropertySegment.Property.Type.IsCollection())
+        {
             return new OpenApiSchema
             {
                 Type = Constants.ObjectType,
-                Properties = new Dictionary<string, OpenApiSchema>
-                {
-                    {
+                Properties = new Dictionary<string, OpenApiSchema>
+                {
+                    {
                         "value",
                         new OpenApiSchema
                         {
                             Type = "array",
                             Items = schema
-                        }
-                    }
+                        }
+                    }
                 }
-            };
-        }
-        else
-        {
-            return schema;
+            };
+        }
+        else
+        {
+            return schema;
         }
     }
 }