diff --git a/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json b/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json index 15fe87de78..8b23ba14e3 100644 --- a/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json +++ b/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json @@ -5391,29 +5391,29 @@ "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "addPerson": "#/components/schemas/createPersonOperation", - "addTag": "#/components/schemas/createTagOperation", - "addToPersonAssignedTodoItems": "#/components/schemas/addToPersonAssignedTodoItemsRelationshipOperation", - "addToPersonOwnedTodoItems": "#/components/schemas/addToPersonOwnedTodoItemsRelationshipOperation", - "addToTagTodoItems": "#/components/schemas/addToTagTodoItemsRelationshipOperation", - "addToTodoItemTags": "#/components/schemas/addToTodoItemTagsRelationshipOperation", - "addTodoItem": "#/components/schemas/createTodoItemOperation", - "removeFromPersonAssignedTodoItems": "#/components/schemas/removeFromPersonAssignedTodoItemsRelationshipOperation", - "removeFromPersonOwnedTodoItems": "#/components/schemas/removeFromPersonOwnedTodoItemsRelationshipOperation", - "removeFromTagTodoItems": "#/components/schemas/removeFromTagTodoItemsRelationshipOperation", - "removeFromTodoItemTags": "#/components/schemas/removeFromTodoItemTagsRelationshipOperation", - "removePerson": "#/components/schemas/deletePersonOperation", - "removeTag": "#/components/schemas/deleteTagOperation", - "removeTodoItem": "#/components/schemas/deleteTodoItemOperation", - "updatePerson": "#/components/schemas/updatePersonOperation", - "updatePersonAssignedTodoItems": "#/components/schemas/updatePersonAssignedTodoItemsRelationshipOperation", - "updatePersonOwnedTodoItems": "#/components/schemas/updatePersonOwnedTodoItemsRelationshipOperation", - "updateTag": "#/components/schemas/updateTagOperation", - "updateTagTodoItems": "#/components/schemas/updateTagTodoItemsRelationshipOperation", - "updateTodoItem": "#/components/schemas/updateTodoItemOperation", - "updateTodoItemAssignee": "#/components/schemas/updateTodoItemAssigneeRelationshipOperation", - "updateTodoItemOwner": "#/components/schemas/updateTodoItemOwnerRelationshipOperation", - "updateTodoItemTags": "#/components/schemas/updateTodoItemTagsRelationshipOperation" + "addToPersonAssignedTodoItemsRelationshipOperation": "#/components/schemas/addToPersonAssignedTodoItemsRelationshipOperation", + "addToPersonOwnedTodoItemsRelationshipOperation": "#/components/schemas/addToPersonOwnedTodoItemsRelationshipOperation", + "addToTagTodoItemsRelationshipOperation": "#/components/schemas/addToTagTodoItemsRelationshipOperation", + "addToTodoItemTagsRelationshipOperation": "#/components/schemas/addToTodoItemTagsRelationshipOperation", + "createPersonOperation": "#/components/schemas/createPersonOperation", + "createTagOperation": "#/components/schemas/createTagOperation", + "createTodoItemOperation": "#/components/schemas/createTodoItemOperation", + "deletePersonOperation": "#/components/schemas/deletePersonOperation", + "deleteTagOperation": "#/components/schemas/deleteTagOperation", + "deleteTodoItemOperation": "#/components/schemas/deleteTodoItemOperation", + "removeFromPersonAssignedTodoItemsRelationshipOperation": "#/components/schemas/removeFromPersonAssignedTodoItemsRelationshipOperation", + "removeFromPersonOwnedTodoItemsRelationshipOperation": "#/components/schemas/removeFromPersonOwnedTodoItemsRelationshipOperation", + "removeFromTagTodoItemsRelationshipOperation": "#/components/schemas/removeFromTagTodoItemsRelationshipOperation", + "removeFromTodoItemTagsRelationshipOperation": "#/components/schemas/removeFromTodoItemTagsRelationshipOperation", + "updatePersonAssignedTodoItemsRelationshipOperation": "#/components/schemas/updatePersonAssignedTodoItemsRelationshipOperation", + "updatePersonOperation": "#/components/schemas/updatePersonOperation", + "updatePersonOwnedTodoItemsRelationshipOperation": "#/components/schemas/updatePersonOwnedTodoItemsRelationshipOperation", + "updateTagOperation": "#/components/schemas/updateTagOperation", + "updateTagTodoItemsRelationshipOperation": "#/components/schemas/updateTagTodoItemsRelationshipOperation", + "updateTodoItemAssigneeRelationshipOperation": "#/components/schemas/updateTodoItemAssigneeRelationshipOperation", + "updateTodoItemOperation": "#/components/schemas/updateTodoItemOperation", + "updateTodoItemOwnerRelationshipOperation": "#/components/schemas/updateTodoItemOwnerRelationshipOperation", + "updateTodoItemTagsRelationshipOperation": "#/components/schemas/updateTodoItemTagsRelationshipOperation" } }, "x-abstract": true diff --git a/src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/AtomicOperation.cs b/src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/AtomicOperation.cs index 3703a87e02..bc591c2359 100644 --- a/src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/AtomicOperation.cs +++ b/src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/AtomicOperation.cs @@ -51,29 +51,29 @@ public AtomicOperation() var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue(); return mappingValue switch { - "addPerson" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.CreatePersonOperation(), - "addTag" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.CreateTagOperation(), - "addTodoItem" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.CreateTodoItemOperation(), - "addToPersonAssignedTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AddToPersonAssignedTodoItemsRelationshipOperation(), - "addToPersonOwnedTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AddToPersonOwnedTodoItemsRelationshipOperation(), - "addToTagTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AddToTagTodoItemsRelationshipOperation(), - "addToTodoItemTags" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AddToTodoItemTagsRelationshipOperation(), - "removeFromPersonAssignedTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.RemoveFromPersonAssignedTodoItemsRelationshipOperation(), - "removeFromPersonOwnedTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.RemoveFromPersonOwnedTodoItemsRelationshipOperation(), - "removeFromTagTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.RemoveFromTagTodoItemsRelationshipOperation(), - "removeFromTodoItemTags" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.RemoveFromTodoItemTagsRelationshipOperation(), - "removePerson" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.DeletePersonOperation(), - "removeTag" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.DeleteTagOperation(), - "removeTodoItem" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.DeleteTodoItemOperation(), - "updatePerson" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdatePersonOperation(), - "updatePersonAssignedTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdatePersonAssignedTodoItemsRelationshipOperation(), - "updatePersonOwnedTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdatePersonOwnedTodoItemsRelationshipOperation(), - "updateTag" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTagOperation(), - "updateTagTodoItems" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTagTodoItemsRelationshipOperation(), - "updateTodoItem" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTodoItemOperation(), - "updateTodoItemAssignee" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTodoItemAssigneeRelationshipOperation(), - "updateTodoItemOwner" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTodoItemOwnerRelationshipOperation(), - "updateTodoItemTags" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTodoItemTagsRelationshipOperation(), + "addToPersonAssignedTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AddToPersonAssignedTodoItemsRelationshipOperation(), + "addToPersonOwnedTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AddToPersonOwnedTodoItemsRelationshipOperation(), + "addToTagTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AddToTagTodoItemsRelationshipOperation(), + "addToTodoItemTagsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AddToTodoItemTagsRelationshipOperation(), + "createPersonOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.CreatePersonOperation(), + "createTagOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.CreateTagOperation(), + "createTodoItemOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.CreateTodoItemOperation(), + "deletePersonOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.DeletePersonOperation(), + "deleteTagOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.DeleteTagOperation(), + "deleteTodoItemOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.DeleteTodoItemOperation(), + "removeFromPersonAssignedTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.RemoveFromPersonAssignedTodoItemsRelationshipOperation(), + "removeFromPersonOwnedTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.RemoveFromPersonOwnedTodoItemsRelationshipOperation(), + "removeFromTagTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.RemoveFromTagTodoItemsRelationshipOperation(), + "removeFromTodoItemTagsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.RemoveFromTodoItemTagsRelationshipOperation(), + "updatePersonAssignedTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdatePersonAssignedTodoItemsRelationshipOperation(), + "updatePersonOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdatePersonOperation(), + "updatePersonOwnedTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdatePersonOwnedTodoItemsRelationshipOperation(), + "updateTagOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTagOperation(), + "updateTagTodoItemsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTagTodoItemsRelationshipOperation(), + "updateTodoItemAssigneeRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTodoItemAssigneeRelationshipOperation(), + "updateTodoItemOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTodoItemOperation(), + "updateTodoItemOwnerRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTodoItemOwnerRelationshipOperation(), + "updateTodoItemTagsRelationshipOperation" => new global::OpenApiKiotaClientExample.GeneratedCode.Models.UpdateTodoItemTagsRelationshipOperation(), _ => new global::OpenApiKiotaClientExample.GeneratedCode.Models.AtomicOperation(), }; } diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs index 0e2fc803de..d31c324713 100644 --- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs +++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs @@ -15,11 +15,6 @@ internal sealed class JsonApiSchemaIdSelector private const string ResourceTypeSchemaIdTemplate = "[ResourceName] Resource Type"; private const string MetaSchemaIdTemplate = "Meta"; - private const string ResourceAtomicOperationDiscriminatorValueTemplate = "[OperationCode] [ResourceName]"; - private const string UpdateRelationshipAtomicOperationDiscriminatorValueTemplate = "Update [ResourceName] [RelationshipName]"; - private const string AddToRelationshipAtomicOperationDiscriminatorValueTemplate = "Add To [ResourceName] [RelationshipName]"; - private const string RemoveFromRelationshipAtomicOperationDiscriminatorValueTemplate = "Remove From [ResourceName] [RelationshipName]"; - private const string UpdateRelationshipAtomicOperationSchemaIdTemplate = "Update [ResourceName] [RelationshipName] Relationship Operation"; private const string AddToRelationshipAtomicOperationSchemaIdTemplate = "Add To [ResourceName] [RelationshipName] Relationship Operation"; private const string RemoveFromRelationshipAtomicOperationSchemaIdTemplate = "Remove From [ResourceName] [RelationshipName] Relationship Operation"; @@ -157,27 +152,6 @@ public string GetAtomicOperationCodeSchemaId(AtomicOperationCode operationCode) return ApplySchemaTemplate("[OperationCode] Operation Code", null, null, operationCode); } - public string GetAtomicOperationDiscriminatorValue(AtomicOperationCode operationCode, ResourceType resourceType) - { - ArgumentNullException.ThrowIfNull(resourceType); - - return ApplySchemaTemplate(ResourceAtomicOperationDiscriminatorValueTemplate, resourceType, null, operationCode); - } - - public string GetAtomicOperationDiscriminatorValue(AtomicOperationCode operationCode, RelationshipAttribute relationship) - { - ArgumentNullException.ThrowIfNull(relationship); - - string schemaIdTemplate = operationCode switch - { - AtomicOperationCode.Add => AddToRelationshipAtomicOperationDiscriminatorValueTemplate, - AtomicOperationCode.Remove => RemoveFromRelationshipAtomicOperationDiscriminatorValueTemplate, - _ => UpdateRelationshipAtomicOperationDiscriminatorValueTemplate - }; - - return ApplySchemaTemplate(schemaIdTemplate, relationship.LeftType, relationship.PublicName, null); - } - public string GetRelationshipAtomicOperationSchemaId(RelationshipAttribute relationship, AtomicOperationCode operationCode) { ArgumentNullException.ThrowIfNull(relationship); diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Documents/AtomicOperationsDocumentSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Documents/AtomicOperationsDocumentSchemaGenerator.cs index f128f89299..648831fcbb 100644 --- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Documents/AtomicOperationsDocumentSchemaGenerator.cs +++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Documents/AtomicOperationsDocumentSchemaGenerator.cs @@ -206,8 +206,7 @@ private void GenerateSchemaForResourceOperation(Type operationOpenType, Resource SetOperationCode(inlineSchemaForOperation, operationCode, schemaRepository); } - string discriminatorValue = _schemaIdSelector.GetAtomicOperationDiscriminatorValue(operationCode, resourceType); - MapInDiscriminator(referenceSchemaForOperation, discriminatorValue, schemaRepository); + MapInDiscriminator(referenceSchemaForOperation, schemaRepository); traceScope.TraceSucceeded(referenceSchemaForOperation.Reference.Id); } @@ -264,11 +263,11 @@ private void SetOperationCode(OpenApiSchema fullSchema, AtomicOperationCode oper fullSchema.Properties[JsonApiPropertyName.Op] = referenceSchema.WrapInExtendedSchema(); } - private static void MapInDiscriminator(OpenApiSchema referenceSchemaForOperation, string discriminatorValue, SchemaRepository schemaRepository) + private static void MapInDiscriminator(OpenApiSchema referenceSchemaForOperation, SchemaRepository schemaRepository) { OpenApiSchema referenceSchemaForAbstractOperation = schemaRepository.LookupByType(AtomicOperationAbstractType); OpenApiSchema fullSchemaForAbstractOperation = schemaRepository.Schemas[referenceSchemaForAbstractOperation.Reference.Id]; - fullSchemaForAbstractOperation.Discriminator.Mapping.Add(discriminatorValue, referenceSchemaForOperation.Reference.ReferenceV3); + fullSchemaForAbstractOperation.Discriminator.Mapping.Add(referenceSchemaForOperation.Reference.Id, referenceSchemaForOperation.Reference.ReferenceV3); } private static HashSet GetRelationshipsInTypeHierarchy(ResourceType baseType) @@ -371,8 +370,7 @@ private void GenerateSchemaForRelationshipOperation(Type operationOpenType, Rela }; } - string discriminatorValue = _schemaIdSelector.GetAtomicOperationDiscriminatorValue(operationCode, relationship); - MapInDiscriminator(referenceSchemaForOperation, discriminatorValue, schemaRepository); + MapInDiscriminator(referenceSchemaForOperation, schemaRepository); traceScope.TraceSucceeded(schemaId); } diff --git a/test/OpenApiKiotaEndToEndTests/AtomicOperations/GeneratedCode/Models/AtomicOperation.cs b/test/OpenApiKiotaEndToEndTests/AtomicOperations/GeneratedCode/Models/AtomicOperation.cs index 08b81af5ae..37b6dea612 100644 --- a/test/OpenApiKiotaEndToEndTests/AtomicOperations/GeneratedCode/Models/AtomicOperation.cs +++ b/test/OpenApiKiotaEndToEndTests/AtomicOperations/GeneratedCode/Models/AtomicOperation.cs @@ -51,32 +51,32 @@ public AtomicOperation() var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue(); return mappingValue switch { - "addCourse" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateCourseOperation(), - "addEnrollment" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateEnrollmentOperation(), - "addStudent" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateStudentOperation(), - "addTeacher" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateTeacherOperation(), - "addToCourseEnrollments" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToCourseEnrollmentsRelationshipOperation(), - "addToCourseTaughtBy" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToCourseTaughtByRelationshipOperation(), - "addToStudentEnrollments" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToStudentEnrollmentsRelationshipOperation(), - "addToTeacherMentors" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToTeacherMentorsRelationshipOperation(), - "addToTeacherTeaches" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToTeacherTeachesRelationshipOperation(), - "removeCourse" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.DeleteCourseOperation(), - "removeEnrollment" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.DeleteEnrollmentOperation(), - "removeFromStudentEnrollments" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.RemoveFromStudentEnrollmentsRelationshipOperation(), - "removeFromTeacherMentors" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.RemoveFromTeacherMentorsRelationshipOperation(), - "removeFromTeacherTeaches" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.RemoveFromTeacherTeachesRelationshipOperation(), - "removeTeacher" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.DeleteTeacherOperation(), - "updateCourse" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateCourseOperation(), - "updateCourseEnrollments" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateCourseEnrollmentsRelationshipOperation(), - "updateEnrollment" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateEnrollmentOperation(), - "updateEnrollmentCourse" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateEnrollmentCourseRelationshipOperation(), - "updateEnrollmentStudent" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateEnrollmentStudentRelationshipOperation(), - "updateStudent" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateStudentOperation(), - "updateStudentEnrollments" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateStudentEnrollmentsRelationshipOperation(), - "updateStudentMentor" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateStudentMentorRelationshipOperation(), - "updateTeacher" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateTeacherOperation(), - "updateTeacherMentors" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateTeacherMentorsRelationshipOperation(), - "updateTeacherTeaches" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateTeacherTeachesRelationshipOperation(), + "addToCourseEnrollmentsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToCourseEnrollmentsRelationshipOperation(), + "addToCourseTaughtByRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToCourseTaughtByRelationshipOperation(), + "addToStudentEnrollmentsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToStudentEnrollmentsRelationshipOperation(), + "addToTeacherMentorsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToTeacherMentorsRelationshipOperation(), + "addToTeacherTeachesRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AddToTeacherTeachesRelationshipOperation(), + "createCourseOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateCourseOperation(), + "createEnrollmentOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateEnrollmentOperation(), + "createStudentOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateStudentOperation(), + "createTeacherOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.CreateTeacherOperation(), + "deleteCourseOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.DeleteCourseOperation(), + "deleteEnrollmentOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.DeleteEnrollmentOperation(), + "deleteTeacherOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.DeleteTeacherOperation(), + "removeFromStudentEnrollmentsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.RemoveFromStudentEnrollmentsRelationshipOperation(), + "removeFromTeacherMentorsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.RemoveFromTeacherMentorsRelationshipOperation(), + "removeFromTeacherTeachesRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.RemoveFromTeacherTeachesRelationshipOperation(), + "updateCourseEnrollmentsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateCourseEnrollmentsRelationshipOperation(), + "updateCourseOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateCourseOperation(), + "updateEnrollmentCourseRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateEnrollmentCourseRelationshipOperation(), + "updateEnrollmentOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateEnrollmentOperation(), + "updateEnrollmentStudentRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateEnrollmentStudentRelationshipOperation(), + "updateStudentEnrollmentsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateStudentEnrollmentsRelationshipOperation(), + "updateStudentMentorRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateStudentMentorRelationshipOperation(), + "updateStudentOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateStudentOperation(), + "updateTeacherMentorsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateTeacherMentorsRelationshipOperation(), + "updateTeacherOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateTeacherOperation(), + "updateTeacherTeachesRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.UpdateTeacherTeachesRelationshipOperation(), _ => new global::OpenApiKiotaEndToEndTests.AtomicOperations.GeneratedCode.Models.AtomicOperation(), }; } diff --git a/test/OpenApiKiotaEndToEndTests/IdObfuscation/GeneratedCode/Models/AtomicOperation.cs b/test/OpenApiKiotaEndToEndTests/IdObfuscation/GeneratedCode/Models/AtomicOperation.cs index 98284e44d3..5a7f7574a6 100644 --- a/test/OpenApiKiotaEndToEndTests/IdObfuscation/GeneratedCode/Models/AtomicOperation.cs +++ b/test/OpenApiKiotaEndToEndTests/IdObfuscation/GeneratedCode/Models/AtomicOperation.cs @@ -51,16 +51,16 @@ public AtomicOperation() var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue(); return mappingValue switch { - "addBankAccount" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.CreateBankAccountOperation(), - "addDebitCard" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.CreateDebitCardOperation(), - "addToBankAccountCards" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.AddToBankAccountCardsRelationshipOperation(), - "removeBankAccount" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.DeleteBankAccountOperation(), - "removeDebitCard" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.DeleteDebitCardOperation(), - "removeFromBankAccountCards" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.RemoveFromBankAccountCardsRelationshipOperation(), - "updateBankAccount" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.UpdateBankAccountOperation(), - "updateBankAccountCards" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.UpdateBankAccountCardsRelationshipOperation(), - "updateDebitCard" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.UpdateDebitCardOperation(), - "updateDebitCardAccount" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.UpdateDebitCardAccountRelationshipOperation(), + "addToBankAccountCardsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.AddToBankAccountCardsRelationshipOperation(), + "createBankAccountOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.CreateBankAccountOperation(), + "createDebitCardOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.CreateDebitCardOperation(), + "deleteBankAccountOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.DeleteBankAccountOperation(), + "deleteDebitCardOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.DeleteDebitCardOperation(), + "removeFromBankAccountCardsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.RemoveFromBankAccountCardsRelationshipOperation(), + "updateBankAccountCardsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.UpdateBankAccountCardsRelationshipOperation(), + "updateBankAccountOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.UpdateBankAccountOperation(), + "updateDebitCardAccountRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.UpdateDebitCardAccountRelationshipOperation(), + "updateDebitCardOperation" => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.UpdateDebitCardOperation(), _ => new global::OpenApiKiotaEndToEndTests.IdObfuscation.GeneratedCode.Models.AtomicOperation(), }; } diff --git a/test/OpenApiKiotaEndToEndTests/ResourceInheritance/OnlyRelationships/GeneratedCode/Models/AtomicOperation.cs b/test/OpenApiKiotaEndToEndTests/ResourceInheritance/OnlyRelationships/GeneratedCode/Models/AtomicOperation.cs index febb9386bc..898b56f3ae 100644 --- a/test/OpenApiKiotaEndToEndTests/ResourceInheritance/OnlyRelationships/GeneratedCode/Models/AtomicOperation.cs +++ b/test/OpenApiKiotaEndToEndTests/ResourceInheritance/OnlyRelationships/GeneratedCode/Models/AtomicOperation.cs @@ -51,30 +51,30 @@ public AtomicOperation() var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue(); return mappingValue switch { - "addToDistrictBuildings" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToDistrictBuildingsRelationshipOperation(), - "addToDistrictRoads" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToDistrictRoadsRelationshipOperation(), - "addToFamilyHomeRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToFamilyHomeRoomsRelationshipOperation(), - "addToMansionRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToMansionRoomsRelationshipOperation(), - "addToMansionStaff" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToMansionStaffRelationshipOperation(), - "addToResidenceRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToResidenceRoomsRelationshipOperation(), - "removeFromDistrictBuildings" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromDistrictBuildingsRelationshipOperation(), - "removeFromDistrictRoads" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromDistrictRoadsRelationshipOperation(), - "removeFromFamilyHomeRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromFamilyHomeRoomsRelationshipOperation(), - "removeFromMansionRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromMansionRoomsRelationshipOperation(), - "removeFromMansionStaff" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromMansionStaffRelationshipOperation(), - "removeFromResidenceRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromResidenceRoomsRelationshipOperation(), - "updateBathroomResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateBathroomResidenceRelationshipOperation(), - "updateBedroomResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateBedroomResidenceRelationshipOperation(), - "updateDistrictBuildings" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateDistrictBuildingsRelationshipOperation(), - "updateDistrictRoads" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateDistrictRoadsRelationshipOperation(), - "updateFamilyHomeRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateFamilyHomeRoomsRelationshipOperation(), - "updateKitchenResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateKitchenResidenceRelationshipOperation(), - "updateLivingRoomResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateLivingRoomResidenceRelationshipOperation(), - "updateMansionRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateMansionRoomsRelationshipOperation(), - "updateMansionStaff" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateMansionStaffRelationshipOperation(), - "updateResidenceRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateResidenceRoomsRelationshipOperation(), - "updateRoomResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateRoomResidenceRelationshipOperation(), - "updateToiletResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateToiletResidenceRelationshipOperation(), + "addToDistrictBuildingsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToDistrictBuildingsRelationshipOperation(), + "addToDistrictRoadsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToDistrictRoadsRelationshipOperation(), + "addToFamilyHomeRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToFamilyHomeRoomsRelationshipOperation(), + "addToMansionRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToMansionRoomsRelationshipOperation(), + "addToMansionStaffRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToMansionStaffRelationshipOperation(), + "addToResidenceRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AddToResidenceRoomsRelationshipOperation(), + "removeFromDistrictBuildingsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromDistrictBuildingsRelationshipOperation(), + "removeFromDistrictRoadsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromDistrictRoadsRelationshipOperation(), + "removeFromFamilyHomeRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromFamilyHomeRoomsRelationshipOperation(), + "removeFromMansionRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromMansionRoomsRelationshipOperation(), + "removeFromMansionStaffRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromMansionStaffRelationshipOperation(), + "removeFromResidenceRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.RemoveFromResidenceRoomsRelationshipOperation(), + "updateBathroomResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateBathroomResidenceRelationshipOperation(), + "updateBedroomResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateBedroomResidenceRelationshipOperation(), + "updateDistrictBuildingsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateDistrictBuildingsRelationshipOperation(), + "updateDistrictRoadsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateDistrictRoadsRelationshipOperation(), + "updateFamilyHomeRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateFamilyHomeRoomsRelationshipOperation(), + "updateKitchenResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateKitchenResidenceRelationshipOperation(), + "updateLivingRoomResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateLivingRoomResidenceRelationshipOperation(), + "updateMansionRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateMansionRoomsRelationshipOperation(), + "updateMansionStaffRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateMansionStaffRelationshipOperation(), + "updateResidenceRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateResidenceRoomsRelationshipOperation(), + "updateRoomResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateRoomResidenceRelationshipOperation(), + "updateToiletResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.UpdateToiletResidenceRelationshipOperation(), _ => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.OnlyRelationships.GeneratedCode.Models.AtomicOperation(), }; } diff --git a/test/OpenApiKiotaEndToEndTests/ResourceInheritance/SubsetOfOperations/GeneratedCode/Models/AtomicOperation.cs b/test/OpenApiKiotaEndToEndTests/ResourceInheritance/SubsetOfOperations/GeneratedCode/Models/AtomicOperation.cs index 533529ecb9..efa14d7c3b 100644 --- a/test/OpenApiKiotaEndToEndTests/ResourceInheritance/SubsetOfOperations/GeneratedCode/Models/AtomicOperation.cs +++ b/test/OpenApiKiotaEndToEndTests/ResourceInheritance/SubsetOfOperations/GeneratedCode/Models/AtomicOperation.cs @@ -51,27 +51,27 @@ public AtomicOperation() var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue(); return mappingValue switch { - "addBathroom" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateBathroomOperation(), - "addBedroom" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateBedroomOperation(), - "addFamilyHome" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateFamilyHomeOperation(), - "addKitchen" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateKitchenOperation(), - "addLivingRoom" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateLivingRoomOperation(), - "addMansion" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateMansionOperation(), - "addResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateResidenceOperation(), - "addRoom" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateRoomOperation(), - "addToFamilyHomeRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.AddToFamilyHomeRoomsRelationshipOperation(), - "addToilet" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateToiletOperation(), - "removeFromMansionRooms" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.RemoveFromMansionRoomsRelationshipOperation(), - "removeFromMansionStaff" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.RemoveFromMansionStaffRelationshipOperation(), - "updateBathroomResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateBathroomResidenceRelationshipOperation(), - "updateBedroomResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateBedroomResidenceRelationshipOperation(), - "updateFamilyHome" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateFamilyHomeOperation(), - "updateKitchenResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateKitchenResidenceRelationshipOperation(), - "updateLivingRoomResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateLivingRoomResidenceRelationshipOperation(), - "updateMansion" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateMansionOperation(), - "updateResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateResidenceOperation(), - "updateRoomResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateRoomResidenceRelationshipOperation(), - "updateToiletResidence" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateToiletResidenceRelationshipOperation(), + "addToFamilyHomeRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.AddToFamilyHomeRoomsRelationshipOperation(), + "createBathroomOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateBathroomOperation(), + "createBedroomOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateBedroomOperation(), + "createFamilyHomeOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateFamilyHomeOperation(), + "createKitchenOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateKitchenOperation(), + "createLivingRoomOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateLivingRoomOperation(), + "createMansionOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateMansionOperation(), + "createResidenceOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateResidenceOperation(), + "createRoomOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateRoomOperation(), + "createToiletOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.CreateToiletOperation(), + "removeFromMansionRoomsRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.RemoveFromMansionRoomsRelationshipOperation(), + "removeFromMansionStaffRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.RemoveFromMansionStaffRelationshipOperation(), + "updateBathroomResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateBathroomResidenceRelationshipOperation(), + "updateBedroomResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateBedroomResidenceRelationshipOperation(), + "updateFamilyHomeOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateFamilyHomeOperation(), + "updateKitchenResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateKitchenResidenceRelationshipOperation(), + "updateLivingRoomResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateLivingRoomResidenceRelationshipOperation(), + "updateMansionOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateMansionOperation(), + "updateResidenceOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateResidenceOperation(), + "updateRoomResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateRoomResidenceRelationshipOperation(), + "updateToiletResidenceRelationshipOperation" => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.UpdateToiletResidenceRelationshipOperation(), _ => new global::OpenApiKiotaEndToEndTests.ResourceInheritance.SubsetOfOperations.GeneratedCode.Models.AtomicOperation(), }; } diff --git a/test/OpenApiNSwagClientTests/ChangeTracking/SerializerChangeTrackingTests.cs b/test/OpenApiNSwagClientTests/ChangeTracking/SerializerChangeTrackingTests.cs index d14d2ae4c6..fb1e1f4b19 100644 --- a/test/OpenApiNSwagClientTests/ChangeTracking/SerializerChangeTrackingTests.cs +++ b/test/OpenApiNSwagClientTests/ChangeTracking/SerializerChangeTrackingTests.cs @@ -751,7 +751,7 @@ public async Task Can_track_multiple_times_in_same_request_document() { "atomic:operations": [ { - "openapi:discriminator": "updateStaffMember", + "openapi:discriminator": "updateStaffMemberOperation", "op": "update", "data": { "type": "staffMembers", @@ -762,7 +762,7 @@ public async Task Can_track_multiple_times_in_same_request_document() } }, { - "openapi:discriminator": "updateStaffMember", + "openapi:discriminator": "updateStaffMemberOperation", "op": "update", "data": { "type": "staffMembers", @@ -773,7 +773,7 @@ public async Task Can_track_multiple_times_in_same_request_document() } }, { - "openapi:discriminator": "updateSupermarket", + "openapi:discriminator": "updateSupermarketOperation", "op": "update", "data": { "type": "supermarkets", @@ -784,7 +784,7 @@ public async Task Can_track_multiple_times_in_same_request_document() } }, { - "openapi:discriminator": "updateSupermarket", + "openapi:discriminator": "updateSupermarketOperation", "op": "update", "data": { "type": "supermarkets", diff --git a/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json index cb64a5f34b..613c50890c 100644 --- a/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json +++ b/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json @@ -324,32 +324,32 @@ "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "addCourse": "#/components/schemas/createCourseOperation", - "addEnrollment": "#/components/schemas/createEnrollmentOperation", - "addStudent": "#/components/schemas/createStudentOperation", - "addTeacher": "#/components/schemas/createTeacherOperation", - "addToCourseEnrollments": "#/components/schemas/addToCourseEnrollmentsRelationshipOperation", - "addToCourseTaughtBy": "#/components/schemas/addToCourseTaughtByRelationshipOperation", - "addToStudentEnrollments": "#/components/schemas/addToStudentEnrollmentsRelationshipOperation", - "addToTeacherMentors": "#/components/schemas/addToTeacherMentorsRelationshipOperation", - "addToTeacherTeaches": "#/components/schemas/addToTeacherTeachesRelationshipOperation", - "removeCourse": "#/components/schemas/deleteCourseOperation", - "removeEnrollment": "#/components/schemas/deleteEnrollmentOperation", - "removeFromStudentEnrollments": "#/components/schemas/removeFromStudentEnrollmentsRelationshipOperation", - "removeFromTeacherMentors": "#/components/schemas/removeFromTeacherMentorsRelationshipOperation", - "removeFromTeacherTeaches": "#/components/schemas/removeFromTeacherTeachesRelationshipOperation", - "removeTeacher": "#/components/schemas/deleteTeacherOperation", - "updateCourse": "#/components/schemas/updateCourseOperation", - "updateCourseEnrollments": "#/components/schemas/updateCourseEnrollmentsRelationshipOperation", - "updateEnrollment": "#/components/schemas/updateEnrollmentOperation", - "updateEnrollmentCourse": "#/components/schemas/updateEnrollmentCourseRelationshipOperation", - "updateEnrollmentStudent": "#/components/schemas/updateEnrollmentStudentRelationshipOperation", - "updateStudent": "#/components/schemas/updateStudentOperation", - "updateStudentEnrollments": "#/components/schemas/updateStudentEnrollmentsRelationshipOperation", - "updateStudentMentor": "#/components/schemas/updateStudentMentorRelationshipOperation", - "updateTeacher": "#/components/schemas/updateTeacherOperation", - "updateTeacherMentors": "#/components/schemas/updateTeacherMentorsRelationshipOperation", - "updateTeacherTeaches": "#/components/schemas/updateTeacherTeachesRelationshipOperation" + "addToCourseEnrollmentsRelationshipOperation": "#/components/schemas/addToCourseEnrollmentsRelationshipOperation", + "addToCourseTaughtByRelationshipOperation": "#/components/schemas/addToCourseTaughtByRelationshipOperation", + "addToStudentEnrollmentsRelationshipOperation": "#/components/schemas/addToStudentEnrollmentsRelationshipOperation", + "addToTeacherMentorsRelationshipOperation": "#/components/schemas/addToTeacherMentorsRelationshipOperation", + "addToTeacherTeachesRelationshipOperation": "#/components/schemas/addToTeacherTeachesRelationshipOperation", + "createCourseOperation": "#/components/schemas/createCourseOperation", + "createEnrollmentOperation": "#/components/schemas/createEnrollmentOperation", + "createStudentOperation": "#/components/schemas/createStudentOperation", + "createTeacherOperation": "#/components/schemas/createTeacherOperation", + "deleteCourseOperation": "#/components/schemas/deleteCourseOperation", + "deleteEnrollmentOperation": "#/components/schemas/deleteEnrollmentOperation", + "deleteTeacherOperation": "#/components/schemas/deleteTeacherOperation", + "removeFromStudentEnrollmentsRelationshipOperation": "#/components/schemas/removeFromStudentEnrollmentsRelationshipOperation", + "removeFromTeacherMentorsRelationshipOperation": "#/components/schemas/removeFromTeacherMentorsRelationshipOperation", + "removeFromTeacherTeachesRelationshipOperation": "#/components/schemas/removeFromTeacherTeachesRelationshipOperation", + "updateCourseEnrollmentsRelationshipOperation": "#/components/schemas/updateCourseEnrollmentsRelationshipOperation", + "updateCourseOperation": "#/components/schemas/updateCourseOperation", + "updateEnrollmentCourseRelationshipOperation": "#/components/schemas/updateEnrollmentCourseRelationshipOperation", + "updateEnrollmentOperation": "#/components/schemas/updateEnrollmentOperation", + "updateEnrollmentStudentRelationshipOperation": "#/components/schemas/updateEnrollmentStudentRelationshipOperation", + "updateStudentEnrollmentsRelationshipOperation": "#/components/schemas/updateStudentEnrollmentsRelationshipOperation", + "updateStudentMentorRelationshipOperation": "#/components/schemas/updateStudentMentorRelationshipOperation", + "updateStudentOperation": "#/components/schemas/updateStudentOperation", + "updateTeacherMentorsRelationshipOperation": "#/components/schemas/updateTeacherMentorsRelationshipOperation", + "updateTeacherOperation": "#/components/schemas/updateTeacherOperation", + "updateTeacherTeachesRelationshipOperation": "#/components/schemas/updateTeacherTeachesRelationshipOperation" } }, "x-abstract": true diff --git a/test/OpenApiTests/AtomicOperations/OperationsTests.cs b/test/OpenApiTests/AtomicOperations/OperationsTests.cs index f49c10c8a9..03e3560b10 100644 --- a/test/OpenApiTests/AtomicOperations/OperationsTests.cs +++ b/test/OpenApiTests/AtomicOperations/OperationsTests.cs @@ -179,32 +179,32 @@ public async Task Operations_request_component_schemas_are_exposed() "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "addCourse": "#/components/schemas/createCourseOperation", - "addEnrollment": "#/components/schemas/createEnrollmentOperation", - "addStudent": "#/components/schemas/createStudentOperation", - "addTeacher": "#/components/schemas/createTeacherOperation", - "addToCourseEnrollments": "#/components/schemas/addToCourseEnrollmentsRelationshipOperation", - "addToCourseTaughtBy": "#/components/schemas/addToCourseTaughtByRelationshipOperation", - "addToStudentEnrollments": "#/components/schemas/addToStudentEnrollmentsRelationshipOperation", - "addToTeacherMentors": "#/components/schemas/addToTeacherMentorsRelationshipOperation", - "addToTeacherTeaches": "#/components/schemas/addToTeacherTeachesRelationshipOperation", - "removeCourse": "#/components/schemas/deleteCourseOperation", - "removeEnrollment": "#/components/schemas/deleteEnrollmentOperation", - "removeFromStudentEnrollments": "#/components/schemas/removeFromStudentEnrollmentsRelationshipOperation", - "removeFromTeacherMentors": "#/components/schemas/removeFromTeacherMentorsRelationshipOperation", - "removeFromTeacherTeaches": "#/components/schemas/removeFromTeacherTeachesRelationshipOperation", - "removeTeacher": "#/components/schemas/deleteTeacherOperation", - "updateCourse": "#/components/schemas/updateCourseOperation", - "updateCourseEnrollments": "#/components/schemas/updateCourseEnrollmentsRelationshipOperation", - "updateEnrollment": "#/components/schemas/updateEnrollmentOperation", - "updateEnrollmentCourse": "#/components/schemas/updateEnrollmentCourseRelationshipOperation", - "updateEnrollmentStudent": "#/components/schemas/updateEnrollmentStudentRelationshipOperation", - "updateStudent": "#/components/schemas/updateStudentOperation", - "updateStudentEnrollments": "#/components/schemas/updateStudentEnrollmentsRelationshipOperation", - "updateStudentMentor": "#/components/schemas/updateStudentMentorRelationshipOperation", - "updateTeacher": "#/components/schemas/updateTeacherOperation", - "updateTeacherMentors": "#/components/schemas/updateTeacherMentorsRelationshipOperation", - "updateTeacherTeaches": "#/components/schemas/updateTeacherTeachesRelationshipOperation" + "addToCourseEnrollmentsRelationshipOperation": "#/components/schemas/addToCourseEnrollmentsRelationshipOperation", + "addToCourseTaughtByRelationshipOperation": "#/components/schemas/addToCourseTaughtByRelationshipOperation", + "addToStudentEnrollmentsRelationshipOperation": "#/components/schemas/addToStudentEnrollmentsRelationshipOperation", + "addToTeacherMentorsRelationshipOperation": "#/components/schemas/addToTeacherMentorsRelationshipOperation", + "addToTeacherTeachesRelationshipOperation": "#/components/schemas/addToTeacherTeachesRelationshipOperation", + "createCourseOperation": "#/components/schemas/createCourseOperation", + "createEnrollmentOperation": "#/components/schemas/createEnrollmentOperation", + "createStudentOperation": "#/components/schemas/createStudentOperation", + "createTeacherOperation": "#/components/schemas/createTeacherOperation", + "deleteCourseOperation": "#/components/schemas/deleteCourseOperation", + "deleteEnrollmentOperation": "#/components/schemas/deleteEnrollmentOperation", + "deleteTeacherOperation": "#/components/schemas/deleteTeacherOperation", + "removeFromStudentEnrollmentsRelationshipOperation": "#/components/schemas/removeFromStudentEnrollmentsRelationshipOperation", + "removeFromTeacherMentorsRelationshipOperation": "#/components/schemas/removeFromTeacherMentorsRelationshipOperation", + "removeFromTeacherTeachesRelationshipOperation": "#/components/schemas/removeFromTeacherTeachesRelationshipOperation", + "updateCourseEnrollmentsRelationshipOperation": "#/components/schemas/updateCourseEnrollmentsRelationshipOperation", + "updateCourseOperation": "#/components/schemas/updateCourseOperation", + "updateEnrollmentCourseRelationshipOperation": "#/components/schemas/updateEnrollmentCourseRelationshipOperation", + "updateEnrollmentOperation": "#/components/schemas/updateEnrollmentOperation", + "updateEnrollmentStudentRelationshipOperation": "#/components/schemas/updateEnrollmentStudentRelationshipOperation", + "updateStudentEnrollmentsRelationshipOperation": "#/components/schemas/updateStudentEnrollmentsRelationshipOperation", + "updateStudentMentorRelationshipOperation": "#/components/schemas/updateStudentMentorRelationshipOperation", + "updateStudentOperation": "#/components/schemas/updateStudentOperation", + "updateTeacherMentorsRelationshipOperation": "#/components/schemas/updateTeacherMentorsRelationshipOperation", + "updateTeacherOperation": "#/components/schemas/updateTeacherOperation", + "updateTeacherTeachesRelationshipOperation": "#/components/schemas/updateTeacherTeachesRelationshipOperation" } }, "x-abstract": true diff --git a/test/OpenApiTests/IdObfuscation/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/IdObfuscation/GeneratedSwagger/swagger.g.json index d635e607c9..d582e1d8f8 100644 --- a/test/OpenApiTests/IdObfuscation/GeneratedSwagger/swagger.g.json +++ b/test/OpenApiTests/IdObfuscation/GeneratedSwagger/swagger.g.json @@ -2302,16 +2302,16 @@ "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "addBankAccount": "#/components/schemas/createBankAccountOperation", - "addDebitCard": "#/components/schemas/createDebitCardOperation", - "addToBankAccountCards": "#/components/schemas/addToBankAccountCardsRelationshipOperation", - "removeBankAccount": "#/components/schemas/deleteBankAccountOperation", - "removeDebitCard": "#/components/schemas/deleteDebitCardOperation", - "removeFromBankAccountCards": "#/components/schemas/removeFromBankAccountCardsRelationshipOperation", - "updateBankAccount": "#/components/schemas/updateBankAccountOperation", - "updateBankAccountCards": "#/components/schemas/updateBankAccountCardsRelationshipOperation", - "updateDebitCard": "#/components/schemas/updateDebitCardOperation", - "updateDebitCardAccount": "#/components/schemas/updateDebitCardAccountRelationshipOperation" + "addToBankAccountCardsRelationshipOperation": "#/components/schemas/addToBankAccountCardsRelationshipOperation", + "createBankAccountOperation": "#/components/schemas/createBankAccountOperation", + "createDebitCardOperation": "#/components/schemas/createDebitCardOperation", + "deleteBankAccountOperation": "#/components/schemas/deleteBankAccountOperation", + "deleteDebitCardOperation": "#/components/schemas/deleteDebitCardOperation", + "removeFromBankAccountCardsRelationshipOperation": "#/components/schemas/removeFromBankAccountCardsRelationshipOperation", + "updateBankAccountCardsRelationshipOperation": "#/components/schemas/updateBankAccountCardsRelationshipOperation", + "updateBankAccountOperation": "#/components/schemas/updateBankAccountOperation", + "updateDebitCardAccountRelationshipOperation": "#/components/schemas/updateDebitCardAccountRelationshipOperation", + "updateDebitCardOperation": "#/components/schemas/updateDebitCardOperation" } }, "x-abstract": true diff --git a/test/OpenApiTests/NamingConventions/CamelCase/CamelCaseTests.cs b/test/OpenApiTests/NamingConventions/CamelCase/CamelCaseTests.cs index ac102b673e..ea5f54d8d8 100644 --- a/test/OpenApiTests/NamingConventions/CamelCase/CamelCaseTests.cs +++ b/test/OpenApiTests/NamingConventions/CamelCase/CamelCaseTests.cs @@ -587,25 +587,23 @@ public async Task Casing_convention_is_applied_to_PostOperations_endpoint() schemasElement.Should().ContainPath("atomicOperation.discriminator.mapping").With(mappingElement => { - mappingElement.Should().ContainPath("addStaffMember").ShouldBeSchemaReferenceId("createStaffMemberOperation"); - mappingElement.Should().ContainPath("addSupermarket").ShouldBeSchemaReferenceId("createSupermarketOperation"); - mappingElement.Should().ContainPath("addToSupermarketCashiers").ShouldBeSchemaReferenceId("addToSupermarketCashiersRelationshipOperation"); - - mappingElement.Should().ContainPath("removeFromSupermarketCashiers") - .ShouldBeSchemaReferenceId("removeFromSupermarketCashiersRelationshipOperation"); - - mappingElement.Should().ContainPath("removeStaffMember").ShouldBeSchemaReferenceId("deleteStaffMemberOperation"); - mappingElement.Should().ContainPath("removeSupermarket").ShouldBeSchemaReferenceId("deleteSupermarketOperation"); - mappingElement.Should().ContainPath("updateStaffMember").ShouldBeSchemaReferenceId("updateStaffMemberOperation"); - mappingElement.Should().ContainPath("updateSupermarket").ShouldBeSchemaReferenceId("updateSupermarketOperation"); - - mappingElement.Should().ContainPath("updateSupermarketBackupStoreManager") - .ShouldBeSchemaReferenceId("updateSupermarketBackupStoreManagerRelationshipOperation"); - - mappingElement.Should().ContainPath("updateSupermarketCashiers").ShouldBeSchemaReferenceId("updateSupermarketCashiersRelationshipOperation"); - - mappingElement.Should().ContainPath("updateSupermarketStoreManager") - .ShouldBeSchemaReferenceId("updateSupermarketStoreManagerRelationshipOperation"); + foreach (string discriminator in (string[]) + [ + "createStaffMemberOperation", + "createSupermarketOperation", + "addToSupermarketCashiersRelationshipOperation", + "removeFromSupermarketCashiersRelationshipOperation", + "deleteStaffMemberOperation", + "deleteSupermarketOperation", + "updateStaffMemberOperation", + "updateSupermarketOperation", + "updateSupermarketBackupStoreManagerRelationshipOperation", + "updateSupermarketCashiersRelationshipOperation", + "updateSupermarketStoreManagerRelationshipOperation" + ]) + { + mappingElement.Should().ContainPath(discriminator).ShouldBeSchemaReferenceId(discriminator); + } }); schemasElement.Should().ContainPath("createSupermarketOperation.allOf[1].properties").With(propertiesElement => diff --git a/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json index 7a22ed8d57..8454946d0c 100644 --- a/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json +++ b/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json @@ -2778,17 +2778,17 @@ "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "addStaffMember": "#/components/schemas/createStaffMemberOperation", - "addSupermarket": "#/components/schemas/createSupermarketOperation", - "addToSupermarketCashiers": "#/components/schemas/addToSupermarketCashiersRelationshipOperation", - "removeFromSupermarketCashiers": "#/components/schemas/removeFromSupermarketCashiersRelationshipOperation", - "removeStaffMember": "#/components/schemas/deleteStaffMemberOperation", - "removeSupermarket": "#/components/schemas/deleteSupermarketOperation", - "updateStaffMember": "#/components/schemas/updateStaffMemberOperation", - "updateSupermarket": "#/components/schemas/updateSupermarketOperation", - "updateSupermarketBackupStoreManager": "#/components/schemas/updateSupermarketBackupStoreManagerRelationshipOperation", - "updateSupermarketCashiers": "#/components/schemas/updateSupermarketCashiersRelationshipOperation", - "updateSupermarketStoreManager": "#/components/schemas/updateSupermarketStoreManagerRelationshipOperation" + "addToSupermarketCashiersRelationshipOperation": "#/components/schemas/addToSupermarketCashiersRelationshipOperation", + "createStaffMemberOperation": "#/components/schemas/createStaffMemberOperation", + "createSupermarketOperation": "#/components/schemas/createSupermarketOperation", + "deleteStaffMemberOperation": "#/components/schemas/deleteStaffMemberOperation", + "deleteSupermarketOperation": "#/components/schemas/deleteSupermarketOperation", + "removeFromSupermarketCashiersRelationshipOperation": "#/components/schemas/removeFromSupermarketCashiersRelationshipOperation", + "updateStaffMemberOperation": "#/components/schemas/updateStaffMemberOperation", + "updateSupermarketBackupStoreManagerRelationshipOperation": "#/components/schemas/updateSupermarketBackupStoreManagerRelationshipOperation", + "updateSupermarketCashiersRelationshipOperation": "#/components/schemas/updateSupermarketCashiersRelationshipOperation", + "updateSupermarketOperation": "#/components/schemas/updateSupermarketOperation", + "updateSupermarketStoreManagerRelationshipOperation": "#/components/schemas/updateSupermarketStoreManagerRelationshipOperation" } }, "x-abstract": true diff --git a/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json index 1955060d71..c48444fbea 100644 --- a/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json +++ b/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json @@ -2778,17 +2778,17 @@ "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "add-staff-member": "#/components/schemas/create-staff-member-operation", - "add-supermarket": "#/components/schemas/create-supermarket-operation", - "add-to-supermarket-cashiers": "#/components/schemas/add-to-supermarket-cashiers-relationship-operation", - "remove-from-supermarket-cashiers": "#/components/schemas/remove-from-supermarket-cashiers-relationship-operation", - "remove-staff-member": "#/components/schemas/delete-staff-member-operation", - "remove-supermarket": "#/components/schemas/delete-supermarket-operation", - "update-staff-member": "#/components/schemas/update-staff-member-operation", - "update-supermarket": "#/components/schemas/update-supermarket-operation", - "update-supermarket-backup-store-manager": "#/components/schemas/update-supermarket-backup-store-manager-relationship-operation", - "update-supermarket-cashiers": "#/components/schemas/update-supermarket-cashiers-relationship-operation", - "update-supermarket-store-manager": "#/components/schemas/update-supermarket-store-manager-relationship-operation" + "add-to-supermarket-cashiers-relationship-operation": "#/components/schemas/add-to-supermarket-cashiers-relationship-operation", + "create-staff-member-operation": "#/components/schemas/create-staff-member-operation", + "create-supermarket-operation": "#/components/schemas/create-supermarket-operation", + "delete-staff-member-operation": "#/components/schemas/delete-staff-member-operation", + "delete-supermarket-operation": "#/components/schemas/delete-supermarket-operation", + "remove-from-supermarket-cashiers-relationship-operation": "#/components/schemas/remove-from-supermarket-cashiers-relationship-operation", + "update-staff-member-operation": "#/components/schemas/update-staff-member-operation", + "update-supermarket-backup-store-manager-relationship-operation": "#/components/schemas/update-supermarket-backup-store-manager-relationship-operation", + "update-supermarket-cashiers-relationship-operation": "#/components/schemas/update-supermarket-cashiers-relationship-operation", + "update-supermarket-operation": "#/components/schemas/update-supermarket-operation", + "update-supermarket-store-manager-relationship-operation": "#/components/schemas/update-supermarket-store-manager-relationship-operation" } }, "x-abstract": true diff --git a/test/OpenApiTests/NamingConventions/KebabCase/KebabCaseTests.cs b/test/OpenApiTests/NamingConventions/KebabCase/KebabCaseTests.cs index 077d7ec5ed..7bffb37f1a 100644 --- a/test/OpenApiTests/NamingConventions/KebabCase/KebabCaseTests.cs +++ b/test/OpenApiTests/NamingConventions/KebabCase/KebabCaseTests.cs @@ -589,28 +589,23 @@ public async Task Casing_convention_is_applied_to_PostOperations_endpoint() schemasElement.Should().ContainPath("atomic-operation.discriminator.mapping").With(mappingElement => { - mappingElement.Should().ContainPath("add-staff-member").ShouldBeSchemaReferenceId("create-staff-member-operation"); - mappingElement.Should().ContainPath("add-supermarket").ShouldBeSchemaReferenceId("create-supermarket-operation"); - - mappingElement.Should().ContainPath("add-to-supermarket-cashiers") - .ShouldBeSchemaReferenceId("add-to-supermarket-cashiers-relationship-operation"); - - mappingElement.Should().ContainPath("remove-from-supermarket-cashiers") - .ShouldBeSchemaReferenceId("remove-from-supermarket-cashiers-relationship-operation"); - - mappingElement.Should().ContainPath("remove-staff-member").ShouldBeSchemaReferenceId("delete-staff-member-operation"); - mappingElement.Should().ContainPath("remove-supermarket").ShouldBeSchemaReferenceId("delete-supermarket-operation"); - mappingElement.Should().ContainPath("update-staff-member").ShouldBeSchemaReferenceId("update-staff-member-operation"); - mappingElement.Should().ContainPath("update-supermarket").ShouldBeSchemaReferenceId("update-supermarket-operation"); - - mappingElement.Should().ContainPath("update-supermarket-backup-store-manager") - .ShouldBeSchemaReferenceId("update-supermarket-backup-store-manager-relationship-operation"); - - mappingElement.Should().ContainPath("update-supermarket-cashiers") - .ShouldBeSchemaReferenceId("update-supermarket-cashiers-relationship-operation"); - - mappingElement.Should().ContainPath("update-supermarket-store-manager") - .ShouldBeSchemaReferenceId("update-supermarket-store-manager-relationship-operation"); + foreach (string discriminator in (string[]) + [ + "create-staff-member-operation", + "create-supermarket-operation", + "add-to-supermarket-cashiers-relationship-operation", + "remove-from-supermarket-cashiers-relationship-operation", + "delete-staff-member-operation", + "delete-supermarket-operation", + "update-staff-member-operation", + "update-supermarket-operation", + "update-supermarket-backup-store-manager-relationship-operation", + "update-supermarket-cashiers-relationship-operation", + "update-supermarket-store-manager-relationship-operation" + ]) + { + mappingElement.Should().ContainPath(discriminator).ShouldBeSchemaReferenceId(discriminator); + } }); schemasElement.Should().ContainPath("create-supermarket-operation.allOf[1].properties").With(propertiesElement => diff --git a/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json index ad97782721..bb924ef157 100644 --- a/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json +++ b/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json @@ -2778,17 +2778,17 @@ "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "AddStaffMember": "#/components/schemas/CreateStaffMemberOperation", - "AddSupermarket": "#/components/schemas/CreateSupermarketOperation", - "AddToSupermarketCashiers": "#/components/schemas/AddToSupermarketCashiersRelationshipOperation", - "RemoveFromSupermarketCashiers": "#/components/schemas/RemoveFromSupermarketCashiersRelationshipOperation", - "RemoveStaffMember": "#/components/schemas/DeleteStaffMemberOperation", - "RemoveSupermarket": "#/components/schemas/DeleteSupermarketOperation", - "UpdateStaffMember": "#/components/schemas/UpdateStaffMemberOperation", - "UpdateSupermarket": "#/components/schemas/UpdateSupermarketOperation", - "UpdateSupermarketBackupStoreManager": "#/components/schemas/UpdateSupermarketBackupStoreManagerRelationshipOperation", - "UpdateSupermarketCashiers": "#/components/schemas/UpdateSupermarketCashiersRelationshipOperation", - "UpdateSupermarketStoreManager": "#/components/schemas/UpdateSupermarketStoreManagerRelationshipOperation" + "AddToSupermarketCashiersRelationshipOperation": "#/components/schemas/AddToSupermarketCashiersRelationshipOperation", + "CreateStaffMemberOperation": "#/components/schemas/CreateStaffMemberOperation", + "CreateSupermarketOperation": "#/components/schemas/CreateSupermarketOperation", + "DeleteStaffMemberOperation": "#/components/schemas/DeleteStaffMemberOperation", + "DeleteSupermarketOperation": "#/components/schemas/DeleteSupermarketOperation", + "RemoveFromSupermarketCashiersRelationshipOperation": "#/components/schemas/RemoveFromSupermarketCashiersRelationshipOperation", + "UpdateStaffMemberOperation": "#/components/schemas/UpdateStaffMemberOperation", + "UpdateSupermarketBackupStoreManagerRelationshipOperation": "#/components/schemas/UpdateSupermarketBackupStoreManagerRelationshipOperation", + "UpdateSupermarketCashiersRelationshipOperation": "#/components/schemas/UpdateSupermarketCashiersRelationshipOperation", + "UpdateSupermarketOperation": "#/components/schemas/UpdateSupermarketOperation", + "UpdateSupermarketStoreManagerRelationshipOperation": "#/components/schemas/UpdateSupermarketStoreManagerRelationshipOperation" } }, "x-abstract": true diff --git a/test/OpenApiTests/NamingConventions/PascalCase/PascalCaseTests.cs b/test/OpenApiTests/NamingConventions/PascalCase/PascalCaseTests.cs index fb5405e6f6..3d929d8207 100644 --- a/test/OpenApiTests/NamingConventions/PascalCase/PascalCaseTests.cs +++ b/test/OpenApiTests/NamingConventions/PascalCase/PascalCaseTests.cs @@ -587,25 +587,23 @@ public async Task Casing_convention_is_applied_to_PostOperations_endpoint() schemasElement.Should().ContainPath("AtomicOperation.discriminator.mapping").With(mappingElement => { - mappingElement.Should().ContainPath("AddStaffMember").ShouldBeSchemaReferenceId("CreateStaffMemberOperation"); - mappingElement.Should().ContainPath("AddSupermarket").ShouldBeSchemaReferenceId("CreateSupermarketOperation"); - mappingElement.Should().ContainPath("AddToSupermarketCashiers").ShouldBeSchemaReferenceId("AddToSupermarketCashiersRelationshipOperation"); - - mappingElement.Should().ContainPath("RemoveFromSupermarketCashiers") - .ShouldBeSchemaReferenceId("RemoveFromSupermarketCashiersRelationshipOperation"); - - mappingElement.Should().ContainPath("RemoveStaffMember").ShouldBeSchemaReferenceId("DeleteStaffMemberOperation"); - mappingElement.Should().ContainPath("RemoveSupermarket").ShouldBeSchemaReferenceId("DeleteSupermarketOperation"); - mappingElement.Should().ContainPath("UpdateStaffMember").ShouldBeSchemaReferenceId("UpdateStaffMemberOperation"); - mappingElement.Should().ContainPath("UpdateSupermarket").ShouldBeSchemaReferenceId("UpdateSupermarketOperation"); - - mappingElement.Should().ContainPath("UpdateSupermarketBackupStoreManager") - .ShouldBeSchemaReferenceId("UpdateSupermarketBackupStoreManagerRelationshipOperation"); - - mappingElement.Should().ContainPath("UpdateSupermarketCashiers").ShouldBeSchemaReferenceId("UpdateSupermarketCashiersRelationshipOperation"); - - mappingElement.Should().ContainPath("UpdateSupermarketStoreManager") - .ShouldBeSchemaReferenceId("UpdateSupermarketStoreManagerRelationshipOperation"); + foreach (string discriminator in (string[]) + [ + "CreateStaffMemberOperation", + "CreateSupermarketOperation", + "AddToSupermarketCashiersRelationshipOperation", + "RemoveFromSupermarketCashiersRelationshipOperation", + "DeleteStaffMemberOperation", + "DeleteSupermarketOperation", + "UpdateStaffMemberOperation", + "UpdateSupermarketOperation", + "UpdateSupermarketBackupStoreManagerRelationshipOperation", + "UpdateSupermarketCashiersRelationshipOperation", + "UpdateSupermarketStoreManagerRelationshipOperation" + ]) + { + mappingElement.Should().ContainPath(discriminator).ShouldBeSchemaReferenceId(discriminator); + } }); schemasElement.Should().ContainPath("CreateSupermarketOperation.allOf[1].properties").With(propertiesElement => diff --git a/test/OpenApiTests/ResourceInheritance/Everything/EverythingInheritanceTests.cs b/test/OpenApiTests/ResourceInheritance/Everything/EverythingInheritanceTests.cs index 09ff3fb81a..53d152ac29 100644 --- a/test/OpenApiTests/ResourceInheritance/Everything/EverythingInheritanceTests.cs +++ b/test/OpenApiTests/ResourceInheritance/Everything/EverythingInheritanceTests.cs @@ -77,20 +77,20 @@ public override async Task Expected_names_appear_in_type_discriminator_mapping(s [InlineData("!relationshipsInRoadResponse", "cyclePaths")] [InlineData("atomicOperation", // @formatter:keep_existing_linebreaks true - "addBuilding|updateBuilding|removeBuilding|" + - "addResidence|updateResidence|removeResidence|addToResidenceRooms|updateResidenceRooms|removeFromResidenceRooms|" + - "addFamilyHome|updateFamilyHome|removeFamilyHome|addToFamilyHomeRooms|updateFamilyHomeRooms|removeFromFamilyHomeRooms|" + - "addMansion|updateMansion|removeMansion|addToMansionRooms|updateMansionRooms|removeFromMansionRooms|addToMansionStaff|updateMansionStaff|removeFromMansionStaff|" + - "addRoom|updateRoom|removeRoom|updateRoomResidence|" + - "addBathroom|updateBathroom|removeBathroom|updateBathroomResidence|" + - "addBedroom|updateBedroom|removeBedroom|updateBedroomResidence|" + - "addKitchen|updateKitchen|removeKitchen|updateKitchenResidence|" + - "addLivingRoom|updateLivingRoom|removeLivingRoom|updateLivingRoomResidence|" + - "addToilet|updateToilet|removeToilet|updateToiletResidence|" + - "addDistrict|updateDistrict|removeDistrict|addToDistrictBuildings|updateDistrictBuildings|removeFromDistrictBuildings|addToDistrictRoads|updateDistrictRoads|removeFromDistrictRoads|" + - "addRoad|updateRoad|removeRoad|" + - "addCyclePath|updateCyclePath|removeCyclePath|" + - "addStaffMember|updateStaffMember|removeStaffMember" + "createBuildingOperation|updateBuildingOperation|deleteBuildingOperation|" + + "createResidenceOperation|updateResidenceOperation|deleteResidenceOperation|addToResidenceRoomsRelationshipOperation|updateResidenceRoomsRelationshipOperation|removeFromResidenceRoomsRelationshipOperation|" + + "createFamilyHomeOperation|updateFamilyHomeOperation|deleteFamilyHomeOperation|addToFamilyHomeRoomsRelationshipOperation|updateFamilyHomeRoomsRelationshipOperation|removeFromFamilyHomeRoomsRelationshipOperation|" + + "createMansionOperation|updateMansionOperation|deleteMansionOperation|addToMansionRoomsRelationshipOperation|updateMansionRoomsRelationshipOperation|removeFromMansionRoomsRelationshipOperation|addToMansionStaffRelationshipOperation|updateMansionStaffRelationshipOperation|removeFromMansionStaffRelationshipOperation|" + + "createRoomOperation|updateRoomOperation|deleteRoomOperation|updateRoomResidenceRelationshipOperation|" + + "createBathroomOperation|updateBathroomOperation|deleteBathroomOperation|updateBathroomResidenceRelationshipOperation|" + + "createBedroomOperation|updateBedroomOperation|deleteBedroomOperation|updateBedroomResidenceRelationshipOperation|" + + "createKitchenOperation|updateKitchenOperation|deleteKitchenOperation|updateKitchenResidenceRelationshipOperation|" + + "createLivingRoomOperation|updateLivingRoomOperation|deleteLivingRoomOperation|updateLivingRoomResidenceRelationshipOperation|" + + "createToiletOperation|updateToiletOperation|deleteToiletOperation|updateToiletResidenceRelationshipOperation|" + + "createDistrictOperation|updateDistrictOperation|deleteDistrictOperation|addToDistrictBuildingsRelationshipOperation|updateDistrictBuildingsRelationshipOperation|removeFromDistrictBuildingsRelationshipOperation|addToDistrictRoadsRelationshipOperation|updateDistrictRoadsRelationshipOperation|removeFromDistrictRoadsRelationshipOperation|" + + "createRoadOperation|updateRoadOperation|deleteRoadOperation|" + + "createCyclePathOperation|updateCyclePathOperation|deleteCyclePathOperation|" + + "createStaffMemberOperation|updateStaffMemberOperation|deleteStaffMemberOperation" // @formatter:keep_existing_linebreaks restore )] public override async Task Expected_names_appear_in_openapi_discriminator_mapping(string schemaName, string? discriminatorValues) diff --git a/test/OpenApiTests/ResourceInheritance/OnlyAbstract/OnlyAbstractInheritanceTests.cs b/test/OpenApiTests/ResourceInheritance/OnlyAbstract/OnlyAbstractInheritanceTests.cs index 5efacb7f17..6bde356b7d 100644 --- a/test/OpenApiTests/ResourceInheritance/OnlyAbstract/OnlyAbstractInheritanceTests.cs +++ b/test/OpenApiTests/ResourceInheritance/OnlyAbstract/OnlyAbstractInheritanceTests.cs @@ -81,16 +81,16 @@ public override async Task Expected_names_appear_in_type_discriminator_mapping(s [InlineData("!relationshipsInRoadResponse", null)] [InlineData("atomicOperation", // @formatter:keep_existing_linebreaks true - "addBuilding|updateBuilding|removeBuilding|" + - "addResidence|updateResidence|removeResidence|addToResidenceRooms|updateResidenceRooms|removeFromResidenceRooms|" + - "addFamilyHome|updateFamilyHome|removeFamilyHome|addToFamilyHomeRooms|updateFamilyHomeRooms|removeFromFamilyHomeRooms|" + - "addMansion|updateMansion|removeMansion|addToMansionRooms|updateMansionRooms|removeFromMansionRooms|addToMansionStaff|updateMansionStaff|removeFromMansionStaff|" + - "addRoom|updateRoom|removeRoom|updateRoomResidence|" + - "addBathroom|updateBathroom|removeBathroom|updateBathroomResidence|" + - "addBedroom|updateBedroom|removeBedroom|updateBedroomResidence|" + - "addKitchen|updateKitchen|removeKitchen|updateKitchenResidence|" + - "addLivingRoom|updateLivingRoom|removeLivingRoom|updateLivingRoomResidence|" + - "addToilet|updateToilet|removeToilet|updateToiletResidence" + "createBuildingOperation|updateBuildingOperation|deleteBuildingOperation|" + + "createResidenceOperation|updateResidenceOperation|deleteResidenceOperation|addToResidenceRoomsRelationshipOperation|updateResidenceRoomsRelationshipOperation|removeFromResidenceRoomsRelationshipOperation|" + + "createFamilyHomeOperation|updateFamilyHomeOperation|deleteFamilyHomeOperation|addToFamilyHomeRoomsRelationshipOperation|updateFamilyHomeRoomsRelationshipOperation|removeFromFamilyHomeRoomsRelationshipOperation|" + + "createMansionOperation|updateMansionOperation|deleteMansionOperation|addToMansionRoomsRelationshipOperation|updateMansionRoomsRelationshipOperation|removeFromMansionRoomsRelationshipOperation|addToMansionStaffRelationshipOperation|updateMansionStaffRelationshipOperation|removeFromMansionStaffRelationshipOperation|" + + "createRoomOperation|updateRoomOperation|deleteRoomOperation|updateRoomResidenceRelationshipOperation|" + + "createBathroomOperation|updateBathroomOperation|deleteBathroomOperation|updateBathroomResidenceRelationshipOperation|" + + "createBedroomOperation|updateBedroomOperation|deleteBedroomOperation|updateBedroomResidenceRelationshipOperation|" + + "createKitchenOperation|updateKitchenOperation|deleteKitchenOperation|updateKitchenResidenceRelationshipOperation|" + + "createLivingRoomOperation|updateLivingRoomOperation|deleteLivingRoomOperation|updateLivingRoomResidenceRelationshipOperation|" + + "createToiletOperation|updateToiletOperation|deleteToiletOperation|updateToiletResidenceRelationshipOperation" // @formatter:keep_existing_linebreaks restore )] public override async Task Expected_names_appear_in_openapi_discriminator_mapping(string schemaName, string? discriminatorValues) diff --git a/test/OpenApiTests/ResourceInheritance/OnlyConcrete/OnlyConcreteInheritanceTests.cs b/test/OpenApiTests/ResourceInheritance/OnlyConcrete/OnlyConcreteInheritanceTests.cs index 6a0f9742df..0c5f43474e 100644 --- a/test/OpenApiTests/ResourceInheritance/OnlyConcrete/OnlyConcreteInheritanceTests.cs +++ b/test/OpenApiTests/ResourceInheritance/OnlyConcrete/OnlyConcreteInheritanceTests.cs @@ -89,18 +89,18 @@ public override async Task Expected_names_appear_in_type_discriminator_mapping(s [InlineData("!relationshipsInRoadResponse", "cyclePaths")] [InlineData("atomicOperation", // @formatter:keep_existing_linebreaks true - "addResidence|updateResidence|removeResidence|addToResidenceRooms|updateResidenceRooms|removeFromResidenceRooms|" + - "addFamilyHome|updateFamilyHome|removeFamilyHome|addToFamilyHomeRooms|updateFamilyHomeRooms|removeFromFamilyHomeRooms|" + - "addMansion|updateMansion|removeMansion|addToMansionRooms|updateMansionRooms|removeFromMansionRooms|addToMansionStaff|updateMansionStaff|removeFromMansionStaff|" + - "addBathroom|updateBathroom|removeBathroom|updateBathroomResidence|" + - "addBedroom|updateBedroom|removeBedroom|updateBedroomResidence|" + - "addKitchen|updateKitchen|removeKitchen|updateKitchenResidence|" + - "addLivingRoom|updateLivingRoom|removeLivingRoom|updateLivingRoomResidence|" + - "addToilet|updateToilet|removeToilet|updateToiletResidence|" + - "addDistrict|updateDistrict|removeDistrict|addToDistrictBuildings|updateDistrictBuildings|removeFromDistrictBuildings|addToDistrictRoads|updateDistrictRoads|removeFromDistrictRoads|" + - "addRoad|updateRoad|removeRoad|" + - "addCyclePath|updateCyclePath|removeCyclePath|" + - "addStaffMember|updateStaffMember|removeStaffMember" + "createResidenceOperation|updateResidenceOperation|deleteResidenceOperation|addToResidenceRoomsRelationshipOperation|updateResidenceRoomsRelationshipOperation|removeFromResidenceRoomsRelationshipOperation|" + + "createFamilyHomeOperation|updateFamilyHomeOperation|deleteFamilyHomeOperation|addToFamilyHomeRoomsRelationshipOperation|updateFamilyHomeRoomsRelationshipOperation|removeFromFamilyHomeRoomsRelationshipOperation|" + + "createMansionOperation|updateMansionOperation|deleteMansionOperation|addToMansionRoomsRelationshipOperation|updateMansionRoomsRelationshipOperation|removeFromMansionRoomsRelationshipOperation|addToMansionStaffRelationshipOperation|updateMansionStaffRelationshipOperation|removeFromMansionStaffRelationshipOperation|" + + "createBathroomOperation|updateBathroomOperation|deleteBathroomOperation|updateBathroomResidenceRelationshipOperation|" + + "createBedroomOperation|updateBedroomOperation|deleteBedroomOperation|updateBedroomResidenceRelationshipOperation|" + + "createKitchenOperation|updateKitchenOperation|deleteKitchenOperation|updateKitchenResidenceRelationshipOperation|" + + "createLivingRoomOperation|updateLivingRoomOperation|deleteLivingRoomOperation|updateLivingRoomResidenceRelationshipOperation|" + + "createToiletOperation|updateToiletOperation|deleteToiletOperation|updateToiletResidenceRelationshipOperation|" + + "createDistrictOperation|updateDistrictOperation|deleteDistrictOperation|addToDistrictBuildingsRelationshipOperation|updateDistrictBuildingsRelationshipOperation|removeFromDistrictBuildingsRelationshipOperation|addToDistrictRoadsRelationshipOperation|updateDistrictRoadsRelationshipOperation|removeFromDistrictRoadsRelationshipOperation|" + + "createRoadOperation|updateRoadOperation|deleteRoadOperation|" + + "createCyclePathOperation|updateCyclePathOperation|deleteCyclePathOperation|" + + "createStaffMemberOperation|updateStaffMemberOperation|deleteStaffMemberOperation" // @formatter:keep_existing_linebreaks restore )] public override async Task Expected_names_appear_in_openapi_discriminator_mapping(string schemaName, string? discriminatorValues) diff --git a/test/OpenApiTests/ResourceInheritance/OnlyOperations/OnlyOperationsInheritanceTests.cs b/test/OpenApiTests/ResourceInheritance/OnlyOperations/OnlyOperationsInheritanceTests.cs index 94ada069cc..0b490d58d0 100644 --- a/test/OpenApiTests/ResourceInheritance/OnlyOperations/OnlyOperationsInheritanceTests.cs +++ b/test/OpenApiTests/ResourceInheritance/OnlyOperations/OnlyOperationsInheritanceTests.cs @@ -89,20 +89,20 @@ public override async Task Expected_names_appear_in_type_discriminator_mapping(s [InlineData("!relationshipsInRoadResponse", "cyclePaths")] [InlineData("atomicOperation", // @formatter:keep_existing_linebreaks true - "addBuilding|updateBuilding|removeBuilding|" + - "addResidence|updateResidence|removeResidence|addToResidenceRooms|updateResidenceRooms|removeFromResidenceRooms|" + - "addFamilyHome|updateFamilyHome|removeFamilyHome|addToFamilyHomeRooms|updateFamilyHomeRooms|removeFromFamilyHomeRooms|" + - "addMansion|updateMansion|removeMansion|addToMansionRooms|updateMansionRooms|removeFromMansionRooms|addToMansionStaff|updateMansionStaff|removeFromMansionStaff|" + - "addRoom|updateRoom|removeRoom|updateRoomResidence|" + - "addBathroom|updateBathroom|removeBathroom|updateBathroomResidence|" + - "addBedroom|updateBedroom|removeBedroom|updateBedroomResidence|" + - "addKitchen|updateKitchen|removeKitchen|updateKitchenResidence|" + - "addLivingRoom|updateLivingRoom|removeLivingRoom|updateLivingRoomResidence|" + - "addToilet|updateToilet|removeToilet|updateToiletResidence|" + - "addDistrict|updateDistrict|removeDistrict|addToDistrictBuildings|updateDistrictBuildings|removeFromDistrictBuildings|addToDistrictRoads|updateDistrictRoads|removeFromDistrictRoads|" + - "addRoad|updateRoad|removeRoad|" + - "addCyclePath|updateCyclePath|removeCyclePath|" + - "addStaffMember|updateStaffMember|removeStaffMember" + "createBuildingOperation|updateBuildingOperation|deleteBuildingOperation|" + + "createResidenceOperation|updateResidenceOperation|deleteResidenceOperation|addToResidenceRoomsRelationshipOperation|updateResidenceRoomsRelationshipOperation|removeFromResidenceRoomsRelationshipOperation|" + + "createFamilyHomeOperation|updateFamilyHomeOperation|deleteFamilyHomeOperation|addToFamilyHomeRoomsRelationshipOperation|updateFamilyHomeRoomsRelationshipOperation|removeFromFamilyHomeRoomsRelationshipOperation|" + + "createMansionOperation|updateMansionOperation|deleteMansionOperation|addToMansionRoomsRelationshipOperation|updateMansionRoomsRelationshipOperation|removeFromMansionRoomsRelationshipOperation|addToMansionStaffRelationshipOperation|updateMansionStaffRelationshipOperation|removeFromMansionStaffRelationshipOperation|" + + "createRoomOperation|updateRoomOperation|deleteRoomOperation|updateRoomResidenceRelationshipOperation|" + + "createBathroomOperation|updateBathroomOperation|deleteBathroomOperation|updateBathroomResidenceRelationshipOperation|" + + "createBedroomOperation|updateBedroomOperation|deleteBedroomOperation|updateBedroomResidenceRelationshipOperation|" + + "createKitchenOperation|updateKitchenOperation|deleteKitchenOperation|updateKitchenResidenceRelationshipOperation|" + + "createLivingRoomOperation|updateLivingRoomOperation|deleteLivingRoomOperation|updateLivingRoomResidenceRelationshipOperation|" + + "createToiletOperation|updateToiletOperation|deleteToiletOperation|updateToiletResidenceRelationshipOperation|" + + "createDistrictOperation|updateDistrictOperation|deleteDistrictOperation|addToDistrictBuildingsRelationshipOperation|updateDistrictBuildingsRelationshipOperation|removeFromDistrictBuildingsRelationshipOperation|addToDistrictRoadsRelationshipOperation|updateDistrictRoadsRelationshipOperation|removeFromDistrictRoadsRelationshipOperation|" + + "createRoadOperation|updateRoadOperation|deleteRoadOperation|" + + "createCyclePathOperation|updateCyclePathOperation|deleteCyclePathOperation|" + + "createStaffMemberOperation|updateStaffMemberOperation|deleteStaffMemberOperation" // @formatter:keep_existing_linebreaks restore )] public override async Task Expected_names_appear_in_openapi_discriminator_mapping(string schemaName, string? discriminatorValues) diff --git a/test/OpenApiTests/ResourceInheritance/OnlyRelationships/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/ResourceInheritance/OnlyRelationships/GeneratedSwagger/swagger.g.json index c9cdbea0b0..4f80315108 100644 --- a/test/OpenApiTests/ResourceInheritance/OnlyRelationships/GeneratedSwagger/swagger.g.json +++ b/test/OpenApiTests/ResourceInheritance/OnlyRelationships/GeneratedSwagger/swagger.g.json @@ -4365,30 +4365,30 @@ "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "addToDistrictBuildings": "#/components/schemas/addToDistrictBuildingsRelationshipOperation", - "addToDistrictRoads": "#/components/schemas/addToDistrictRoadsRelationshipOperation", - "addToFamilyHomeRooms": "#/components/schemas/addToFamilyHomeRoomsRelationshipOperation", - "addToMansionRooms": "#/components/schemas/addToMansionRoomsRelationshipOperation", - "addToMansionStaff": "#/components/schemas/addToMansionStaffRelationshipOperation", - "addToResidenceRooms": "#/components/schemas/addToResidenceRoomsRelationshipOperation", - "removeFromDistrictBuildings": "#/components/schemas/removeFromDistrictBuildingsRelationshipOperation", - "removeFromDistrictRoads": "#/components/schemas/removeFromDistrictRoadsRelationshipOperation", - "removeFromFamilyHomeRooms": "#/components/schemas/removeFromFamilyHomeRoomsRelationshipOperation", - "removeFromMansionRooms": "#/components/schemas/removeFromMansionRoomsRelationshipOperation", - "removeFromMansionStaff": "#/components/schemas/removeFromMansionStaffRelationshipOperation", - "removeFromResidenceRooms": "#/components/schemas/removeFromResidenceRoomsRelationshipOperation", - "updateBathroomResidence": "#/components/schemas/updateBathroomResidenceRelationshipOperation", - "updateBedroomResidence": "#/components/schemas/updateBedroomResidenceRelationshipOperation", - "updateDistrictBuildings": "#/components/schemas/updateDistrictBuildingsRelationshipOperation", - "updateDistrictRoads": "#/components/schemas/updateDistrictRoadsRelationshipOperation", - "updateFamilyHomeRooms": "#/components/schemas/updateFamilyHomeRoomsRelationshipOperation", - "updateKitchenResidence": "#/components/schemas/updateKitchenResidenceRelationshipOperation", - "updateLivingRoomResidence": "#/components/schemas/updateLivingRoomResidenceRelationshipOperation", - "updateMansionRooms": "#/components/schemas/updateMansionRoomsRelationshipOperation", - "updateMansionStaff": "#/components/schemas/updateMansionStaffRelationshipOperation", - "updateResidenceRooms": "#/components/schemas/updateResidenceRoomsRelationshipOperation", - "updateRoomResidence": "#/components/schemas/updateRoomResidenceRelationshipOperation", - "updateToiletResidence": "#/components/schemas/updateToiletResidenceRelationshipOperation" + "addToDistrictBuildingsRelationshipOperation": "#/components/schemas/addToDistrictBuildingsRelationshipOperation", + "addToDistrictRoadsRelationshipOperation": "#/components/schemas/addToDistrictRoadsRelationshipOperation", + "addToFamilyHomeRoomsRelationshipOperation": "#/components/schemas/addToFamilyHomeRoomsRelationshipOperation", + "addToMansionRoomsRelationshipOperation": "#/components/schemas/addToMansionRoomsRelationshipOperation", + "addToMansionStaffRelationshipOperation": "#/components/schemas/addToMansionStaffRelationshipOperation", + "addToResidenceRoomsRelationshipOperation": "#/components/schemas/addToResidenceRoomsRelationshipOperation", + "removeFromDistrictBuildingsRelationshipOperation": "#/components/schemas/removeFromDistrictBuildingsRelationshipOperation", + "removeFromDistrictRoadsRelationshipOperation": "#/components/schemas/removeFromDistrictRoadsRelationshipOperation", + "removeFromFamilyHomeRoomsRelationshipOperation": "#/components/schemas/removeFromFamilyHomeRoomsRelationshipOperation", + "removeFromMansionRoomsRelationshipOperation": "#/components/schemas/removeFromMansionRoomsRelationshipOperation", + "removeFromMansionStaffRelationshipOperation": "#/components/schemas/removeFromMansionStaffRelationshipOperation", + "removeFromResidenceRoomsRelationshipOperation": "#/components/schemas/removeFromResidenceRoomsRelationshipOperation", + "updateBathroomResidenceRelationshipOperation": "#/components/schemas/updateBathroomResidenceRelationshipOperation", + "updateBedroomResidenceRelationshipOperation": "#/components/schemas/updateBedroomResidenceRelationshipOperation", + "updateDistrictBuildingsRelationshipOperation": "#/components/schemas/updateDistrictBuildingsRelationshipOperation", + "updateDistrictRoadsRelationshipOperation": "#/components/schemas/updateDistrictRoadsRelationshipOperation", + "updateFamilyHomeRoomsRelationshipOperation": "#/components/schemas/updateFamilyHomeRoomsRelationshipOperation", + "updateKitchenResidenceRelationshipOperation": "#/components/schemas/updateKitchenResidenceRelationshipOperation", + "updateLivingRoomResidenceRelationshipOperation": "#/components/schemas/updateLivingRoomResidenceRelationshipOperation", + "updateMansionRoomsRelationshipOperation": "#/components/schemas/updateMansionRoomsRelationshipOperation", + "updateMansionStaffRelationshipOperation": "#/components/schemas/updateMansionStaffRelationshipOperation", + "updateResidenceRoomsRelationshipOperation": "#/components/schemas/updateResidenceRoomsRelationshipOperation", + "updateRoomResidenceRelationshipOperation": "#/components/schemas/updateRoomResidenceRelationshipOperation", + "updateToiletResidenceRelationshipOperation": "#/components/schemas/updateToiletResidenceRelationshipOperation" } }, "x-abstract": true diff --git a/test/OpenApiTests/ResourceInheritance/OnlyRelationships/OnlyRelationshipsInheritanceTests.cs b/test/OpenApiTests/ResourceInheritance/OnlyRelationships/OnlyRelationshipsInheritanceTests.cs index 8d41ebaf68..f8047d189c 100644 --- a/test/OpenApiTests/ResourceInheritance/OnlyRelationships/OnlyRelationshipsInheritanceTests.cs +++ b/test/OpenApiTests/ResourceInheritance/OnlyRelationships/OnlyRelationshipsInheritanceTests.cs @@ -85,16 +85,16 @@ public override async Task Expected_names_appear_in_type_discriminator_mapping(s [InlineData("!relationshipsInRoadResponse", null)] [InlineData("atomicOperation", // @formatter:keep_existing_linebreaks true - "addToResidenceRooms|updateResidenceRooms|removeFromResidenceRooms|" + - "addToFamilyHomeRooms|updateFamilyHomeRooms|removeFromFamilyHomeRooms|" + - "addToMansionRooms|updateMansionRooms|removeFromMansionRooms|addToMansionStaff|updateMansionStaff|removeFromMansionStaff|" + - "updateRoomResidence|" + - "updateBathroomResidence|" + - "updateBedroomResidence|" + - "updateKitchenResidence|" + - "updateLivingRoomResidence|" + - "updateToiletResidence|" + - "addToDistrictBuildings|updateDistrictBuildings|removeFromDistrictBuildings|addToDistrictRoads|updateDistrictRoads|removeFromDistrictRoads" + "addToResidenceRoomsRelationshipOperation|updateResidenceRoomsRelationshipOperation|removeFromResidenceRoomsRelationshipOperation|" + + "addToFamilyHomeRoomsRelationshipOperation|updateFamilyHomeRoomsRelationshipOperation|removeFromFamilyHomeRoomsRelationshipOperation|" + + "addToMansionRoomsRelationshipOperation|updateMansionRoomsRelationshipOperation|removeFromMansionRoomsRelationshipOperation|addToMansionStaffRelationshipOperation|updateMansionStaffRelationshipOperation|removeFromMansionStaffRelationshipOperation|" + + "updateRoomResidenceRelationshipOperation|" + + "updateBathroomResidenceRelationshipOperation|" + + "updateBedroomResidenceRelationshipOperation|" + + "updateKitchenResidenceRelationshipOperation|" + + "updateLivingRoomResidenceRelationshipOperation|" + + "updateToiletResidenceRelationshipOperation|" + + "addToDistrictBuildingsRelationshipOperation|updateDistrictBuildingsRelationshipOperation|removeFromDistrictBuildingsRelationshipOperation|addToDistrictRoadsRelationshipOperation|updateDistrictRoadsRelationshipOperation|removeFromDistrictRoadsRelationshipOperation" // @formatter:keep_existing_linebreaks restore )] public override async Task Expected_names_appear_in_openapi_discriminator_mapping(string schemaName, string? discriminatorValues) diff --git a/test/OpenApiTests/ResourceInheritance/SubsetOfOperations/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/ResourceInheritance/SubsetOfOperations/GeneratedSwagger/swagger.g.json index 88e0ed9f8d..48e39eb3ac 100644 --- a/test/OpenApiTests/ResourceInheritance/SubsetOfOperations/GeneratedSwagger/swagger.g.json +++ b/test/OpenApiTests/ResourceInheritance/SubsetOfOperations/GeneratedSwagger/swagger.g.json @@ -168,27 +168,27 @@ "discriminator": { "propertyName": "openapi:discriminator", "mapping": { - "addBathroom": "#/components/schemas/createBathroomOperation", - "addBedroom": "#/components/schemas/createBedroomOperation", - "addFamilyHome": "#/components/schemas/createFamilyHomeOperation", - "addKitchen": "#/components/schemas/createKitchenOperation", - "addLivingRoom": "#/components/schemas/createLivingRoomOperation", - "addMansion": "#/components/schemas/createMansionOperation", - "addResidence": "#/components/schemas/createResidenceOperation", - "addRoom": "#/components/schemas/createRoomOperation", - "addToFamilyHomeRooms": "#/components/schemas/addToFamilyHomeRoomsRelationshipOperation", - "addToilet": "#/components/schemas/createToiletOperation", - "removeFromMansionRooms": "#/components/schemas/removeFromMansionRoomsRelationshipOperation", - "removeFromMansionStaff": "#/components/schemas/removeFromMansionStaffRelationshipOperation", - "updateBathroomResidence": "#/components/schemas/updateBathroomResidenceRelationshipOperation", - "updateBedroomResidence": "#/components/schemas/updateBedroomResidenceRelationshipOperation", - "updateFamilyHome": "#/components/schemas/updateFamilyHomeOperation", - "updateKitchenResidence": "#/components/schemas/updateKitchenResidenceRelationshipOperation", - "updateLivingRoomResidence": "#/components/schemas/updateLivingRoomResidenceRelationshipOperation", - "updateMansion": "#/components/schemas/updateMansionOperation", - "updateResidence": "#/components/schemas/updateResidenceOperation", - "updateRoomResidence": "#/components/schemas/updateRoomResidenceRelationshipOperation", - "updateToiletResidence": "#/components/schemas/updateToiletResidenceRelationshipOperation" + "addToFamilyHomeRoomsRelationshipOperation": "#/components/schemas/addToFamilyHomeRoomsRelationshipOperation", + "createBathroomOperation": "#/components/schemas/createBathroomOperation", + "createBedroomOperation": "#/components/schemas/createBedroomOperation", + "createFamilyHomeOperation": "#/components/schemas/createFamilyHomeOperation", + "createKitchenOperation": "#/components/schemas/createKitchenOperation", + "createLivingRoomOperation": "#/components/schemas/createLivingRoomOperation", + "createMansionOperation": "#/components/schemas/createMansionOperation", + "createResidenceOperation": "#/components/schemas/createResidenceOperation", + "createRoomOperation": "#/components/schemas/createRoomOperation", + "createToiletOperation": "#/components/schemas/createToiletOperation", + "removeFromMansionRoomsRelationshipOperation": "#/components/schemas/removeFromMansionRoomsRelationshipOperation", + "removeFromMansionStaffRelationshipOperation": "#/components/schemas/removeFromMansionStaffRelationshipOperation", + "updateBathroomResidenceRelationshipOperation": "#/components/schemas/updateBathroomResidenceRelationshipOperation", + "updateBedroomResidenceRelationshipOperation": "#/components/schemas/updateBedroomResidenceRelationshipOperation", + "updateFamilyHomeOperation": "#/components/schemas/updateFamilyHomeOperation", + "updateKitchenResidenceRelationshipOperation": "#/components/schemas/updateKitchenResidenceRelationshipOperation", + "updateLivingRoomResidenceRelationshipOperation": "#/components/schemas/updateLivingRoomResidenceRelationshipOperation", + "updateMansionOperation": "#/components/schemas/updateMansionOperation", + "updateResidenceOperation": "#/components/schemas/updateResidenceOperation", + "updateRoomResidenceRelationshipOperation": "#/components/schemas/updateRoomResidenceRelationshipOperation", + "updateToiletResidenceRelationshipOperation": "#/components/schemas/updateToiletResidenceRelationshipOperation" } }, "x-abstract": true diff --git a/test/OpenApiTests/ResourceInheritance/SubsetOfOperations/SubsetOfOperationsInheritanceTests.cs b/test/OpenApiTests/ResourceInheritance/SubsetOfOperations/SubsetOfOperationsInheritanceTests.cs index 7d49d6b2ea..f6fcd0fff2 100644 --- a/test/OpenApiTests/ResourceInheritance/SubsetOfOperations/SubsetOfOperationsInheritanceTests.cs +++ b/test/OpenApiTests/ResourceInheritance/SubsetOfOperations/SubsetOfOperationsInheritanceTests.cs @@ -82,15 +82,15 @@ public override async Task Expected_names_appear_in_type_discriminator_mapping(s [InlineData("atomicOperation", // @formatter:keep_existing_linebreaks true "" + - "addResidence|updateResidence|" + - "addFamilyHome|updateFamilyHome|addToFamilyHomeRooms|" + - "addMansion|updateMansion|removeFromMansionRooms|removeFromMansionStaff|" + - "addRoom|updateRoomResidence|" + - "addBathroom|updateBathroomResidence|" + - "addBedroom|updateBedroomResidence|" + - "addKitchen|updateKitchenResidence|" + - "addLivingRoom|updateLivingRoomResidence|" + - "addToilet|updateToiletResidence" + + "createResidenceOperation|updateResidenceOperation|" + + "createFamilyHomeOperation|updateFamilyHomeOperation|addToFamilyHomeRoomsRelationshipOperation|" + + "createMansionOperation|updateMansionOperation|removeFromMansionRoomsRelationshipOperation|removeFromMansionStaffRelationshipOperation|" + + "createRoomOperation|updateRoomResidenceRelationshipOperation|" + + "createBathroomOperation|updateBathroomResidenceRelationshipOperation|" + + "createBedroomOperation|updateBedroomResidenceRelationshipOperation|" + + "createKitchenOperation|updateKitchenResidenceRelationshipOperation|" + + "createLivingRoomOperation|updateLivingRoomResidenceRelationshipOperation|" + + "createToiletOperation|updateToiletResidenceRelationshipOperation" + "" + "" + "" +