Rename operationDiscriminator to openapi:discriminator and emit as property

bkoelman · bkoelman · commit a0aec705ef91 · 2024-11-28T03:26:15.000+01:00
diff --git a/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json b/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json
@@ -5095,10 +5095,13 @@
       },
       "atomicOperation": {
         "required": [
-          "operationDiscriminator"
+          "openapi:discriminator"
         ],
         "type": "object",
         "properties": {
+          "openapi:discriminator": {
+            "type": "string"
+          },
           "meta": {
             "allOf": [
               {
@@ -5109,7 +5112,7 @@
         },
         "additionalProperties": false,
         "discriminator": {
-          "propertyName": "operationDiscriminator",
+          "propertyName": "openapi:discriminator",
           "mapping": {
             "addPerson": "#/components/schemas/createPersonOperation",
             "addTag": "#/components/schemas/createTagOperation",
diff --git a/src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/AtomicOperation.cs b/src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/AtomicOperation.cs
@@ -30,6 +30,22 @@ public partial class AtomicOperation : IBackedModel, IParsable
             get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta"); }
             set { BackingStore?.Set("meta", value); }
         }
+#endif
+        /// <summary>The openapiDiscriminator property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? OpenapiDiscriminator
+        {
+            get { return BackingStore?.Get<string?>("openapi:discriminator"); }
+            set { BackingStore?.Set("openapi:discriminator", value); }
+        }
+#nullable restore
+#else
+        public string OpenapiDiscriminator
+        {
+            get { return BackingStore?.Get<string>("openapi:discriminator"); }
+            set { BackingStore?.Set("openapi:discriminator", value); }
+        }
 #endif
         /// <summary>
         /// Instantiates a new <see cref="global::OpenApiKiotaClientExample.GeneratedCode.Models.AtomicOperation"/> and sets the default values.
@@ -46,7 +62,7 @@ public AtomicOperation()
         public static global::OpenApiKiotaClientExample.GeneratedCode.Models.AtomicOperation CreateFromDiscriminatorValue(IParseNode parseNode)
         {
             _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
-            var mappingValue = parseNode.GetChildNode("operationDiscriminator")?.GetStringValue();
+            var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue();
             return mappingValue switch
             {
                 "addPerson" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.CreatePersonOperation(),
@@ -84,6 +100,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers()
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "meta", n => { Meta = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>(global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
+                { "openapi:discriminator", n => { OpenapiDiscriminator = n.GetStringValue(); } },
             };
         }
         /// <summary>
@@ -94,6 +111,7 @@ public virtual void Serialize(ISerializationWriter writer)
         {
             _ = writer ?? throw new ArgumentNullException(nameof(writer));
             writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta", Meta);
+            writer.WriteStringValue("openapi:discriminator", OpenapiDiscriminator);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs
@@ -49,7 +49,7 @@ public void Configure(SwaggerGenOptions options)
         options.UseAllOfToExtendReferenceSchemas();
 
         options.UseAllOfForInheritance();
-        options.SelectDiscriminatorNameUsing(_ => "type");
+        options.SelectDiscriminatorNameUsing(_ => JsonApiPropertyName.Type);
         options.SelectDiscriminatorValueUsing(clrType => _resourceGraph.GetResourceType(clrType).PublicName);
         options.SelectSubTypesUsing(SelectDerivedTypes);
 
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs
@@ -15,7 +15,6 @@ internal sealed class JsonApiSchemaIdSelector
     private const string ResourceTypeSchemaIdTemplate = "[ResourceName] Resource Type";
     private const string MetaSchemaIdTemplate = "Meta";
 
-    private const string AtomicOperationDiscriminatorNameTemplate = "Operation Discriminator";
     private const string ResourceAtomicOperationDiscriminatorValueTemplate = "[OperationCode] [ResourceName]";
     private const string UpdateRelationshipAtomicOperationDiscriminatorValueTemplate = "Update [ResourceName] [RelationshipName]";
     private const string AddToRelationshipAtomicOperationDiscriminatorValueTemplate = "Add To [ResourceName] [RelationshipName]";
@@ -154,11 +153,6 @@ public string GetAtomicOperationCodeSchemaId(AtomicOperationCode operationCode)
         return ApplySchemaTemplate("[OperationCode] Operation Code", null, null, operationCode);
     }
 
-    public string GetAtomicOperationDiscriminatorName()
-    {
-        return ApplySchemaTemplate(AtomicOperationDiscriminatorNameTemplate, null, null, null);
-    }
-
     public string GetAtomicOperationDiscriminatorValue(AtomicOperationCode operationCode, ResourceType resourceType)
     {
         ArgumentGuard.NotNull(resourceType);
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractAtomicOperationSchemaGenerator.cs
@@ -1,13 +1,15 @@
 using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
 using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 
 internal sealed class AbstractAtomicOperationSchemaGenerator
 {
+    // The discriminator only exists to guide OpenAPI codegen of request bodies. It is silently ignored by the JSON:API server.
+    private const string DiscriminatorPropertyName = "openapi:discriminator";
+
     private static readonly Type AtomicOperationAbstractType = typeof(AtomicOperation);
 
     private readonly MetaSchemaGenerator _metaSchemaGenerator;
@@ -31,27 +33,27 @@ public OpenApiSchema GenerateSchema(SchemaRepository schemaRepository)
             return referenceSchema;
         }
 
-        // The discriminator only exists to guide OpenAPI codegen. The property is ignored by JsonApiDotNetCore.
-        string discriminatorPropertyName = _schemaIdSelector.GetAtomicOperationDiscriminatorName();
-
-        referenceSchema = _metaSchemaGenerator.GenerateSchema(schemaRepository);
-        string metaSchemaId = referenceSchema.Reference.Id;
+        OpenApiSchema referenceSchemaForMeta = _metaSchemaGenerator.GenerateSchema(schemaRepository);
 
         var fullSchema = new OpenApiSchema
         {
             Type = "object",
-            Required = new SortedSet<string>([discriminatorPropertyName]),
+            Required = new SortedSet<string>([DiscriminatorPropertyName]),
             Properties = new Dictionary<string, OpenApiSchema>
             {
-                [metaSchemaId] = referenceSchema.WrapInExtendedSchema()
+                [DiscriminatorPropertyName] = new()
+                {
+                    Type = "string"
+                },
+                [referenceSchemaForMeta.Reference.Id] = referenceSchemaForMeta.WrapInExtendedSchema()
             },
             AdditionalPropertiesAllowed = false,
             Discriminator = new OpenApiDiscriminator
             {
-                PropertyName = discriminatorPropertyName,
+                PropertyName = DiscriminatorPropertyName,
                 Mapping = new SortedDictionary<string, string>(StringComparer.Ordinal)
             },
-            Extensions = new Dictionary<string, IOpenApiExtension>
+            Extensions =
             {
                 ["x-abstract"] = new OpenApiBoolean(true)
             }
@@ -70,10 +72,12 @@ public void MapDiscriminator(OpenApiSchema referenceSchemaForOperation, string d
         ArgumentGuard.NotNull(referenceSchemaForOperation);
         ArgumentGuard.NotNull(schemaRepository);
 
-        if (schemaRepository.TryLookupByType(AtomicOperationAbstractType, out OpenApiSchema? referenceSchemaForAbstractOperation))
+        if (!schemaRepository.TryLookupByType(AtomicOperationAbstractType, out OpenApiSchema? referenceSchemaForAbstractOperation))
         {
-            OpenApiSchema fullSchemaForAbstractOperation = schemaRepository.Schemas[referenceSchemaForAbstractOperation.Reference.Id];
-            fullSchemaForAbstractOperation.Discriminator.Mapping[discriminatorValue] = referenceSchemaForOperation.Reference.ReferenceV3;
+            throw new UnreachableCodeException();
         }
+
+        OpenApiSchema fullSchemaForAbstractOperation = schemaRepository.Schemas[referenceSchemaForAbstractOperation.Reference.Id];
+        fullSchemaForAbstractOperation.Discriminator.Mapping.Add(discriminatorValue, referenceSchemaForOperation.Reference.ReferenceV3);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/AbstractResourceDataSchemaGenerator.cs
@@ -2,7 +2,6 @@
 using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
@@ -35,14 +34,11 @@ public OpenApiSchema GenerateSchema(SchemaRepository schemaRepository)
 
         var fullSchema = new OpenApiSchema
         {
-            Required = new HashSet<string>
-            {
-                "type"
-            },
+            Required = new SortedSet<string>([JsonApiPropertyName.Type]),
             Type = "object",
             Properties = new Dictionary<string, OpenApiSchema>
             {
-                ["type"] = new()
+                [JsonApiPropertyName.Type] = new()
                 {
                     MinLength = 1,
                     Type = "string"
@@ -51,10 +47,10 @@ public OpenApiSchema GenerateSchema(SchemaRepository schemaRepository)
             AdditionalPropertiesAllowed = false,
             Discriminator = new OpenApiDiscriminator
             {
-                PropertyName = "type",
+                PropertyName = JsonApiPropertyName.Type,
                 Mapping = new SortedDictionary<string, string>(StringComparer.Ordinal)
             },
-            Extensions = new Dictionary<string, IOpenApiExtension>
+            Extensions =
             {
                 ["x-abstract"] = new OpenApiBoolean(true)
             }
@@ -78,13 +74,15 @@ public void MapDiscriminator(Type resourceDataConstructedType, OpenApiSchema ref
 
         if (resourceTypeInfo.ResourceDataOpenType == typeof(ResourceDataInResponse<>))
         {
-            if (schemaRepository.TryLookupByType(ResourceDataAbstractType, out OpenApiSchema? referenceSchemaForAbstractResourceData))
+            if (!schemaRepository.TryLookupByType(ResourceDataAbstractType, out OpenApiSchema? referenceSchemaForAbstractResourceData))
             {
-                OpenApiSchema fullSchemaForAbstractResourceData = schemaRepository.Schemas[referenceSchemaForAbstractResourceData.Reference.Id];
-
-                fullSchemaForAbstractResourceData.Discriminator.Mapping[resourceTypeInfo.ResourceType.PublicName] =
-                    referenceSchemaForResourceData.Reference.ReferenceV3;
+                throw new UnreachableCodeException();
             }
+
+            OpenApiSchema fullSchemaForAbstractResourceData = schemaRepository.Schemas[referenceSchemaForAbstractResourceData.Reference.Id];
+
+            fullSchemaForAbstractResourceData.Discriminator.Mapping[resourceTypeInfo.ResourceType.PublicName] =
+                referenceSchemaForResourceData.Reference.ReferenceV3;
         }
     }
 }
diff --git a/test/OpenApiKiotaEndToEndTests/AtomicOperations/GeneratedCode/Models/AtomicOperation.cs b/test/OpenApiKiotaEndToEndTests/AtomicOperations/GeneratedCode/Models/AtomicOperation.cs
@@ -30,6 +30,22 @@ public partial class AtomicOperation : IBackedModel, IParsable
             get { return BackingStore?.Get<global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.Meta>("meta"); }
             set { BackingStore?.Set("meta", value); }
         }
+#endif
+        /// <summary>The openapiDiscriminator property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? OpenapiDiscriminator
+        {
+            get { return BackingStore?.Get<string?>("openapi:discriminator"); }
+            set { BackingStore?.Set("openapi:discriminator", value); }
+        }
+#nullable restore
+#else
+        public string OpenapiDiscriminator
+        {
+            get { return BackingStore?.Get<string>("openapi:discriminator"); }
+            set { BackingStore?.Set("openapi:discriminator", value); }
+        }
 #endif
         /// <summary>
         /// Instantiates a new <see cref="global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AtomicOperation"/> and sets the default values.
@@ -46,7 +62,7 @@ public AtomicOperation()
         public static global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AtomicOperation CreateFromDiscriminatorValue(IParseNode parseNode)
         {
             _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
-            var mappingValue = parseNode.GetChildNode("operationDiscriminator")?.GetStringValue();
+            var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue();
             return mappingValue switch
             {
                 "addCourse" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateCourseOperation(),
@@ -87,6 +103,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers()
             return new Dictionary<string, Action<IParseNode>>
             {
                 { "meta", n => { Meta = n.GetObjectValue<global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.Meta>(global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
+                { "openapi:discriminator", n => { OpenapiDiscriminator = n.GetStringValue(); } },
             };
         }
         /// <summary>
@@ -97,6 +114,7 @@ public virtual void Serialize(ISerializationWriter writer)
         {
             _ = writer ?? throw new ArgumentNullException(nameof(writer));
             writer.WriteObjectValue<global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.Meta>("meta", Meta);
+            writer.WriteStringValue("openapi:discriminator", OpenapiDiscriminator);
         }
     }
 }
diff --git a/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json
@@ -6512,10 +6512,13 @@
       },
       "atomicOperation": {
         "required": [
-          "operationDiscriminator"
+          "openapi:discriminator"
         ],
         "type": "object",
         "properties": {
+          "openapi:discriminator": {
+            "type": "string"
+          },
           "meta": {
             "allOf": [
               {
@@ -6526,7 +6529,7 @@
         },
         "additionalProperties": false,
         "discriminator": {
-          "propertyName": "operationDiscriminator",
+          "propertyName": "openapi:discriminator",
           "mapping": {
             "addCourse": "#/components/schemas/createCourseOperation",
             "addEnrollment": "#/components/schemas/createEnrollmentOperation",
diff --git a/test/OpenApiTests/AtomicOperations/OperationsTests.cs b/test/OpenApiTests/AtomicOperations/OperationsTests.cs
@@ -160,10 +160,13 @@ public async Task Operations_request_component_schemas_are_exposed()
             schemasElement.Should().ContainPath("atomicOperation").Should().BeJson("""
                 {
                   "required": [
-                    "operationDiscriminator"
+                    "openapi:discriminator"
                   ],
                   "type": "object",
                   "properties": {
+                    "openapi:discriminator": {
+                      "type": "string"
+                    },
                     "meta": {
                       "allOf": [
                         {
@@ -174,7 +177,7 @@ public async Task Operations_request_component_schemas_are_exposed()
                   },
                   "additionalProperties": false,
                   "discriminator": {
-                    "propertyName": "operationDiscriminator",
+                    "propertyName": "openapi:discriminator",
                     "mapping": {
                       "addCourse": "#/components/schemas/createCourseOperation",
                       "addEnrollment": "#/components/schemas/createEnrollmentOperation",
diff --git a/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json
@@ -2709,10 +2709,13 @@
       },
       "atomicOperation": {
         "required": [
-          "operationDiscriminator"
+          "openapi:discriminator"
         ],
         "type": "object",
         "properties": {
+          "openapi:discriminator": {
+            "type": "string"
+          },
           "meta": {
             "allOf": [
               {
@@ -2723,7 +2726,7 @@
         },
         "additionalProperties": false,
         "discriminator": {
-          "propertyName": "operationDiscriminator",
+          "propertyName": "openapi:discriminator",
           "mapping": {
             "addStaffMember": "#/components/schemas/createStaffMemberOperation",
             "addSupermarket": "#/components/schemas/createSupermarketOperation",
diff --git a/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json
@@ -2709,10 +2709,13 @@
       },
       "atomic-operation": {
         "required": [
-          "operation-discriminator"
+          "openapi:discriminator"
         ],
         "type": "object",
         "properties": {
+          "openapi:discriminator": {
+            "type": "string"
+          },
           "meta": {
             "allOf": [
               {
@@ -2723,7 +2726,7 @@
         },
         "additionalProperties": false,
         "discriminator": {
-          "propertyName": "operation-discriminator",
+          "propertyName": "openapi:discriminator",
           "mapping": {
             "add-staff-member": "#/components/schemas/create-staff-member-operation",
             "add-supermarket": "#/components/schemas/create-supermarket-operation",
diff --git a/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json
@@ -2709,10 +2709,13 @@
       },
       "AtomicOperation": {
         "required": [
-          "OperationDiscriminator"
+          "openapi:discriminator"
         ],
         "type": "object",
         "properties": {
+          "openapi:discriminator": {
+            "type": "string"
+          },
           "Meta": {
             "allOf": [
               {
@@ -2723,7 +2726,7 @@
         },
         "additionalProperties": false,
         "discriminator": {
-          "propertyName": "OperationDiscriminator",
+          "propertyName": "openapi:discriminator",
           "mapping": {
             "AddStaffMember": "#/components/schemas/CreateStaffMemberOperation",
             "AddSupermarket": "#/components/schemas/CreateSupermarketOperation",

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,22 @@ public partial class AtomicOperation : IBackedModel, IParsable`
`30`	`30`	`get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta"); }`
`31`	`31`	`set { BackingStore?.Set("meta", value); }`
`32`	`32`	`}`
	`33`	`+#endif`
	`34`	`+ /// <summary>The openapiDiscriminator property</summary>`
	`35`	`+#if NETSTANDARD2_1_OR_GREATER \|\| NETCOREAPP3_1_OR_GREATER`
	`36`	`+#nullable enable`
	`37`	`+ public string? OpenapiDiscriminator`
	`38`	`+ {`
	`39`	`+ get { return BackingStore?.Get<string?>("openapi:discriminator"); }`
	`40`	`+ set { BackingStore?.Set("openapi:discriminator", value); }`
	`41`	`+ }`
	`42`	`+#nullable restore`
	`43`	`+#else`
	`44`	`+ public string OpenapiDiscriminator`
	`45`	`+ {`
	`46`	`+ get { return BackingStore?.Get<string>("openapi:discriminator"); }`
	`47`	`+ set { BackingStore?.Set("openapi:discriminator", value); }`
	`48`	`+ }`
`33`	`49`	`#endif`
`34`	`50`	`/// <summary>`
`35`	`51`	`/// Instantiates a new <see cref="global::OpenApiKiotaClientExample.GeneratedCode.Models.AtomicOperation"/> and sets the default values.`
`@@ -46,7 +62,7 @@ public AtomicOperation()`
`46`	`62`	`public static global::OpenApiKiotaClientExample.GeneratedCode.Models.AtomicOperation CreateFromDiscriminatorValue(IParseNode parseNode)`
`47`	`63`	`{`
`48`	`64`	`_ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));`
`49`		`- var mappingValue = parseNode.GetChildNode("operationDiscriminator")?.GetStringValue();`
	`65`	`+ var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue();`
`50`	`66`	`return mappingValue switch`
`51`	`67`	`{`
`52`	`68`	`"addPerson" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.CreatePersonOperation(),`
`@@ -84,6 +100,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers()`
`84`	`100`	`return new Dictionary<string, Action<IParseNode>>`
`85`	`101`	`{`
`86`	`102`	`{ "meta", n => { Meta = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>(global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },`
	`103`	`+ { "openapi:discriminator", n => { OpenapiDiscriminator = n.GetStringValue(); } },`
`87`	`104`	`};`
`88`	`105`	`}`
`89`	`106`	`/// <summary>`
`@@ -94,6 +111,7 @@ public virtual void Serialize(ISerializationWriter writer)`
`94`	`111`	`{`
`95`	`112`	`_ = writer ?? throw new ArgumentNullException(nameof(writer));`
`96`	`113`	`writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta", Meta);`
	`114`	`+ writer.WriteStringValue("openapi:discriminator", OpenapiDiscriminator);`
`97`	`115`	`}`
`98`	`116`	`}`
`99`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects;`
`3`	`3`	`using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;`
`4`	`4`	`using Microsoft.OpenApi.Any;`
`5`		`-using Microsoft.OpenApi.Interfaces;`
`6`	`5`	`using Microsoft.OpenApi.Models;`
`7`	`6`	`using Swashbuckle.AspNetCore.SwaggerGen;`
`8`	`7`
`@@ -35,14 +34,11 @@ public OpenApiSchema GenerateSchema(SchemaRepository schemaRepository)`
`35`	`34`
`36`	`35`	`var fullSchema = new OpenApiSchema`
`37`	`36`	`{`
`38`		`- Required = new HashSet<string>`
`39`		`- {`
`40`		`- "type"`
`41`		`- },`
	`37`	`+ Required = new SortedSet<string>([JsonApiPropertyName.Type]),`
`42`	`38`	`Type = "object",`
`43`	`39`	`Properties = new Dictionary<string, OpenApiSchema>`
`44`	`40`	`{`
`45`		`- ["type"] = new()`
	`41`	`+ [JsonApiPropertyName.Type] = new()`
`46`	`42`	`{`
`47`	`43`	`MinLength = 1,`
`48`	`44`	`Type = "string"`
`@@ -51,10 +47,10 @@ public OpenApiSchema GenerateSchema(SchemaRepository schemaRepository)`
`51`	`47`	`AdditionalPropertiesAllowed = false,`
`52`	`48`	`Discriminator = new OpenApiDiscriminator`
`53`	`49`	`{`
`54`		`- PropertyName = "type",`
	`50`	`+ PropertyName = JsonApiPropertyName.Type,`
`55`	`51`	`Mapping = new SortedDictionary<string, string>(StringComparer.Ordinal)`
`56`	`52`	`},`
`57`		`- Extensions = new Dictionary<string, IOpenApiExtension>`
	`53`	`+ Extensions =`
`58`	`54`	`{`
`59`	`55`	`["x-abstract"] = new OpenApiBoolean(true)`
`60`	`56`	`}`
`@@ -78,13 +74,15 @@ public void MapDiscriminator(Type resourceDataConstructedType, OpenApiSchema ref`
`78`	`74`
`79`	`75`	`if (resourceTypeInfo.ResourceDataOpenType == typeof(ResourceDataInResponse<>))`
`80`	`76`	`{`
`81`		`- if (schemaRepository.TryLookupByType(ResourceDataAbstractType, out OpenApiSchema? referenceSchemaForAbstractResourceData))`
	`77`	`+ if (!schemaRepository.TryLookupByType(ResourceDataAbstractType, out OpenApiSchema? referenceSchemaForAbstractResourceData))`
`82`	`78`	`{`
`83`		`- OpenApiSchema fullSchemaForAbstractResourceData = schemaRepository.Schemas[referenceSchemaForAbstractResourceData.Reference.Id];`
`84`		`-`
`85`		`- fullSchemaForAbstractResourceData.Discriminator.Mapping[resourceTypeInfo.ResourceType.PublicName] =`
`86`		`- referenceSchemaForResourceData.Reference.ReferenceV3;`
	`79`	`+ throw new UnreachableCodeException();`
`87`	`80`	`}`
	`81`	`+`
	`82`	`+ OpenApiSchema fullSchemaForAbstractResourceData = schemaRepository.Schemas[referenceSchemaForAbstractResourceData.Reference.Id];`
	`83`	`+`
	`84`	`+ fullSchemaForAbstractResourceData.Discriminator.Mapping[resourceTypeInfo.ResourceType.PublicName] =`
	`85`	`+ referenceSchemaForResourceData.Reference.ReferenceV3;`
`88`	`86`	`}`
`89`	`87`	`}`
`90`	`88`	`}`