Merge branch 'master' into fix/requestBodyAndResponseRepresentationForRefOperations

Author: millicentachieng

.github/CODEOWNERS

@@ -1 +1 @@
-* @xuzhg @irvinesunday @darrelmiller @peombwa @zengin
+* @xuzhg @irvinesunday @darrelmiller @peombwa @zengin @baywet @millicentachieng

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

@@ -119,5 +119,10 @@ internal static class Constants
         /// Name used for reference request PUT body
         /// </summary>
         public static string ReferencePutRequestBodyName = "refPutBody";
+        
+        /// <summary>
+        /// The odata type name.
+        /// </summary>
+        public static string OdataType = "@odata.type";
     }
 }

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

@@ -102,7 +102,7 @@ public static IDictionary<string, OpenApiSchema> CreateSchemas(this ODataContext
                     Properties = new Dictionary<string, OpenApiSchema>
                     {
                         {"@odata.id", new OpenApiSchema { Type = "string", Nullable = false }},
-                        {"@odata.type", new OpenApiSchema { Type = "string", Nullable = true }},
+                        {Constants.OdataType, new OpenApiSchema { Type = "string", Nullable = true }},
                     }
                 };
             }
@@ -459,13 +459,13 @@ private static OpenApiSchema CreateStructuredTypeSchema(this ODataContext contex
 
                     discriminator = new OpenApiDiscriminator
                     {
-                        PropertyName = "@odata.type",
+                        PropertyName = Constants.OdataType,
                         Mapping = mapping
                     };
                 }
 
                 // A structured type without a base type is represented as a Schema Object of type object
-                OpenApiSchema schema = new OpenApiSchema
+                OpenApiSchema schema = new()
                 {
                     Title = (structuredType as IEdmSchemaElement)?.Name,
 
@@ -483,6 +483,20 @@ private static OpenApiSchema CreateStructuredTypeSchema(this ODataContext contex
                     AnyOf = null
                 };
 
+                if (schema.Discriminator != null)
+                {
+                    if (!schema.Properties.TryAdd(Constants.OdataType, new OpenApiSchema()
+                    {
+                        Type = "string",
+                        Default = new OpenApiString("#" + structuredType.FullTypeName()),
+                    }))
+                    {
+                        throw new InvalidOperationException(
+                            $"Property {Constants.OdataType} is already present in schema {structuredType.FullTypeName()}; verify CSDL.");
+                    }
+                    schema.Required.Add(Constants.OdataType);
+                }                
+
                 // It optionally can contain the field description,
                 // whose value is the value of the unqualified annotation Core.Description of the structured type.
                 if (structuredType.TypeKind == EdmTypeKind.Complex)
@@ -569,7 +583,7 @@ private static IOpenApiAny GetTypeNameForExample(ODataContext context, IEdmTypeR
                 case EdmTypeKind.Complex:
                 case EdmTypeKind.Enum:
                     OpenApiObject obj = new OpenApiObject();
-                    obj["@odata.type"] = new OpenApiString(edmTypeReference.FullName());
+                    obj[Constants.OdataType] = new OpenApiString(edmTypeReference.FullName());
                     return obj;
 
                 case EdmTypeKind.Collection:

src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageId>Microsoft.OpenApi.OData</PackageId>
     <SignAssembly>true</SignAssembly>
-    <Version>1.0.11-preview3</Version>
+    <Version>1.0.11-preview4</Version>
     <Description>This package contains the codes you need to convert OData CSDL to Open API Document of Model.</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>Microsoft OpenApi OData EDM</PackageTags>
@@ -28,6 +28,7 @@
 - Provides support for using success status code range 2XX #153
 - Fixes request body and response representation for ref POST and PUT operations #228
 - Adds discriminator object to complex types which have derived types #233
+- Adds @odata.type property and makes this a required property in schemas that have discriminator objects #243
     </PackageReleaseNotes>
     <AssemblyName>Microsoft.OpenApi.OData.Reader</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\tool\Microsoft.OpenApi.OData.snk</AssemblyOriginatorKeyFile>

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

@@ -130,13 +130,20 @@ public void CreateStructuredTypeSchemaForEntityTypeWithDiscriminatorValueEnabled
     },
     {
       ""title"": ""directoryObject"",
+      ""required"": [
+        ""@odata.type""
+      ],
       ""type"": ""object"",
       ""properties"": {
         ""deletedDateTime"": {
           ""pattern"": ""^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$"",
           ""type"": ""string"",
           ""format"": ""date-time"",
           ""nullable"": true
+        },
+        ""@odata.type"": {
+          ""type"": ""string"",
+          ""default"": ""#microsoft.graph.directoryObject""
         }
       },
       ""discriminator"": {
@@ -187,11 +194,18 @@ public void CreateStructuredTypeSchemaForComplexTypeWithDiscriminatorValueEnable
             Assert.NotNull(json);
             Assert.Equal(@"{
   ""title"": ""userSet"",
+  ""required"": [
+    ""@odata.type""
+  ],
   ""type"": ""object"",
   ""properties"": {
     ""isBackup"": {
       ""type"": ""boolean"",
       ""nullable"": true
+    },
+    ""@odata.type"": {
+      ""type"": ""string"",
+      ""default"": ""#microsoft.graph.userSet""
     }
   },
   ""discriminator"": {