Update schema name for ref POST and PUT

Author: millicentachieng

src/Microsoft.OpenApi.OData.Reader/Common/Constants.cs

@@ -108,13 +108,13 @@ internal static class Constants
         /// <summary>
         /// Name used for reference update.
         /// </summary>
-        public static string ReferenceUpdateSchemaName = "ReferenceUpdateSchema";
+        public static string ReferenceUpdateSchemaName = "ReferenceUpdate";
 
 
         /// <summary>
         /// Name used for reference update.
         /// </summary>
-        public static string ReferencePostSchemaName = "ReferencePostSchema";
+        public static string ReferenceCreateSchemaName = "ReferenceCreate";
 
         /// <summary>
         /// Name used for reference request POST body.

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiRequestBodyGenerator.cs

@@ -120,7 +120,7 @@ private static OpenApiRequestBody CreateRefPostRequestBody()
                 Reference = new OpenApiReference
                 {
                     Type = ReferenceType.Schema,
-                    Id = Constants.ReferencePostSchemaName
+                    Id = Constants.ReferenceCreateSchemaName
                 }
             };
             return new OpenApiRequestBody

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSchemaGenerator.cs

@@ -108,7 +108,7 @@ public static IDictionary<string, OpenApiSchema> CreateSchemas(this ODataContext
                     }
             };
 
-            schemas[Constants.ReferencePostSchemaName] = new()
+            schemas[Constants.ReferenceCreateSchemaName] = new()
             {
                 Type = "object",
                 Properties = new Dictionary<string, OpenApiSchema>

test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiRequestBodyGeneratorTests.cs

@@ -164,7 +164,7 @@ public void CreateRefRequestBodies()
             // Assert
             Assert.NotNull(refPostBody);
             Assert.Equal("New navigation property ref value", refPostBody.Description);
-            Assert.Equal(Common.Constants.ReferencePostSchemaName, refPostBody.Content.First().Value.Schema.Reference.Id);
+            Assert.Equal(Common.Constants.ReferenceCreateSchemaName, refPostBody.Content.First().Value.Schema.Reference.Id);
         }
     }
 }

test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSchemaGeneratorTests.cs

@@ -74,7 +74,7 @@ public void CreatesRefRequestBodySchema()
             // Act & Assert
             var schemas = context.CreateSchemas();
 
-            schemas.TryGetValue(Constants.ReferencePostSchemaName, out OpenApiSchema refRequestBody);
+            schemas.TryGetValue(Constants.ReferenceCreateSchemaName, out OpenApiSchema refRequestBody);
 
             Assert.NotNull(refRequestBody);
             Assert.Equal("object", refRequestBody.Type);

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.json

@@ -1091,7 +1091,7 @@
         }
       }
     },
-    "ReferenceUpdateSchema": {
+    "ReferenceUpdate": {
       "type": "object",
       "properties": {
         "@odata.id": {
@@ -1102,7 +1102,7 @@
         }
       }
     },
-    "ReferencePostSchema": {
+    "ReferenceCreate": {
       "type": "object",
       "properties": {
         "@odata.id": {

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.yaml

@@ -722,14 +722,14 @@ definitions:
         type: array
         items:
           $ref: '#/definitions/DefaultNs.Address'
-  ReferenceUpdateSchema:
+  ReferenceUpdate:
     type: object
     properties:
       '@odata.id':
         type: string
       '@odata.type':
         type: string
-  ReferencePostSchema:
+  ReferenceCreate:
     type: object
     properties:
       '@odata.id':

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.json

@@ -1196,7 +1196,7 @@
           }
         }
       },
-      "ReferenceUpdateSchema": {
+      "ReferenceUpdate": {
         "type": "object",
         "properties": {
           "@odata.id": {
@@ -1208,7 +1208,7 @@
           }
         }
       },
-      "ReferencePostSchema": {
+      "ReferenceCreate": {
         "type": "object",
         "properties": {
           "@odata.id": {
@@ -1376,7 +1376,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/ReferencePostSchema"
+              "$ref": "#/components/schemas/ReferenceCreate"
             }
           }
         },
@@ -1387,7 +1387,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "$ref": "#/components/schemas/ReferenceUpdateSchema"
+              "$ref": "#/components/schemas/ReferenceUpdate"
             }
           }
         },

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.yaml

@@ -793,15 +793,15 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/DefaultNs.Address'
-    ReferenceUpdateSchema:
+    ReferenceUpdate:
       type: object
       properties:
         '@odata.id':
           type: string
         '@odata.type':
           type: string
           nullable: true
-    ReferencePostSchema:
+    ReferenceCreate:
       type: object
       properties:
         '@odata.id':
@@ -910,14 +910,14 @@ components:
       content:
         application/json:
           schema:
-            $ref: '#/components/schemas/ReferencePostSchema'
+            $ref: '#/components/schemas/ReferenceCreate'
       required: true
     refPutBody:
       description: New navigation property ref values
       content:
         application/json:
           schema:
-            $ref: '#/components/schemas/ReferenceUpdateSchema'
+            $ref: '#/components/schemas/ReferenceUpdate'
       required: true
 tags:
   - name: City.City

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.json

@@ -75,7 +75,7 @@
       "format": "int32",
       "type": "integer"
     },
-    "ReferenceUpdateSchema": {
+    "ReferenceUpdate": {
       "type": "object",
       "properties": {
         "@odata.id": {
@@ -86,7 +86,7 @@
         }
       }
     },
-    "ReferencePostSchema": {
+    "ReferenceCreate": {
       "type": "object",
       "properties": {
         "@odata.id": {