pFad - Phonifier reborn

diff --git a/docs/internals/toc.md b/docs/internals/toc.md deleted file mode 100644 index 0533dc527..000000000 --- a/docs/internals/toc.md +++ /dev/null @@ -1 +0,0 @@ -# [Queries](queries.md) diff --git a/docs/internals/toc.yml b/docs/internals/toc.yml new file mode 100644 index 000000000..adb35afc5 --- /dev/null +++ b/docs/internals/toc.yml @@ -0,0 +1,2 @@ +- name: Queries + href: queries.md diff --git a/docs/request-examples/README.md b/docs/request-examples/README.md index eb95ea465..5a2911f5c 100644 --- a/docs/request-examples/README.md +++ b/docs/request-examples/README.md @@ -2,18 +2,20 @@ To update these requests: -1. Add a PowerShell (.ps1) script prefixed by a number that is used to determine the order the scripts are executed. The script should execute a request and output the response. Example: -``` -curl -s http://localhost:14141/api/books -``` +1. Add a PowerShell (`.ps1`) script prefixed by a number that is used to determine the order the scripts are executed. + The script should execute a request and output the response. For example: + ``` + curl -s http://localhost:14141/api/books + ``` -2. Add the example to `index.md`. Example: -``` -### Get with relationship +2. Add the example to `index.md`. For example: + ``` + ### Get with relationship -[!code-ps[REQUEST](003_GET_Books-including-Author.ps1)] -[!code-json[RESPONSE](003_GET_Books-including-Author_Response.json)] -``` + [!code-ps[REQUEST](003_GET_Books-including-Author.ps1)] + [!code-json[RESPONSE](003_GET_Books-including-Author_Response.json)] + ``` -3. Run `pwsh ../generate-examples.ps1` -4. Verify the results by running `pwsh ../build-dev.ps1` +3. Run `pwsh ../generate-examples.ps1` to execute the request. + +4. Run `pwsh ../build-dev.ps1` to view the output on the website. diff --git a/docs/request-examples/index.md b/docs/request-examples/index.md index 614aa4814..89c704345 100644 --- a/docs/request-examples/index.md +++ b/docs/request-examples/index.md @@ -1,17 +1,28 @@ ---- -_disableToc: true ---- +# Example projects -# Example requests +Runnable example projects can be found [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/src/Examples): + +- GettingStarted: A simple project with minimal configuration to develop a runnable project in minutes. +- JsonApiDotNetCoreExample: Showcases commonly-used features, such as resource definitions, atomic operations, and OpenAPI. + - OpenApiNSwagClientExample: Uses [NSwag](https://github.com/RicoSuter/NSwag) to generate a typed OpenAPI client. + - OpenApiKiotaClientExample: Uses [Kiota](https://learn.microsoft.com/en-us/openapi/kiota/) to generate a typed OpenAPI client. +- MultiDbContextExample: Shows how to use multiple `DbContext` classes, for connecting to multiple databases. +- DatabasePerTenantExample: Uses a different database per tenant. See [here](~/usage/advanced/multi-tenancy.md) for using multiple tenants in the same database. +- NoEntityFrameworkExample: Uses a read-only in-memory repository, instead of a real database. +- DapperExample: Uses [Dapper](https://github.com/DapperLib/Dapper) to execute SQL queries. +- ReportsExample: Uses a resource service that returns aggregated data. -These requests have been generated against the "GettingStarted" application and are updated on every deployment. +> [!NOTE] +> The example projects only cover highly-requested features. More advanced use cases can be found [here](~/usage/advanced/index.md). + +# Example requests -All of these requests have been created using out-of-the-box features. +The following requests are automatically generated against the "GettingStarted" application on every deployment. > [!NOTE] > curl requires "[" and "]" in URLs to be escaped. -# Reading data +## Reading data ### Get all @@ -48,7 +59,7 @@ All of these requests have been created using out-of-the-box features. [!code-ps[REQUEST](007_GET_Books-paginated.ps1)] [!code-json[RESPONSE](007_GET_Books-paginated_Response.json)] -# Writing data +## Writing data ### Create resource diff --git a/docs/request-examples/toc.md b/docs/request-examples/toc.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/docs/template/public/main.css b/docs/template/public/main.css new file mode 100644 index 000000000..a20926d93 --- /dev/null +++ b/docs/template/public/main.css @@ -0,0 +1,6 @@ +/* From https://github.com/dotnet/docfx/discussions/9644 */ + +body { + --bs-link-color-rgb: 66, 184, 131 !important; + --bs-link-hover-color-rgb: 64, 180, 128 !important; +} diff --git a/docs/template/public/main.js b/docs/template/public/main.js new file mode 100644 index 000000000..be4428bed --- /dev/null +++ b/docs/template/public/main.js @@ -0,0 +1,11 @@ +// From https://github.com/dotnet/docfx/discussions/9644 + +export default { + iconLinks: [ + { + icon: 'github', + href: 'https://github.com/json-api-dotnet/JsonApiDotNetCore', + title: 'GitHub' + } + ] +} diff --git a/docs/toc.yml b/docs/toc.yml index e9165998e..29f786ca4 100644 --- a/docs/toc.yml +++ b/docs/toc.yml @@ -1,17 +1,12 @@ - name: Getting Started - href: getting-started/ - + href: getting-started/index.md - name: Usage href: usage/ - - name: API href: api/ - homepage: api/index.md - + topicHref: api/index.md - name: Examples - href: request-examples/ - homepage: request-examples/index.md - + href: request-examples/index.md - name: Internals href: internals/ - homepage: internals/index.md + topicHref: internals/index.md diff --git a/docs/usage/advanced/alternate-routes.md b/docs/usage/advanced/alternate-routes.md new file mode 100644 index 000000000..a860a61fa --- /dev/null +++ b/docs/usage/advanced/alternate-routes.md @@ -0,0 +1,8 @@ +# Alternate Routes + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes) shows how the default JSON:API routes can be changed. + +The classes `TownsController` and `CiviliansController`: +- Are decorated with `[DisableRoutingConvention]` to turn off the default JSON:API routing convention. +- Are decorated with the ASP.NET `[Route]` attribute to specify at which route the controller is exposed. +- Are augmented with non-standard JSON:API action methods, whose `[HttpGet]` attributes specify a custom route. diff --git a/docs/usage/advanced/archiving.md b/docs/usage/advanced/archiving.md new file mode 100644 index 000000000..3892877a5 --- /dev/null +++ b/docs/usage/advanced/archiving.md @@ -0,0 +1,14 @@ +# Archiving + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving) demonstrates how to implement archived resources. + +> [!TIP] +> This scenario is comparable with [Soft Deletion](~/usage/advanced/soft-deletion.md). +> The difference is that archived resources are accessible to JSON:API clients, whereas soft-deleted resources _never_ are. + +- Archived resources can be fetched by ID, but don't show up in searches by default. +- Resources can only be created in a non-archived state and then archived/unarchived using a PATCH resource request. +- The archive date is stored in the database, but cannot be modified through JSON:API. +- To delete a resource, it must be archived first. + +This feature is implemented using a custom resource definition. It intercepts write operations and recursively scans incoming filters. diff --git a/docs/usage/advanced/auth-scopes.md b/docs/usage/advanced/auth-scopes.md new file mode 100644 index 000000000..e37cb1b6a --- /dev/null +++ b/docs/usage/advanced/auth-scopes.md @@ -0,0 +1,10 @@ +# Authorization Scopes + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes) shows how scope-based authorization can be used. + +- For simplicity, this code assumes the granted scopes are passed in a plain-text HTTP header. A more realistic use case would be to obtain the scopes from an OAuth token. +- The HTTP header lists which resource types can be read from and/or written to. +- An [ASP.NET Action Filter](https://learn.microsoft.com/aspnet/core/mvc/controllers/filters) validates incoming JSON:API resource/relationship requests. + - The incoming request path is validated against the permitted read/write permissions per resource type. + - The resource types used in query string parameters are validated against the permitted set of resource types. +- A customized operations controller verifies that all incoming operations are allowed. diff --git a/docs/usage/advanced/blobs.md b/docs/usage/advanced/blobs.md new file mode 100644 index 000000000..d3d4525c6 --- /dev/null +++ b/docs/usage/advanced/blobs.md @@ -0,0 +1,9 @@ +# BLOBs + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs) shows how Binary Large Objects (BLOBs) can be used. + +- The `ImageContainer` resource type contains nullable and non-nullable `byte[]` properties. +- BLOBs are queried and persisted using Entity Framework Core. +- The BLOB data is returned as a base-64 encoded string in the JSON response. + +Blobs are handled automatically; there's no need for custom code. diff --git a/docs/usage/advanced/composite-keys.md b/docs/usage/advanced/composite-keys.md new file mode 100644 index 000000000..768a22a19 --- /dev/null +++ b/docs/usage/advanced/composite-keys.md @@ -0,0 +1,8 @@ +# Composite Keys + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys) shows how database tables with composite keys can be used. + +- The `DbContext` configures `Car` to have a composite primary key consisting of the `RegionId` and `LicensePlate` columns. +- The `Car.Id` property is overridden to provide a unique ID for JSON:API. It is marked with `[NotMapped]`, meaning no `Id` column exists in the database table. +- The `Engine` and `Dealership` resource types define relationships that generate composite foreign keys in the database. +- A custom resource repository is used to rewrite IDs from filter/sort query string parameters into `RegionId` and `LicensePlate` lookups. diff --git a/docs/usage/advanced/content-negotiation.md b/docs/usage/advanced/content-negotiation.md new file mode 100644 index 000000000..980b2e0b6 --- /dev/null +++ b/docs/usage/advanced/content-negotiation.md @@ -0,0 +1,15 @@ +# Content Negotiation + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation) demonstrates how content negotiation in JSON:API works. + +Additionally, the code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/CustomExtensions) provides +a custom "server-time" JSON:API extension that returns the local or UTC server time in top-level `meta`. +- This extension can be used in the `Accept` and `Content-Type` HTTP headers. +- In a request body, the optional `useLocalTime` property in top-level `meta` indicates whether to return the local or UTC time. + +This feature is implemented using the following extensibility points: + +- At startup, the "server-time" extension is added in `JsonApiOptions`, which permits clients to use it. +- A custom `JsonApiContentNegotiator` chooses which extensions are active for an incoming request, taking the "server-time" extension into account. +- A custom `IDocumentAdapter` captures the incoming request body, providing access to the `useLocalTime` property in `meta`. +- A custom `IResponseMeta` adds the server time to the response, depending on the activated extensions in `IJsonApiRequest` and the captured request body. diff --git a/docs/usage/advanced/eager-loading.md b/docs/usage/advanced/eager-loading.md new file mode 100644 index 000000000..72e401c4f --- /dev/null +++ b/docs/usage/advanced/eager-loading.md @@ -0,0 +1,12 @@ +# Eager Loading Related Resources + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading) uses the `[EagerLoad]` attribute to facilitate calculated properties that depend on related resources. +The related resources are fetched from the database, but not returned to the client unless explicitly requested using the `include` query string parameter. + +- The `Street` resource type uses `EagerLoad` on its `Buildings` to-many relationship because its `DoorTotalCount` calculated property depends on it. +- The `Building` resource type uses `EagerLoad` on its `Windows` to-many relationship because its `WindowCount` calculated property depends on it. +- The `Building` resource type uses `EagerLoad` on its `PrimaryDoor` to-one required relationship because its `PrimaryDoorColor` calculated property depends on it. + - Because this is a required relationship, special handling occurs in `Building`, `BuildingRepository`, and `BuildingDefinition`. +- The `Building` resource type uses `EagerLoad` on its `SecondaryDoor` to-one optional relationship because its `SecondaryDoorColor` calculated property depends on it. + +As can be seen from the usages above, a chain of `EagerLoad` attributes can result in fetching a chain of related resources from the database. diff --git a/docs/usage/advanced/error-handling.md b/docs/usage/advanced/error-handling.md new file mode 100644 index 000000000..c53b3f266 --- /dev/null +++ b/docs/usage/advanced/error-handling.md @@ -0,0 +1,13 @@ +# Error Handling + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling) shows how to customize error handling. + +A user-defined exception, `ConsumerArticleIsNoLongerAvailableException`, is thrown from a resource service to demonstrate handling it. +Note that this exception can be thrown from anywhere during request execution; a resource service is just used here for simplicity. + +To handle the user-defined exception, `AlternateExceptionHandler` inherits from `ExceptionHandler` to: +- Customize the JSON:API error response by adding a `meta` entry when `ConsumerArticleIsNoLongerAvailableException` is thrown. +- Indicate that `ConsumerArticleIsNoLongerAvailableException` must be logged at the Warning level. + +Additionally, the `ThrowingArticle.Status` property throws an `InvalidOperationException`. +This triggers the default error handling because `AlternateExceptionHandler` delegates to its base class. diff --git a/docs/usage/advanced/hosting-iis.md b/docs/usage/advanced/hosting-iis.md new file mode 100644 index 000000000..f452adaee --- /dev/null +++ b/docs/usage/advanced/hosting-iis.md @@ -0,0 +1,7 @@ +# Hosting in Internet Information Services (IIS) + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS) calls [UsePathBase](https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.builder.usepathbaseextensions.usepathbase) to simulate hosting in IIS. +For details on how `UsePathBase` works, see [Understanding PathBase in ASP.NET Core](https://andrewlock.net/understanding-pathbase-in-aspnetcore/). + +- At startup, the line `app.UsePathBase("/iis-application-virtual-directory")` configures ASP.NET to use the base path. +- `PaintingsController` uses a custom route to demonstrate that both features can be used together. diff --git a/docs/usage/advanced/id-obfuscation.md b/docs/usage/advanced/id-obfuscation.md new file mode 100644 index 000000000..4012238c2 --- /dev/null +++ b/docs/usage/advanced/id-obfuscation.md @@ -0,0 +1,16 @@ +# ID Obfuscation + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation) shows how to use obfuscated IDs. +They are typically used to prevent clients from guessing primary key values. + +All IDs sent by clients are transparently de-obfuscated into internal numeric values before accessing the database. +Numeric IDs returned from the database are obfuscated before they are sent to the client. + +> [!NOTE] +> An alternate solution is to use GUIDs instead of numeric primary keys in the database. + +ID obfuscation is achieved using the following extensibility points: + +- For simplicity, `HexadecimalCodec` is used to obfuscate numeric IDs to a hexadecimal format. A more realistic use case would be to use a symmetric crypto algorithm. +- `ObfuscatedIdentifiable` acts as the base class for resource types, handling the obfuscation and de-obfuscation of IDs. +- `ObfuscatedIdentifiableController` acts as the base class for controllers. It inherits from `BaseJsonApiController`, changing the `id` parameter in action methods to type `string`. diff --git a/docs/usage/advanced/index.md b/docs/usage/advanced/index.md new file mode 100644 index 000000000..6bf9841db --- /dev/null +++ b/docs/usage/advanced/index.md @@ -0,0 +1,19 @@ +# Advanced JSON:API features + +This topic goes beyond the basics of what's possible with JsonApiDotNetCore. + +Advanced use cases are provided in the form of integration tests [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests). +This ensures they don't break during development of the framework. + +Each directory typically contains: + +- A set of resource types. +- A `DbContext` class to register the resource types. +- Fakers to generate deterministic test data. +- Test classes that assert the feature works as expected. + - Entities are inserted into a randomly named PostgreSQL database. + - An HTTP request is sent. + - The returned response is asserted on. + - If applicable, the changes are fetched from the database and asserted on. + +To run/debug the integration tests, follow the steps in [README.md](https://github.com/json-api-dotnet/JsonApiDotNetCore#build-from-source). diff --git a/docs/usage/advanced/links.md b/docs/usage/advanced/links.md new file mode 100644 index 000000000..d26be8756 --- /dev/null +++ b/docs/usage/advanced/links.md @@ -0,0 +1,19 @@ +# Links + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/Links) shows various ways to configure which links are returned, and how they appear in responses. + +> [!TIP] +> By default, absolute links are returned. To return relative links, set [JsonApiOptions.UseRelativeLinks](~/usage/options.md#relative-links) at startup. + +> [!TIP] +> To add a global prefix to all routes, set `JsonApiOptions.Namespace` at startup. + +Which links to render can be configured globally in options, then overridden per resource type, and then overridden per relationship. + +- The `PhotoLocation` resource type turns off `TopLevelLinks` and `ResourceLinks`, and sets `RelationshipLinks` to `Related`. +- The `PhotoLocation.Album` relationship turns off all links for this relationship. + +The various tests set `JsonApiOptions.Namespace` and `JsonApiOptions.UseRelativeLinks` to verify that the proper links are rendered. +This can't be set in the tests directly for technical reasons, so they use different `Startup` classes to control this. + +Link rendering is fully controlled using attributes on your models. No further code is needed. diff --git a/docs/usage/advanced/microservices.md b/docs/usage/advanced/microservices.md new file mode 100644 index 000000000..88e9cb08b --- /dev/null +++ b/docs/usage/advanced/microservices.md @@ -0,0 +1,22 @@ +# Microservices + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices) shows patterns commonly used in microservices architecture: + +- [Fire-and-forget](https://microservices.io/patterns/communication-style/messaging.html): Outgoing messages are sent to an external queue, without waiting for their processing to start. While this is the simplest solution, it is not very reliable when errors occur. +- [Transactional Outbox Pattern](https://microservices.io/patterns/data/transactional-outbox.html): Outgoing messages are saved to a queue table within the same database transaction. A background job (omitted in this example) polls the queue table and sends the messages to an external queue. + +> [!TIP] +> Potential external queue systems you could use are [RabbitMQ](https://www.rabbitmq.com/), [MassTransit](https://masstransit.io/), +> [Azure Service Bus](https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview) and [Apache Kafka](https://kafka.apache.org/). However, this is beyond the scope of this topic. + +The `Messages` directory lists the functional messages that are created from incoming JSON:API requests, which are typically processed by an external system that handles messages from the queue. +Each message has a unique ID and type, and is versioned to support gradual deployments. +Example payloads of messages are: user created, user login name changed, user moved to group, group created, group renamed, etc. + +The abstract types `MessagingGroupDefinition` and `MessagingUserDefinition` are resource definitions that contain code shared by both patterns. They inspect the incoming request and produce one or more functional messages from it. +The pattern-specific derived types inject their `DbContext`, which is used to query for additional information when determining what is being changed. + +> [!NOTE] +> Because networks are inherently unreliable, systems that consume messages from an external queue should be [idempotent](https://microservices.io/patterns/communication-style/idempotent-consumer.html). +> Several years ago, a [prototype](https://github.com/json-api-dotnet/JsonApiDotNetCore/pull/1132) was built to make JSON:API idempotent, but it was never finished due to a lack of community interest. +> Please [open an issue](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/new?labels=enhancement) if idempotency matters to you. diff --git a/docs/usage/advanced/model-state.md b/docs/usage/advanced/model-state.md new file mode 100644 index 000000000..0117cd72e --- /dev/null +++ b/docs/usage/advanced/model-state.md @@ -0,0 +1,14 @@ +# ASP.NET Model Validation + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState) shows how to use [ASP.NET Model Validation](https://learn.microsoft.com/aspnet/web-api/overview/formats-and-model-binding/model-validation-in-aspnet-web-api) attributes. + +> [!TIP] +> See [Atomic Operations](~/usage/advanced/operations.md) for how to implement a custom model validator. + +The resource types are decorated with Model Validation attributes, such as `[Required]`, `[RegularExpression]`, `[MinLength]`, and `[Range]`. + +Only the fields that appear in a request body (partial POST/PATCH) are validated. +When validation fails, the source pointer in the response indicates which attribute(s) are invalid. + +Model Validation is enabled by default, but can be [turned off in options](~/usage/options.md#modelstate-validation). +Aside from adding validation attributes to your resource properties, no further code is needed. diff --git a/docs/usage/advanced/multi-tenancy.md b/docs/usage/advanced/multi-tenancy.md new file mode 100644 index 000000000..d6e5b73f6 --- /dev/null +++ b/docs/usage/advanced/multi-tenancy.md @@ -0,0 +1,21 @@ +# Multi-tenancy + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy) shows how to handle multiple tenants in a single database. + +> [!TIP] +> To use a different database per tenant, see [this](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/src/Examples/DatabasePerTenantExample) example instead. +> Its `DbContext` dynamically sets the connection string per request. This requires the database structure to be identical for all tenants. + +The essence of implementing multi-tenancy within a single database is instructing Entity Framework Core to add implicit filters when entities are queried. +See the usage of `HasQueryFilter` in the `DbContext` class. It injects an `ITenantProvider` to determine the active tenant for the current HTTP request. + +> [!NOTE] +> For simplicity, this example uses a route parameter to indicate the active tenant. +> Provide your own `ITenantProvider` to determine the tenant from somewhere else, such as the incoming OAuth token. + +The generic `MultiTenantResourceService` transparently sets the tenant ID when creating a new resource. +Furthermore, it performs extra queries to ensure relationship changes apply to the current tenant, and to produce better error messages. + +While `MultiTenantResourceService` is used for both resource types, _only_ the `WebShop` resource type implements `IHasTenant`. +The related resource type `WebProduct` does not. Because the products table has a foreign key to the (tenant-specific) shop it belongs to, it doesn't need a `TenantId` column. +When a JSON:API request for web products executes, the `HasQueryFilter` in the `DbContext` ensures that only products belonging to the tenant-specific shop are returned. diff --git a/docs/usage/advanced/operations.md b/docs/usage/advanced/operations.md new file mode 100644 index 000000000..aec2b9fe4 --- /dev/null +++ b/docs/usage/advanced/operations.md @@ -0,0 +1,15 @@ +# Atomic Operations + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations) covers usage of the [Atomic Operations](https://jsonapi.org/ext/atomic/) extension, which enables sending multiple changes in a single request. + +- Operations for creating, updating, and deleting resources and relationships are shown. +- If one of the operations fails, the transaction is rolled back. +- Local IDs are used to reference resources created in a preceding operation within the same request. +- A custom controller restricts which operations are allowed, per resource type. +- The maximum number of operations per request can be configured at startup. +- For efficiency, operations are validated upfront (before accessing the database). If validation fails, the list of all errors is returned. + - Takes [ASP.NET Model Validation](https://learn.microsoft.com/aspnet/web-api/overview/formats-and-model-binding/model-validation-in-aspnet-web-api) attributes into account. + - See `DateMustBeInThePastAttribute` for how to implement a custom model validator. +- Various interactions with resource definitions are shown. + +The Atomic Operations extension is enabled after an operations controller is added to the project. No further code is needed. diff --git a/docs/usage/advanced/query-string-functions.md b/docs/usage/advanced/query-string-functions.md new file mode 100644 index 000000000..214228d65 --- /dev/null +++ b/docs/usage/advanced/query-string-functions.md @@ -0,0 +1,23 @@ +# Query String Functions + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CustomFunctions) shows how to define custom functions that clients can use in JSON:API query string parameters. + +- IsUpperCase: Adds the `isUpperCase` function, which can be used in filters on `string` attributes. + - Returns whether the attribute value is uppercase. + - Example usage: `GET /blogs/1/posts?filter=and(isUpperCase(caption),not(isUpperCase(url)))` +- StringLength: Adds the `length` function, which can be used in filters and sorts on `string` attributes. + - Returns the number of characters in the attribute value. + - Example filter usage: `GET /blogs?filter=greaterThan(length(title),'2')` + - Example sort usage: `GET /blogs/1/posts?sort=length(caption),-length(url)` +- Sum: Adds the `sum` function, which can be used in filters. + - Returns the sum of the numeric attribute values in related resources. + - Example: `GET /blogPosts?filter=greaterThan(sum(comments,numStars),'4')` +- TimeOffset: Adds the `timeOffset` function, which can be used in filters on `DateTime` attributes. + - Calculates the difference between the attribute value and the current date. + - A generic resource definition intercepts all filters, rewriting the usage of `timeOffset` into the equivalent filters on the target attribute. + - Example: `GET /reminders?filter=greaterOrEqual(remindsAt,timeOffset('+0:10:00'))` + +The basic pattern to implement a custom function is to: +- Define a custom expression type, which inherits from one of the built-in expression types, such as `FilterExpression` or `FunctionExpression`. +- Inherit from one of the built-in parsers, such as `FilterParser` or `SortParser`, to convert tokens to your custom expression type. Override the `ParseFilter` or `ParseFunction` method. +- Inherit from one of the built-in query clause builders, such as `WhereClauseBuilder` or `OrderClauseBuilder`, to produce a LINQ expression for your custom expression type. Override the `DefaultVisit` method. diff --git a/docs/usage/advanced/resource-injection.md b/docs/usage/advanced/resource-injection.md new file mode 100644 index 000000000..c4e82a40f --- /dev/null +++ b/docs/usage/advanced/resource-injection.md @@ -0,0 +1,11 @@ +# Injecting services in resource types + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection) shows how to inject services into resource types. + +Because Entity Framework Core doesn't support injecting arbitrary services into entity types (only a few special types), a workaround is used. +Instead of injecting the desired services directly, the `DbContext` is injected, which injects the desired services and exposes them via properties. + +- The `PostOffice` and `GiftCertificate` resource types both inject the `DbContext` in their constructors. +- The `DbContext` injects `TimeProvider` and exposes it through a property. +- `GiftCertificate` obtains the `TimeProvider` via the `DbContext` property to calculate the value for its exposed `HasExpired` property, which depends on the current time. +- `PostOffice` obtains the `TimeProvider` via the `DbContext` property to calculate the value for its exposed `IsOpen` property, which depends on the current time. diff --git a/docs/usage/advanced/soft-deletion.md b/docs/usage/advanced/soft-deletion.md new file mode 100644 index 000000000..cebc18e91 --- /dev/null +++ b/docs/usage/advanced/soft-deletion.md @@ -0,0 +1,15 @@ +# Soft Deletion + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion) demonstrates how to implement soft deletion of resources. + +> [!TIP] +> This scenario is comparable with [Archiving](~/usage/advanced/archiving.md). +> The difference is that soft-deleted resources are never accessible by JSON:API clients (despite still being stored in the database), whereas archived resources _are_ accessible. + +The essence of implementing soft deletion is instructing Entity Framework Core to add implicit filters when entities are queried. +See the usage of `HasQueryFilter` in the `DbContext` class. + +The `ISoftDeletable` interface provides the `SoftDeletedAt` database column. The `Company` and `Department` resource types implement this interface to indicate they use soft deletion. + +The generic `SoftDeletionAwareResourceService` overrides the `DeleteAsync` method to soft-delete a resource instead of truly deleting it, if it implements `ISoftDeletable`. +Furthermore, it performs extra queries to ensure relationship changes do not reference soft-deleted resources, and to produce better error messages. diff --git a/docs/usage/advanced/state-machine.md b/docs/usage/advanced/state-machine.md new file mode 100644 index 000000000..371300995 --- /dev/null +++ b/docs/usage/advanced/state-machine.md @@ -0,0 +1,11 @@ +# State Transitions in Resource Updates + +The code [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody) shows how to validate state transitions when updating a resource. + +This feature is implemented using a custom resource definition: + +- The `Workflow` resource type contains a `Stage` property of type `WorkflowStage`. +- The `WorkflowStage` enumeration lists a workflow's possible states. +- `WorkflowDefinition` contains a hard-coded stage transition table defining the valid transitions. For example, a workflow in stage `InProgress` can be changed to `OnHold` or `Canceled`, but not `Created`. + - The `OnPrepareWriteAsync` method is overridden to capture the stage currently stored in the database in the `_previousStage` private field. + - The `OnWritingAsync` method is overridden to verify whether the stage change is permitted. It consults the stage transition table to determine whether there's a path from `_previousStage` to the to-be-stored stage, producing an error if there isn't. diff --git a/docs/usage/advanced/toc.yml b/docs/usage/advanced/toc.yml new file mode 100644 index 000000000..9d45cd04b --- /dev/null +++ b/docs/usage/advanced/toc.yml @@ -0,0 +1,38 @@ +- name: Authorization Scopes + href: auth-scopes.md +- name: BLOBs + href: blobs.md +- name: Microservices + href: microservices.md +- name: Multi-tenancy + href: multi-tenancy.md +- name: Atomic Operations + href: operations.md +- name: Query String Functions + href: query-string-functions.md +- name: Alternate Routes + href: alternate-routes.md +- name: Content Negotiation + href: content-negotiation.md +- name: Error Handling + href: error-handling.md +- name: Hosting in IIS + href: hosting-iis.md +- name: ID Obfuscation + href: id-obfuscation.md +- name: Soft Deletion + href: soft-deletion.md +- name: Archiving + href: archiving.md +- name: ASP.NET Model Validation + href: model-state.md +- name: State Transitions in Resource Updates + href: state-machine.md +- name: Links + href: links.md +- name: Composite Keys + href: composite-keys.md +- name: Eager Loading + href: eager-loading.md +- name: Injecting services in resource types + href: resource-injection.md diff --git a/docs/usage/caching.md b/docs/usage/caching.md index 28d6a6a36..4243fd8be 100644 --- a/docs/usage/caching.md +++ b/docs/usage/caching.md @@ -4,8 +4,8 @@ _since v4.2_ GET requests return an [ETag](https://developer.mozilla.org/docs/Web/HTTP/Headers/ETag) HTTP header, which can be used by the client in subsequent requests to save network bandwidth. -Be aware that the returned ETag represents the entire response body (a 'resource' in HTTP terminology) for a request URL that includes the query string. -This is unrelated to JSON:API resources. Therefore, we do not use ETags for optimistic concurrency. +Be aware that the returned ETag represents the entire response body (a "resource" in HTTP terminology) for the full request URL, including the query string. +A resource in HTTP is unrelated to a JSON:API resource. Therefore, we do not use ETags for optimistic concurrency. Getting a list of resources returns an ETag: @@ -26,7 +26,7 @@ ETag: "7FFF010786E2CE8FC901896E83870E00" } ``` -The request is later resent using the received ETag. The server data has not changed at this point. +The request is later resent using the same ETag received earlier. The server data has not changed at this point. ```http GET /articles?sort=-lastModifiedAt HTTP/1.1 diff --git a/docs/usage/extensibility/toc.yml b/docs/usage/extensibility/toc.yml new file mode 100644 index 000000000..4a32581a6 --- /dev/null +++ b/docs/usage/extensibility/toc.yml @@ -0,0 +1,14 @@ +- name: Layer Overview + href: layer-overview.md +- name: Resource Definitions + href: resource-definitions.md +- name: Controllers + href: controllers.md +- name: Resource Services + href: services.md +- name: Resource Repositories + href: repositories.md +- name: Middleware + href: middleware.md +- name: Query Strings + href: query-strings.md diff --git a/docs/usage/faq.md b/docs/usage/faq.md new file mode 100644 index 000000000..dacd35889 --- /dev/null +++ b/docs/usage/faq.md @@ -0,0 +1,176 @@ +# Frequently Asked Questions + +#### Where can I find documentation and examples? +While the [documentation](~/usage/resources/index.md) covers basic features and a few runnable example projects are available [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/src/Examples), +many more advanced use cases are available as integration tests [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests), so be sure to check them out! + +#### Why don't you use the built-in OpenAPI support in ASP.NET Core? +The structure of JSON:API request and response bodies differs significantly from the signature of JsonApiDotNetCore controllers. +JsonApiDotNetCore provides OpenAPI support using [Swashbuckle](https://github.com/domaindrivendev/Swashbuckle.AspNetCore), a mature and feature-rich library that is highly extensible. +The [OpenAPI support in ASP.NET Core](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/openapi/overview) is still very young +and doesn't provide the level of extensibility needed for JsonApiDotNetCore. + +#### What's available to implement a JSON:API client? +To generate a typed client (specific to the resource types in your project), consider using our [OpenAPI](https://www.jsonapi.net/usage/openapi.html) NuGet package. + +If you need a generic client, it depends on the programming language used. There's an overwhelming list of client libraries at https://jsonapi.org/implementations/#client-libraries. + +The JSON object model inside JsonApiDotNetCore is tweaked for server-side handling (be tolerant at inputs and strict at outputs). +While you technically *could* use our `JsonSerializer` converters from a .NET client application with some hacks, we don't recommend doing so. +You'll need to build the resource graph on the client and rely on internal implementation details that are subject to change in future versions. + +#### How can I debug my API project? +Due to auto-generated controllers, you may find it hard to determine where to put your breakpoints. +In Visual Studio, controllers are accessible below **Solution Explorer > Project > Dependencies > Analyzers > JsonApiDotNetCore.SourceGenerators**. + +After turning on [Source Link](https://devblogs.microsoft.com/dotnet/improving-debug-time-productivity-with-source-link/#enabling-source-link) (which enables to download the JsonApiDotNetCore source code from GitHub), you can step into our source code and add breakpoints there too. + +Here are some key places in the execution pipeline to set a breakpoint: +- `JsonApiRoutingConvention.Apply`: Controllers are registered here (executes once at startup) +- `JsonApiMiddleware.InvokeAsync`: Content negotiation and `IJsonApiRequest` setup +- `QueryStringReader.ReadAll`: Parses the query string parameters +- `JsonApiReader.ReadAsync`: Parses the request body +- `OperationsProcessor.ProcessAsync`: Entry point for handling atomic operations +- `JsonApiResourceService`: Called by controllers, delegating to the repository layer +- `EntityFrameworkCoreRepository.ApplyQueryLayer`: Builds the `IQueryable<>` that is offered to Entity Framework Core (which turns it into SQL) +- `JsonApiWriter.WriteAsync`: Renders the response body +- `ExceptionHandler.HandleException`: Interception point for thrown exceptions + +Aside from debugging, you can get more info by: +- Including exception stack traces and incoming request bodies in error responses, as well as writing human-readable JSON: + + ```c# + // Program.cs + builder.Services.AddJsonApi(options => + { + options.IncludeExceptionStackTraceInErrors = true; + options.IncludeRequestBodyInErrors = true; + options.SerializerOptions.WriteIndented = true; + }); + ``` +- Turning on verbose logging and logging of executed SQL statements, by adding the following to your `appsettings.Development.json`: + + ```json + { + "Logging": { + "LogLevel": { + "Default": "Warning", + "Microsoft.EntityFrameworkCore.Database.Command": "Information", + "JsonApiDotNetCore": "Verbose" + } + } + } + ``` + +#### What if my JSON:API resources do not exactly match the shape of my database tables? +We often find users trying to write custom code to solve that. They usually get it wrong or incomplete, and it may not perform well. +Or it simply fails because it cannot be translated to SQL. +The good news is that there's an easier solution most of the time: configure Entity Framework Core mappings to do the work. + +For example, if your primary key column is named "CustomerId" instead of "Id": +```c# +builder.Entity().Property(x => x.Id).HasColumnName("CustomerId"); +``` + +It certainly pays off to read up on these capabilities at [Creating and Configuring a Model](https://learn.microsoft.com/ef/core/modeling/). +Another great resource is [Learn Entity Framework Core](https://www.learnentityframeworkcore.com/configuration). + +#### Can I share my resource models with .NET Framework projects? +Yes, you can. Put your model classes in a separate project that only references [JsonApiDotNetCore.Annotations](https://www.nuget.org/packages/JsonApiDotNetCore.Annotations/). +This package contains just the JSON:API attributes and targets NetStandard 1.0, which makes it flexible to consume. +At startup, use [Auto-discovery](~/usage/resource-graph.md#auto-discovery) and point it to your shared project. + +#### What's the best place to put my custom business/validation logic? +For basic input validation, use the attributes from [ASP.NET ModelState Validation](https://learn.microsoft.com/aspnet/core/mvc/models/validation?source=recommendations&view=aspnetcore-7.0#built-in-attributes) to get the best experience. +JsonApiDotNetCore is aware of them and adjusts behavior accordingly. And it produces the best possible error responses. + +For non-trivial business rules that require custom code, the place to be is [Resource Definitions](~/usage/extensibility/resource-definitions.md). +They provide a callback-based model where you can respond to everything going on. +The great thing is that your callbacks are invoked for various endpoints. +For example, the filter callback on Author executes at `GET /authors?filter=`, `GET /books/1/authors?filter=` and `GET /books?include=authors?filter[authors]=`. +Likewise, the callbacks for changing relationships execute for POST/PATCH resource endpoints, as well as POST/PATCH/DELETE relationship endpoints. + +#### Can API users send multiple changes in a single request? +Yes, just activate [atomic operations](~/usage/writing/bulk-batch-operations.md). +It enables sending multiple changes in a batch request, which are executed in a database transaction. +If something fails, all changes are rolled back. The error response indicates which operation failed. + +#### Is there any way to add `[Authorize(Roles = "...")]` to the generated controllers? +Sure, this is possible. Simply add the attribute at the class level. +See the docs on [Augmenting controllers](~/usage/extensibility/controllers.md#augmenting-controllers). + +#### How do I expose non-JSON:API endpoints? +You can add your own controllers that do not derive from `(Base)JsonApiController` or `(Base)JsonApiOperationsController`. +Whatever you do in those is completely ignored by JsonApiDotNetCore. +This is useful if you want to add a few RPC-style endpoints or provide binary file uploads/downloads. + +A middle-ground approach is to add custom action methods to existing JSON:API controllers. +While you can route them as you like, they must return JSON:API resources. +And on error, a JSON:API error response is produced. +This is useful if you want to stay in the JSON:API-compliant world, but need to expose something non-standard, for example: `GET /users/me`. + +#### How do I optimize for high scalability and prevent denial of service? +Fortunately, JsonApiDotNetCore [scales pretty well](https://github.com/json-api-dotnet/PerformanceReports) under high load and/or large database tables. +It never executes filtering, sorting, or pagination in-memory and tries pretty hard to produce the most efficient query possible. +There are a few things to keep in mind, though: +- Prevent users from executing slow queries by locking down [attribute capabilities](~/usage/resources/attributes.md#capabilities) and [relationship capabilities](~/usage/resources/relationships.md#capabilities). + Ensure the right database indexes are in place for what you enable. +- Prevent users from fetching lots of data by tweaking [maximum page size/number](~/usage/options.md#pagination) and [maximum include depth](~/usage/options.md#maximum-include-depth). +- Avoid long-running transactions by tweaking `MaximumOperationsPerRequest` in options. +- Tell your users to utilize [E-Tags](~/usage/caching.md) to reduce network traffic. +- Not included in JsonApiDotNetCore: Apply general practices such as rate limiting, load balancing, authentication/authorization, blocking very large URLs/request bodies, etc. + +#### Can I offload requests to a background process? +Yes, that's possible. Override controller methods to return `HTTP 202 Accepted`, with a `Location` HTTP header where users can retrieve the result. +Your controller method needs to store the request state (URL, query string, and request body) in a queue, which your background process can read from. +From within your background process job handler, reconstruct the request state, execute the appropriate `JsonApiResourceService` method and store the result. +There's a basic example available at https://github.com/json-api-dotnet/JsonApiDotNetCore/pull/1144, which processes a captured query string. + +#### What if I want to use something other than Entity Framework Core? +This basically means you'll need to implement data access yourself. There are two approaches for interception: at the resource service level and at the repository level. +Either way, you can use the built-in query string and request body parsing, as well as routing, error handling, and rendering of responses. + +Here are some injectable request-scoped types to be aware of: +- `IJsonApiRequest`: This contains routing information, such as whether a primary, secondary, or relationship endpoint is being accessed. +- `ITargetedFields`: Lists the attributes and relationships from an incoming POST/PATCH resource request. Any fields missing there should not be stored (partial updates). +- `IEnumerable`: Provides access to the parsed query string parameters. +- `IEvaluatedIncludeCache`: This tells the response serializer which related resources to render. +- `ISparseFieldSetCache`: This tells the response serializer which fields to render in the `attributes` and `relationships` objects. + +You may also want to inject the singletons `IJsonApiOptions` (which contains settings such as default page size) and `IResourceGraph` (the JSON:API model of resources, attributes and relationships). + +So, back to the topic of where to intercept. It helps to familiarize yourself with the [execution pipeline](~/internals/queries.md). +Replacing at the service level is the simplest. But it means you'll need to read the parsed query string parameters and invoke +all resource definition callbacks yourself. And you won't get change detection (HTTP 203 Not Modified). +Take a look at [JsonApiResourceService](https://github.com/json-api-dotnet/JsonApiDotNetCore/blob/master/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs) to see what you're missing out on. + +You'll get a lot more out of the box if replacing at the repository level instead. You don't need to apply options or analyze query strings. +And most resource definition callbacks are handled. +That's because the built-in resource service translates all JSON:API query aspects of the request into a database-agnostic data structure called `QueryLayer`. +Now the hard part for you becomes reading that data structure and producing data access calls from that. +If your data store provides a LINQ provider, you can probably reuse [QueryableBuilder](https://github.com/json-api-dotnet/JsonApiDotNetCore/blob/master/src/JsonApiDotNetCore/Queries/QueryableBuilding/QueryableBuilder.cs), +which drives the translation into [System.Linq.Expressions](https://learn.microsoft.com/dotnet/csharp/programming-guide/concepts/expression-trees/). +Note however, that it also produces calls to `.Include("")`, which is an Entity Framework Core-specific extension method, so you'll need to +[prevent that from happening](https://github.com/json-api-dotnet/JsonApiDotNetCore/blob/master/src/JsonApiDotNetCore/Queries/QueryableBuilding/QueryLayerIncludeConverter.cs). + +The example [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/blob/master/src/Examples/NoEntityFrameworkExample/Repositories/InMemoryResourceRepository.cs) compiles and executes +the LINQ query against an in-memory list of resources. +For [MongoDB](https://github.com/json-api-dotnet/JsonApiDotNetCore.MongoDb/blob/master/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs), we use the MongoDB LINQ provider. +If there's no LINQ provider available, the example [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/blob/master/src/Examples/DapperExample/Repositories/DapperRepository.cs) may be of help, +which produces SQL and uses [Dapper](https://github.com/DapperLib/Dapper) for data access. + +> [!TIP] +> [ExpressionTreeVisualizer](https://github.com/zspitz/ExpressionTreeVisualizer) is very helpful in trying to debug LINQ expression trees! + +#### I love JsonApiDotNetCore! How can I support the team? +The best way to express your gratitude is by starring our repository. +This increases our leverage when asking for bug fixes in dependent projects, such as the .NET runtime and Entity Framework Core. +You can also [sponsor](https://github.com/sponsors/json-api-dotnet) our project. +Of course, a simple thank-you message in our [Gitter channel](https://gitter.im/json-api-dotnet-core/Lobby) is appreciated too! + +If you'd like to do more: try things out, ask questions, create GitHub bug reports or feature requests, or upvote existing issues that are important to you. +We welcome PRs, but keep in mind: The worst thing in the world is opening a PR that gets rejected after you've put a lot of effort into it. +So for any non-trivial changes, please open an issue first to discuss your approach and ensure it fits the product vision. + +#### Is there anything else I should be aware of? +See [Common Pitfalls](~/usage/common-pitfalls.md). diff --git a/docs/usage/reading/toc.yml b/docs/usage/reading/toc.yml new file mode 100644 index 000000000..aa1ecb6bc --- /dev/null +++ b/docs/usage/reading/toc.yml @@ -0,0 +1,10 @@ +- name: Filtering + href: filtering.md +- name: Sorting + href: sorting.md +- name: Pagination + href: pagination.md +- name: Sparse Fieldset Selection + href: sparse-fieldset-selection.md +- name: Including Related Resources + href: including-relationships.md diff --git a/docs/usage/resources/index.md b/docs/usage/resources/index.md index f8e7d2915..09e0224c5 100644 --- a/docs/usage/resources/index.md +++ b/docs/usage/resources/index.md @@ -22,10 +22,9 @@ public class Person : Identifiable } ``` -If your resource must inherit from another class, -you can always implement the interface yourself. -In this example, `ApplicationUser` inherits from `IdentityUser` -which already contains an Id property of type string. +If your resource must inherit from another class, you can always implement the interface yourself. +In this example, `ApplicationUser` inherits from [`IdentityUser`](https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.identity.entityframeworkcore.identityuser), +which already contains an `Id` property of type `string`. ```c# public class ApplicationUser : IdentityUser, IIdentifiable diff --git a/docs/usage/resources/inheritance.md b/docs/usage/resources/inheritance.md index 47cf85ca6..56c046ef8 100644 --- a/docs/usage/resources/inheritance.md +++ b/docs/usage/resources/inheritance.md @@ -143,7 +143,7 @@ GET /humans HTTP/1.1 } ``` -### Spare fieldsets +### Sparse fieldsets If you only want to retrieve the fields from the base type, you can use [sparse fieldsets](~/usage/reading/sparse-fieldset-selection.md). diff --git a/docs/usage/resources/toc.yml b/docs/usage/resources/toc.yml new file mode 100644 index 000000000..d4daf205d --- /dev/null +++ b/docs/usage/resources/toc.yml @@ -0,0 +1,8 @@ +- name: Attributes + href: attributes.md +- name: Relationships + href: relationships.md +- name: Inheritance + href: inheritance.md +- name: Nullability + href: nullability.md diff --git a/docs/usage/toc.md b/docs/usage/toc.md deleted file mode 100644 index bdeb0e495..000000000 --- a/docs/usage/toc.md +++ /dev/null @@ -1,39 +0,0 @@ -# [Resources](resources/index.md) -## [Attributes](resources/attributes.md) -## [Relationships](resources/relationships.md) -## [Inheritance](resources/inheritance.md) -## [Nullability](resources/nullability.md) - -# Reading data -## [Filtering](reading/filtering.md) -## [Sorting](reading/sorting.md) -## [Pagination](reading/pagination.md) -## [Sparse Fieldset Selection](reading/sparse-fieldset-selection.md) -## [Including Relationships](reading/including-relationships.md) - -# Writing data -## [Creating](writing/creating.md) -## [Updating](writing/updating.md) -## [Deleting](writing/deleting.md) -## [Bulk/batch](writing/bulk-batch-operations.md) - -# [Resource Graph](resource-graph.md) -# [Options](options.md) -# [Routing](routing.md) -# [Errors](errors.md) -# [Metadata](meta.md) -# [Caching](caching.md) -# [Common Pitfalls](common-pitfalls.md) - -# [OpenAPI](openapi.md) -## [Documentation](openapi-documentation.md) -## [Clients](openapi-client.md) - -# Extensibility -## [Layer Overview](extensibility/layer-overview.md) -## [Resource Definitions](extensibility/resource-definitions.md) -## [Controllers](extensibility/controllers.md) -## [Resource Services](extensibility/services.md) -## [Resource Repositories](extensibility/repositories.md) -## [Middleware](extensibility/middleware.md) -## [Query Strings](extensibility/query-strings.md) diff --git a/docs/usage/toc.yml b/docs/usage/toc.yml new file mode 100644 index 000000000..f5d60e9a1 --- /dev/null +++ b/docs/usage/toc.yml @@ -0,0 +1,35 @@ +- name: FAQ + href: faq.md +- name: Common Pitfalls + href: common-pitfalls.md +- name: Resources + href: resources/toc.yml + topicHref: resources/index.md +- name: Reading data + href: reading/toc.yml +- name: Writing data + href: writing/toc.yml +- name: Resource Graph + href: resource-graph.md +- name: Options + href: options.md +- name: Routing + href: routing.md +- name: Errors + href: errors.md +- name: Metadata + href: meta.md +- name: Caching + href: caching.md +- name: OpenAPI + href: openapi.md + items: + - name: Documentation + href: openapi-documentation.md + - name: Clients + href: openapi-client.md +- name: Extensibility + href: extensibility/toc.yml +- name: Advanced + href: advanced/toc.yml + topicHref: advanced/index.md diff --git a/docs/usage/writing/toc.yml b/docs/usage/writing/toc.yml new file mode 100644 index 000000000..db836e548 --- /dev/null +++ b/docs/usage/writing/toc.yml @@ -0,0 +1,8 @@ +- name: Creating + href: creating.md +- name: Updating + href: updating.md +- name: Deleting + href: deleting.md +- name: Bulk/Batch + href: bulk-batch-operations.md diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiException.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiException.cs index 8b66839e9..a86118c87 100644 --- a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiException.cs +++ b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiException.cs @@ -5,6 +5,13 @@ namespace JsonApiDotNetCore.OpenApi.Client.NSwag; +///

+/// Replacement for the auto-generated +/// +/// ApiException +/// +/// class from NSwag. +///

[UsedImplicitly(ImplicitUseTargetFlags.Members)] public class ApiException(string message, int statusCode, string? response, IReadOnlyDictionary> headers, Exception? innerException) : Exception($"HTTP {statusCode}: {message}", innerException) @@ -14,6 +21,13 @@ public class ApiException(string message, int statusCode, string? response, IRea public IReadOnlyDictionary> Headers { get; } = headers; } +///

+/// Replacement for the auto-generated +/// +/// ApiException<TResult> +/// +/// class from NSwag. +///

[UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ApiException( string message, int statusCode, string? response, IReadOnlyDictionary> headers, TResult result, Exception? innerException) diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiResponse.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiResponse.cs index 74ee77127..7d3d7c2a5 100644 --- a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiResponse.cs +++ b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/ApiResponse.cs @@ -3,6 +3,13 @@ namespace JsonApiDotNetCore.OpenApi.Client.NSwag; +///

+/// Replacement for the auto-generated +/// +/// SwaggerResponse +/// +/// class from NSwag. +///

[PublicAPI] public class ApiResponse(int statusCode, IReadOnlyDictionary> headers) { @@ -71,6 +78,13 @@ public static async Task TranslateAsync(Func> ope } } +///

+/// Replacement for the auto-generated +/// +/// SwaggerResponse<TResult> +/// +/// class from NSwag. +///

[PublicAPI] public class ApiResponse(int statusCode, IReadOnlyDictionary> headers, TResult result) : ApiResponse(statusCode, headers) diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/BlockedJsonInheritanceConverter.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/BlockedJsonInheritanceConverter.cs index a3a7e627d..602bacce6 100644 --- a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/BlockedJsonInheritanceConverter.cs +++ b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/BlockedJsonInheritanceConverter.cs @@ -4,6 +4,13 @@ namespace JsonApiDotNetCore.OpenApi.Client.NSwag; // Referenced from liquid template, to ensure the built-in JsonInheritanceConverter from NSwag is never used. +///

+/// Exists to block usage of the default +/// +/// JsonInheritanceConverter +/// +/// from NSwag, which is incompatible with JSON:API. +///

[PublicAPI] public abstract class BlockedJsonInheritanceConverter : JsonConverter { @@ -31,11 +38,17 @@ public override bool CanConvert(Type objectType) return true; } + ///

+ /// Always throws an . + ///

public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { throw new InvalidOperationException("JsonInheritanceConverter is incompatible with JSON:API and must not be used."); } + ///

+ /// Always throws an . + ///

public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { throw new InvalidOperationException("JsonInheritanceConverter is incompatible with JSON:API and must not be used."); diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/IJsonApiClient.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/IJsonApiClient.cs deleted file mode 100644 index df6a35d78..000000000 --- a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/IJsonApiClient.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Linq.Expressions; -using JetBrains.Annotations; - -namespace JsonApiDotNetCore.OpenApi.Client.NSwag; - -[PublicAPI] -public interface IJsonApiClient -{ - ///

- /// Ensures correct serialization of JSON:API attributes in the request body of a POST/PATCH request at a resource endpoint. Properties with default - /// values are omitted, unless explicitly included using - /// - /// In JSON:API, an omitted attribute indicates to ignore it, while an attribute that is set to null means to clear it. This poses a problem, - /// because the serializer cannot distinguish between "you have explicitly set this .NET property to its default value" vs "you didn't touch it, so it - /// contains its default value" when converting to JSON. - /// - ///

- /// - /// The request document instance for which default values should be omitted. - /// - /// - /// Optional. A list of lambda expressions that indicate which properties to always include in the JSON request body. For example: - ///

 video.Title, video => video.Summary
-    /// ]]>

- /// - /// - /// The type of the request document. - /// - /// - /// The type of the attributes object inside . - /// - /// - /// An to clear the current registration. For efficient memory usage, it is recommended to wrap calls to this method in a - /// using statement, so the registrations are cleaned up after executing the request. After disposal, the client can be reused without the - /// registrations added earlier. - /// - IDisposable WithPartialAttributeSerialization(TRequestDocument requestDocument, - params Expression>[] alwaysIncludedAttributeSelectors) - where TRequestDocument : class; -} diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/NotifyPropertySet.cs b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/NotifyPropertySet.cs index 80adb5647..111b89487 100644 --- a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/NotifyPropertySet.cs +++ b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/NotifyPropertySet.cs @@ -11,7 +11,8 @@ namespace JsonApiDotNetCore.OpenApi.Client.NSwag; ///

-/// Implementation of that doesn't detect changes. +/// Implementation of that unconditionally raises the event when a property is +/// assigned. Exists to support JSON:API partial POST/PATCH. ///

[PublicAPI] public abstract class NotifyPropertySet : INotifyPropertyChanged From c41dae3f8b7ed9eae11421f8dabf811e96a5c011 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Tue, 6 May 2025 04:52:22 +0200 Subject: [PATCH 03/30] Update links in README.md to new documentation --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8dd6a6ecf..5ab49fae3 100644 --- a/README.md +++ b/README.md @@ -203,8 +203,8 @@ The following links explain what this project provides, why it exists, and how y ### Samples -- The [examples](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/src/Examples) directory provides ready-to-run sample API projects -- Many advanced use cases are covered by integration tests, which can be found [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests). +- The [examples](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/src/Examples) directory provides ready-to-run sample API projects, which are documented [here](https://www.jsonapi.net/request-examples/index.html). +- The [integration tests](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests) directory covers many advanced use cases, which are documented [here](https://www.jsonapi.net/usage/advanced/index.html). This includes topics such as batching, multi-tenancy, authorization, soft-deletion, obfuscated IDs, resource inheritance, alternate routing, custom metadata, error handling and logging. - The [Ember.js Todo List App](https://github.com/json-api-dotnet/TodoListExample) showcases a JsonApiDotNetCore API and an Ember.js client with token authentication. From d94b2e5d6767b2b96adb5fcf1d81db38f6564c13 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Tue, 6 May 2025 05:12:08 +0200 Subject: [PATCH 04/30] Add sitemap to documentation website --- docs/docfx.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/docfx.json b/docs/docfx.json index 25a4aa943..b073247dd 100644 --- a/docs/docfx.json +++ b/docs/docfx.json @@ -45,6 +45,11 @@ "globalMetadata": { "_appLogoPath": "styles/img/favicon.png", "_googleAnalyticsTagId": "G-78GTGF1FM2" + }, + "sitemap": { + "baseUrl": "https://www.jsonapi.net", + "priority": 0.5, + "changefreq": "weekly" } } } From 80a6875dc11741d061214b89f58be31fa3b0a093 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Tue, 6 May 2025 05:55:35 +0200 Subject: [PATCH 05/30] Throw better exception in corner cases --- .../Configuration/ResourceType.cs | 1 - .../Configuration/ApplicationBuilderExtensions.cs | 3 ++- src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs b/src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs index 3cda945d7..4c0cd133f 100644 --- a/src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs +++ b/src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs @@ -173,7 +173,6 @@ public AttrAttribute GetAttributeByPublicName(string publicName) public AttrAttribute GetAttributeByPropertyName(string propertyName) { AttrAttribute? attribute = FindAttributeByPropertyName(propertyName); - return attribute ?? throw new InvalidOperationException($"Attribute for property '{propertyName}' does not exist on resource type '{ClrType.Name}'."); } diff --git a/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs b/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs index 3957a2883..19e0ffc87 100644 --- a/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs +++ b/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs @@ -1,3 +1,4 @@ +using JsonApiDotNetCore.Errors; using JsonApiDotNetCore.Middleware; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -60,7 +61,7 @@ private static void AssertAspNetCoreOpenApiIsNotRegistered(IServiceProvider serv if (configureInstance != null) { - throw new InvalidOperationException("JsonApiDotNetCore is incompatible with ASP.NET OpenAPI. " + + throw new InvalidConfigurationException("JsonApiDotNetCore is incompatible with ASP.NET OpenAPI. " + "Replace 'services.AddOpenApi()' with 'services.AddOpenApiForJsonApi()' from the JsonApiDotNetCore.OpenApi.Swashbuckle NuGet package."); } } diff --git a/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs index fcf18f97a..8ab2120d9 100644 --- a/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs +++ b/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs @@ -455,7 +455,7 @@ private static void AssertNoInfiniteRecursion(int recursionDepth) { if (recursionDepth >= 500) { - throw new InvalidOperationException("Infinite recursion detected in eager-load chain."); + throw new InvalidConfigurationException("Infinite recursion detected in eager-load chain."); } } From 762bb4f8fe4f4065b8477bc15c56996d91415c20 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Tue, 6 May 2025 06:49:33 +0200 Subject: [PATCH 06/30] Fix broken test, adjust message --- .../Configuration/ApplicationBuilderExtensions.cs | 3 ++- test/DiscoveryTests/AspNetOpenApiTests.cs | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs b/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs index 19e0ffc87..fb69fa5ae 100644 --- a/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs +++ b/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs @@ -62,7 +62,8 @@ private static void AssertAspNetCoreOpenApiIsNotRegistered(IServiceProvider serv if (configureInstance != null) { throw new InvalidConfigurationException("JsonApiDotNetCore is incompatible with ASP.NET OpenAPI. " + - "Replace 'services.AddOpenApi()' with 'services.AddOpenApiForJsonApi()' from the JsonApiDotNetCore.OpenApi.Swashbuckle NuGet package."); + "Remove 'services.AddOpenApi()', or replace it by calling 'services.AddOpenApiForJsonApi()' after 'services.AddJsonApi()' " + + "from the JsonApiDotNetCore.OpenApi.Swashbuckle NuGet package."); } } } diff --git a/test/DiscoveryTests/AspNetOpenApiTests.cs b/test/DiscoveryTests/AspNetOpenApiTests.cs index 20619f4cc..06dfcee91 100644 --- a/test/DiscoveryTests/AspNetOpenApiTests.cs +++ b/test/DiscoveryTests/AspNetOpenApiTests.cs @@ -1,6 +1,7 @@ #if !NET8_0 using FluentAssertions; using JsonApiDotNetCore.Configuration; +using JsonApiDotNetCore.Errors; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; @@ -24,8 +25,9 @@ public async Task Throws_when_AspNet_OpenApi_is_registered() Action action = app.UseJsonApi; // Assert - action.Should().ThrowExactly().WithMessage("JsonApiDotNetCore is incompatible with ASP.NET OpenAPI. " + - "Replace 'services.AddOpenApi()' with 'services.AddOpenApiForJsonApi()' from the JsonApiDotNetCore.OpenApi.Swashbuckle NuGet package."); + action.Should().ThrowExactly().WithMessage("JsonApiDotNetCore is incompatible with ASP.NET OpenAPI. " + + "Remove 'services.AddOpenApi()', or replace it by calling 'services.AddOpenApiForJsonApi()' after 'services.AddJsonApi()' " + + "from the JsonApiDotNetCore.OpenApi.Swashbuckle NuGet package."); } } #endif From b6b56b05f472bbc4f8efef2dceaf52d3d16532d0 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Wed, 21 May 2025 04:53:36 +0200 Subject: [PATCH 07/30] Package updates, fix max connections exceeded from Build.ps1 (#1730) --- .config/dotnet-tools.json | 2 +- Build.ps1 | 3 +-- package-versions.props | 8 ++++---- run-docker-postgres.ps1 | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 4b173d25f..f14a93f95 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -17,7 +17,7 @@ "rollForward": false }, "dotnet-reportgenerator-globaltool": { - "version": "5.4.5", + "version": "5.4.7", "commands": [ "reportgenerator" ], diff --git a/Build.ps1 b/Build.ps1 index 6c6ff9c13..1c369bd1a 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -5,8 +5,7 @@ function VerifySuccessExitCode { } Write-Host "$(pwsh --version)" -Write-Host "Active .NET SDK: $(dotnet --version)" -Write-Host "Using version suffix: $versionSuffix" +Write-Host ".NET SDK $(dotnet --version)" Remove-Item -Recurse -Force artifacts -ErrorAction SilentlyContinue Remove-Item -Recurse -Force * -Include coverage.cobertura.xml diff --git a/package-versions.props b/package-versions.props index 8b528ff32..d14ed838b 100644 --- a/package-versions.props +++ b/package-versions.props @@ -11,7 +11,7 @@ 0.14.* 1.0.* 35.6.* - 4.13.* + 4.14.* 6.0.* 2.1.* 7.2.* @@ -20,12 +20,12 @@ 1.* 9.0.* 9.0.* - 14.3.* + 14.4.* 13.0.* - 2.1.* + 2.3.* 8.*-* 9.0.* - 17.13.* + 17.14.* 2.9.* 2.8.* diff --git a/run-docker-postgres.ps1 b/run-docker-postgres.ps1 index 0cd42b389..25b631a7a 100644 --- a/run-docker-postgres.ps1 +++ b/run-docker-postgres.ps1 @@ -11,7 +11,7 @@ param( docker container stop jsonapi-postgresql-db docker container stop jsonapi-postgresql-management -docker run --pull always --rm --detach --name jsonapi-postgresql-db -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432 postgres:latest +docker run --pull always --rm --detach --name jsonapi-postgresql-db -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432 postgres:latest -N 500 if ($UI) { docker run --pull always --rm --detach --name jsonapi-postgresql-management --link jsonapi-postgresql-db:db -e PGADMIN_DEFAULT_EMAIL=admin@admin.com -e PGADMIN_DEFAULT_PASSWORD=postgres -p 5050:80 dpage/pgadmin4:latest From 99c9a95c77e882906666aed52918f2da4f63b633 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Sun, 25 May 2025 13:10:56 +0200 Subject: [PATCH 08/30] Log QueryLayer and LINQ expression at Debug level (#1732) * Log QueryLayer and Expression at Debug level * Replace debugger visualizer link in docs --- docs/usage/faq.md | 2 +- package-versions.props | 1 + .../Middleware/TraceLogWriter.cs | 39 +++++++ .../ExpressionTreeFormatter.cs | 53 +++++++++ .../EntityFrameworkCoreRepository.cs | 4 + test/DiscoveryTests/DiscoveryTests.csproj | 3 +- test/DiscoveryTests/LoggingTests.cs | 52 +++++++++ .../Mixed/AtomicTraceLoggingTests.cs | 2 +- .../IntegrationTests/Logging/Fruit.cs | 3 + .../IntegrationTests/Logging/LoggingFakers.cs | 2 + .../IntegrationTests/Logging/LoggingTests.cs | 102 +++++++++++++++++- .../JsonApiDotNetCoreTests.csproj | 1 + 12 files changed, 257 insertions(+), 7 deletions(-) create mode 100644 src/JsonApiDotNetCore/Queries/QueryableBuilding/ExpressionTreeFormatter.cs create mode 100644 test/DiscoveryTests/LoggingTests.cs diff --git a/docs/usage/faq.md b/docs/usage/faq.md index dacd35889..567f17525 100644 --- a/docs/usage/faq.md +++ b/docs/usage/faq.md @@ -160,7 +160,7 @@ If there's no LINQ provider available, the example [here](https://github.com/jso which produces SQL and uses [Dapper](https://github.com/DapperLib/Dapper) for data access. > [!TIP] -> [ExpressionTreeVisualizer](https://github.com/zspitz/ExpressionTreeVisualizer) is very helpful in trying to debug LINQ expression trees! +> [ReadableExpressions](https://github.com/agileobjects/ReadableExpressions) is very helpful in trying to debug LINQ expression trees! #### I love JsonApiDotNetCore! How can I support the team? The best way to express your gratitude is by starring our repository. diff --git a/package-versions.props b/package-versions.props index d14ed838b..0403a83c0 100644 --- a/package-versions.props +++ b/package-versions.props @@ -22,6 +22,7 @@ 9.0.* 14.4.* 13.0.* + 4.1.* 2.3.* 8.*-* 9.0.* diff --git a/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs b/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs index 70ed7fdd0..23e6733a4 100644 --- a/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs +++ b/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs @@ -1,3 +1,4 @@ +using System.Linq.Expressions; using System.Reflection; using System.Runtime.CompilerServices; using System.Text; @@ -5,6 +6,8 @@ using System.Text.Json; using System.Text.Json.Serialization; using JsonApiDotNetCore.Configuration; +using JsonApiDotNetCore.Queries; +using JsonApiDotNetCore.Queries.QueryableBuilding; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; using Microsoft.Extensions.Logging; @@ -204,9 +207,45 @@ private static string SerializeObject(object? value) } } + public void LogDebug(QueryLayer queryLayer) + { + ArgumentNullException.ThrowIfNull(queryLayer); + + LogQueryLayer(queryLayer); + } + + public void LogDebug(Expression expression) + { + ArgumentNullException.ThrowIfNull(expression); + + if (_logger.IsEnabled(LogLevel.Debug)) + { + string? text = ExpressionTreeFormatter.Instance.GetText(expression); + + if (text != null) + { + LogExpression(text); + } + else + { + LogReadableExpressionsAssemblyUnavailable(); + } + } + } + [LoggerMessage(Level = LogLevel.Trace, SkipEnabledCheck = true, Message = "Entering {MemberName}({ParameterValues})")] private partial void LogEnteringMemberWithParameters(string memberName, string parameterValues); [LoggerMessage(Level = LogLevel.Trace, SkipEnabledCheck = true, Message = "Entering {MemberName}()")] private partial void LogEnteringMember(string memberName); + + [LoggerMessage(Level = LogLevel.Debug, Message = "QueryLayer: {queryLayer}")] + private partial void LogQueryLayer(QueryLayer queryLayer); + + [LoggerMessage(Level = LogLevel.Debug, SkipEnabledCheck = true, Message = "Expression tree: {expression}")] + private partial void LogExpression(string expression); + + [LoggerMessage(Level = LogLevel.Debug, SkipEnabledCheck = true, + Message = "Failed to load assembly. To log expression trees, add a NuGet reference to 'AgileObjects.ReadableExpressions' in your project.")] + private partial void LogReadableExpressionsAssemblyUnavailable(); } diff --git a/src/JsonApiDotNetCore/Queries/QueryableBuilding/ExpressionTreeFormatter.cs b/src/JsonApiDotNetCore/Queries/QueryableBuilding/ExpressionTreeFormatter.cs new file mode 100644 index 000000000..c6b1bc4bb --- /dev/null +++ b/src/JsonApiDotNetCore/Queries/QueryableBuilding/ExpressionTreeFormatter.cs @@ -0,0 +1,53 @@ +using System.Linq.Expressions; +using System.Reflection; + +namespace JsonApiDotNetCore.Queries.QueryableBuilding; + +///

+/// Converts a to readable text, if the AgileObjects.ReadableExpressions NuGet package is referenced. +///

+internal sealed class ExpressionTreeFormatter +{ + private static readonly Lazy LazyToReadableStringMethod = new(GetToReadableStringMethod, LazyThreadSafetyMode.ExecutionAndPublication); + + public static ExpressionTreeFormatter Instance { get; } = new(); + + private ExpressionTreeFormatter() + { + } + + private static MethodInvoker? GetToReadableStringMethod() + { + Assembly? assembly = TryLoadAssembly(); + Type? type = assembly?.GetType("AgileObjects.ReadableExpressions.ExpressionExtensions", false); + MethodInfo? method = type?.GetMethods(BindingFlags.Public | BindingFlags.Static).FirstOrDefault(method => method.Name == "ToReadableString"); + return method != null ? MethodInvoker.Create(method) : null; + } + + private static Assembly? TryLoadAssembly() + { + try + { + return Assembly.Load("AgileObjects.ReadableExpressions"); + } + catch (Exception exception) when (exception is ArgumentException or IOException or BadImageFormatException) + { + } + + return null; + } + + public string? GetText(Expression expression) + { + ArgumentNullException.ThrowIfNull(expression); + + try + { + return LazyToReadableStringMethod.Value?.Invoke(null, expression, null) as string; + } + catch (Exception exception) when (exception is TargetException or InvalidOperationException or TargetParameterCountException or NotSupportedException) + { + return null; + } + } +} diff --git a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs index 214987828..f4c9af37c 100644 --- a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs +++ b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs @@ -122,6 +122,8 @@ protected virtual IQueryable ApplyQueryLayer(QueryLayer queryLayer) ArgumentNullException.ThrowIfNull(queryLayer); + _traceWriter.LogDebug(queryLayer); + using (CodeTimingSessionManager.Current.Measure("Convert QueryLayer to System.Expression")) { IQueryable source = GetAll(); @@ -151,6 +153,8 @@ protected virtual IQueryable ApplyQueryLayer(QueryLayer queryLayer) var context = QueryableBuilderContext.CreateRoot(source, typeof(Queryable), _dbContext.Model, null); Expression expression = builder.ApplyQuery(queryLayer, context); + _traceWriter.LogDebug(expression); + using (CodeTimingSessionManager.Current.Measure("Convert System.Expression to IQueryable")) { return source.Provider.CreateQuery(expression); diff --git a/test/DiscoveryTests/DiscoveryTests.csproj b/test/DiscoveryTests/DiscoveryTests.csproj index 825056684..11567b911 100644 --- a/test/DiscoveryTests/DiscoveryTests.csproj +++ b/test/DiscoveryTests/DiscoveryTests.csproj @@ -1,4 +1,4 @@ - + net9.0;net8.0 @@ -15,5 +15,6 @@ + diff --git a/test/DiscoveryTests/LoggingTests.cs b/test/DiscoveryTests/LoggingTests.cs new file mode 100644 index 000000000..9afb7c788 --- /dev/null +++ b/test/DiscoveryTests/LoggingTests.cs @@ -0,0 +1,52 @@ +using FluentAssertions; +using JsonApiDotNetCore.Configuration; +using JsonApiDotNetCore.Queries; +using JsonApiDotNetCore.Repositories; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.TestHost; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using TestBuildingBlocks; +using Xunit; + +namespace DiscoveryTests; + +public sealed class LoggingTests +{ + [Fact] + public async Task Logs_message_to_add_NuGet_reference() + { + // Arrange + using var loggerProvider = + new CapturingLoggerProvider((category, _) => category.StartsWith("JsonApiDotNetCore.Repositories", StringComparison.Ordinal)); + + WebApplicationBuilder builder = WebApplication.CreateEmptyBuilder(new WebApplicationOptions()); + builder.Logging.AddProvider(loggerProvider); + builder.Logging.SetMinimumLevel(LogLevel.Debug); + builder.Services.AddDbContext(options => options.UseInMemoryDatabase(Guid.NewGuid().ToString())); + builder.Services.AddJsonApi(); + builder.WebHost.UseTestServer(); + await using WebApplication app = builder.Build(); + + var resourceGraph = app.Services.GetRequiredService(); + ResourceType resourceType = resourceGraph.GetResourceType(); + + var repository = app.Services.GetRequiredService>(); + + // Act + _ = await repository.GetAsync(new QueryLayer(resourceType), CancellationToken.None); + + // Assert + IReadOnlyList logLines = loggerProvider.GetLines(); + + logLines.Should().Contain( + "[DEBUG] Failed to load assembly. To log expression trees, add a NuGet reference to 'AgileObjects.ReadableExpressions' in your project."); + } + + private sealed class TestDbContext(DbContextOptions options) + : DbContext(options) + { + public DbSet PrivateResources => Set(); + } +} diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs index 6eb2ce3a3..0ea01e7d3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs @@ -22,7 +22,7 @@ public AtomicTraceLoggingTests(IntegrationTestContext { var loggerProvider = new CapturingLoggerProvider((category, level) => - level >= LogLevel.Trace && category.StartsWith("JsonApiDotNetCore.", StringComparison.Ordinal)); + level == LogLevel.Trace && category.StartsWith("JsonApiDotNetCore.", StringComparison.Ordinal)); options.AddProvider(loggerProvider); options.SetMinimumLevel(LogLevel.Trace); diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/Fruit.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/Fruit.cs index fd0fbf0df..4e26c558f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/Fruit.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/Fruit.cs @@ -10,4 +10,7 @@ public abstract class Fruit : Identifiable { [Attr] public abstract string Color { get; } + + [Attr] + public double WeightInKilograms { get; set; } } diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs index a66cdcdf5..aa34ff32f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs @@ -15,10 +15,12 @@ internal sealed class LoggingFakers private readonly Lazy> _lazyBananaFaker = new(() => new Faker() .MakeDeterministic() + .RuleFor(banana => banana.WeightInKilograms, faker => faker.Random.Double(.2, .3)) .RuleFor(banana => banana.LengthInCentimeters, faker => faker.Random.Double(10, 25))); private readonly Lazy> _lazyPeachFaker = new(() => new Faker() .MakeDeterministic() + .RuleFor(peach => peach.WeightInKilograms, faker => faker.Random.Double(.2, .3)) .RuleFor(peach => peach.DiameterInCentimeters, faker => faker.Random.Double(6, 7.5))); public Faker AuditEntry => _lazyAuditEntryFaker.Value; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs index 9fbd9e805..4d35403f9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs @@ -152,9 +152,9 @@ await _testContext.RunOnDatabaseAsync(async dbContext => responseDocument.Should().BeEmpty(); - IReadOnlyList logLines = loggerProvider.GetLines(); + string[] traceLines = loggerProvider.GetMessages().Where(message => message.LogLevel == LogLevel.Trace).Select(message => message.ToString()).ToArray(); - logLines.Should().BeEquivalentTo(new[] + traceLines.Should().BeEquivalentTo(new[] { $$""" [TRACE] Received POST request at 'http://localhost/fruitBowls/{{existingBowl.StringId}}/relationships/fruits' with body: <<{ @@ -215,6 +215,7 @@ [TRACE] Entering AddToToManyRelationshipAsync(leftResource: null, leftId: {{exis { "Color": "Yellow", "LengthInCentimeters": {{existingBanana.LengthInCentimeters.ToString(CultureInfo.InvariantCulture)}}, + "WeightInKilograms": {{existingBanana.WeightInKilograms.ToString(CultureInfo.InvariantCulture)}}, "Id": {{existingBanana.Id}}, "StringId": "{{existingBanana.StringId}}" } @@ -262,9 +263,9 @@ await _testContext.RunOnDatabaseAsync(async dbContext => responseDocument.Should().BeEmpty(); - IReadOnlyList logLines = loggerProvider.GetLines(); + string[] traceLines = loggerProvider.GetMessages().Where(message => message.LogLevel == LogLevel.Trace).Select(message => message.ToString()).ToArray(); - logLines.Should().BeEquivalentTo(new[] + traceLines.Should().BeEquivalentTo(new[] { $$""" [TRACE] Received POST request at 'http://localhost/fruitBowls/{{existingBowl.StringId}}/relationships/fruits' with body: <<{ @@ -281,6 +282,7 @@ [TRACE] Entering PostRelationshipAsync(id: {{existingBowl.StringId}}, relationsh { "Color": "Red/Yellow", "DiameterInCentimeters": 0, + "WeightInKilograms": 0, "Id": {{existingPeach.Id}}, "StringId": "{{existingPeach.StringId}}" } @@ -291,6 +293,7 @@ [TRACE] Entering AddToToManyRelationshipAsync(leftId: {{existingBowl.StringId}}, { "Color": "Red/Yellow", "DiameterInCentimeters": 0, + "WeightInKilograms": 0, "Id": {{existingPeach.Id}}, "StringId": "{{existingPeach.StringId}}" } @@ -329,6 +332,7 @@ [TRACE] Entering AddToToManyRelationshipAsync(leftResource: null, leftId: {{exis { "Color": "Red/Yellow", "DiameterInCentimeters": 0, + "WeightInKilograms": 0, "Id": {{existingPeach.Id}}, "StringId": "{{existingPeach.StringId}}" } @@ -336,4 +340,94 @@ [TRACE] Entering AddToToManyRelationshipAsync(leftResource: null, leftId: {{exis """ }, options => options.Using(IgnoreLineEndingsComparer.Instance).WithStrictOrdering()); } + + [Fact] + public async Task Logs_query_layer_and_expression_at_Debug_level() + { + // Arrange + var loggerProvider = _testContext.Factory.Services.GetRequiredService(); + loggerProvider.Clear(); + + var bowl = new FruitBowl(); + bowl.Fruits.Add(_fakers.Peach.GenerateOne()); + + await _testContext.RunOnDatabaseAsync(async dbContext => + { + dbContext.FruitBowls.Add(bowl); + await dbContext.SaveChangesAsync(); + }); + + string route = $"/fruitBowls/{bowl.StringId}/fruits?filter=greaterThan(weightInKilograms,'0.1')&fields[peaches]=color&sort=-id"; + + // Act + (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync(route); + + // Assert + httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK); + + responseDocument.Should().NotBeEmpty(); + + LogMessage queryLayerMessage = loggerProvider.GetMessages().Should() + .ContainSingle(message => message.LogLevel == LogLevel.Debug && message.Text.StartsWith("QueryLayer:", StringComparison.Ordinal)).Subject; + + queryLayerMessage.Text.Should().Be($$""" + QueryLayer: QueryLayer + { + Include: fruits + Filter: equals(id,'{{bowl.StringId}}') + Selection + { + FieldSelectors + { + id + fruits: QueryLayer + { + Filter: greaterThan(weightInKilograms,'0.1') + Sort: -id + Pagination: Page number: 1, size: 10 + Selection + { + FieldSelectors + { + color + id + } + } + } + } + } + } + + """); + + LogMessage expressionMessage = loggerProvider.GetMessages().Should().ContainSingle(message => + message.LogLevel == LogLevel.Debug && message.Text.StartsWith("Expression tree:", StringComparison.Ordinal)).Subject; + + expressionMessage.Text.Should().Be(""" + Expression tree: [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression] + .AsNoTrackingWithIdentityResolution() + .Include("Fruits") + .Where(fruitBowl => fruitBowl.Id == value) + .Select( + fruitBowl => new FruitBowl + { + Id = fruitBowl.Id, + Fruits = fruitBowl.Fruits + .Where(fruit => fruit.WeightInKilograms > value) + .OrderByDescending(fruit => fruit.Id) + .Take(value) + .Select( + fruit => (fruit.GetType() == value) + ? (Fruit)new Peach + { + Id = fruit.Id, + WeightInKilograms = fruit.WeightInKilograms, + DiameterInCentimeters = ((Peach)fruit).DiameterInCentimeters, + Id = fruit.Id + } + : fruit) + .ToHashSet() + }) + """); + } } diff --git a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj index 6bc5a666a..bdfea682d 100644 --- a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj +++ b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj @@ -12,6 +12,7 @@ + From 6b6ba1f663ae91f4a669a88d66d0ea56af764bc2 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Sun, 25 May 2025 13:44:14 +0200 Subject: [PATCH 09/30] Update list of kiota bugs --- docs/usage/openapi-client.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usage/openapi-client.md b/docs/usage/openapi-client.md index 58b9ca87e..277d28021 100644 --- a/docs/usage/openapi-client.md +++ b/docs/usage/openapi-client.md @@ -340,8 +340,8 @@ demonstrates how to use them. It uses local IDs to: | --- | --- | --- | | Properties are always nullable | - | https://github.com/microsoft/kiota/issues/3911 | | JSON:API query strings are inaccessible | Use `SetQueryStringHttpMessageHandler.CreateScope` from `JsonApiDotNetCore.OpenApi.Client.Kiota` package | https://github.com/microsoft/kiota/issues/3800 | -| Properties set to `null` are sent twice | - | https://github.com/microsoft/kiota-dotnet/issues/535 | | HTTP 304 (Not Modified) is not properly recognized | Catch `ApiException` and inspect the response status code | https://github.com/microsoft/kiota/issues/4190, https://github.com/microsoft/kiota-dotnet/issues/531 | +| No `Accept` header sent when only error responses define `Content-Type` | `JsonApiDotNetCore.OpenApi.Swashbuckle` package contains workaround | https://github.com/microsoft/kiota/issues/6572 | | Generator warns about unsupported formats | Use `JsonApiDotNetCore.OpenApi.Client.Kiota` package | https://github.com/microsoft/kiota/issues/4227 | | `Stream` response for HEAD request | - | https://github.com/microsoft/kiota/issues/4245 | | Unhelpful exception messages | - | https://github.com/microsoft/kiota/issues/4349 | From c00f55272eb46bd69c2b5bbcf64b5e82e0f6982d Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Sun, 25 May 2025 13:56:00 +0200 Subject: [PATCH 10/30] Update documentation: advanced use cases and logging --- docs/usage/faq.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/usage/faq.md b/docs/usage/faq.md index 567f17525..cbb32c4c0 100644 --- a/docs/usage/faq.md +++ b/docs/usage/faq.md @@ -1,8 +1,7 @@ # Frequently Asked Questions #### Where can I find documentation and examples? -While the [documentation](~/usage/resources/index.md) covers basic features and a few runnable example projects are available [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/src/Examples), -many more advanced use cases are available as integration tests [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/test/JsonApiDotNetCoreTests/IntegrationTests), so be sure to check them out! +The [documentation](~/usage/resources/index.md) covers basic features, as well as [advanced use cases](~/usage/advanced/index.md). Several runnable example projects are available [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/tree/master/src/Examples). #### Why don't you use the built-in OpenAPI support in ASP.NET Core? The structure of JSON:API request and response bodies differs significantly from the signature of JsonApiDotNetCore controllers. @@ -48,7 +47,7 @@ Aside from debugging, you can get more info by: options.SerializerOptions.WriteIndented = true; }); ``` -- Turning on verbose logging and logging of executed SQL statements, by adding the following to your `appsettings.Development.json`: +- Turning on trace logging, or/and logging of executed SQL statements, by adding the following to your `appsettings.Development.json`: ```json { @@ -56,11 +55,12 @@ Aside from debugging, you can get more info by: "LogLevel": { "Default": "Warning", "Microsoft.EntityFrameworkCore.Database.Command": "Information", - "JsonApiDotNetCore": "Verbose" + "JsonApiDotNetCore": "Trace" } } } ``` +- Activate debug logging of LINQ expressions by adding a NuGet reference to [AgileObjects.ReadableExpressions](https://www.nuget.org/packages/AgileObjects.ReadableExpressions) in your project. #### What if my JSON:API resources do not exactly match the shape of my database tables? We often find users trying to write custom code to solve that. They usually get it wrong or incomplete, and it may not perform well. From 86cee8b10b624d7559bc07d3e4edb2b79e1541ee Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Mon, 2 Jun 2025 02:11:48 +0200 Subject: [PATCH 11/30] Remove redundant selectors in QueryLayer, only sort by ID when pagination enabled (#1735) --- src/JsonApiDotNetCore/Queries/QueryLayer.cs | 2 + .../Queries/QueryLayerComposer.cs | 59 ++++++++++++++----- .../QueryStrings/FilterTests.cs | 5 -- .../QueryStrings/IncludeTests.cs | 4 +- .../QueryStrings/SortTests.cs | 4 +- .../QueryStrings/SparseFieldSets.cs | 2 - .../Relationships/FetchRelationshipTests.cs | 1 - .../ReadWrite/Resources/FetchResourceTests.cs | 1 - .../Sql/SubQueryInJoinTests.cs | 23 ++++---- 9 files changed, 62 insertions(+), 39 deletions(-) diff --git a/src/JsonApiDotNetCore/Queries/QueryLayer.cs b/src/JsonApiDotNetCore/Queries/QueryLayer.cs index 1ff8e34dc..49a9ee92a 100644 --- a/src/JsonApiDotNetCore/Queries/QueryLayer.cs +++ b/src/JsonApiDotNetCore/Queries/QueryLayer.cs @@ -11,6 +11,8 @@ namespace JsonApiDotNetCore.Queries; [PublicAPI] public sealed class QueryLayer { + internal bool IsEmpty => Filter == null && Sort == null && Pagination?.PageSize == null && (Selection == null || Selection.IsEmpty); + public ResourceType ResourceType { get; } public IncludeExpression? Include { get; set; } diff --git a/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs b/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs index f7843b12c..7954aa0e7 100644 --- a/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs +++ b/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs @@ -173,13 +173,20 @@ private QueryLayer ComposeTopLayer(ImmutableArray constraints _paginationContext.PageSize = topPagination.PageSize; _paginationContext.PageNumber = topPagination.PageNumber; - return new QueryLayer(resourceType) + var topLayer = new QueryLayer(resourceType) { Filter = GetFilter(expressionsInTopScope, resourceType), Sort = GetSort(expressionsInTopScope, resourceType), Pagination = topPagination, Selection = GetSelectionForSparseAttributeSet(resourceType) }; + + if (topLayer is { Pagination.PageSize: not null, Sort: null }) + { + topLayer.Sort = CreateSortById(resourceType); + } + + return topLayer; } private IncludeExpression ComposeChildren(QueryLayer topLayer, ImmutableArray constraints) @@ -237,7 +244,7 @@ private IImmutableSet ProcessIncludeSet(IImmutableSet< ResourceType resourceType = includeElement.Relationship.RightType; bool isToManyRelationship = includeElement.Relationship is HasManyAttribute; - var child = new QueryLayer(resourceType) + var subLayer = new QueryLayer(resourceType) { Filter = isToManyRelationship ? GetFilter(expressionsInCurrentScope, resourceType) : null, Sort = isToManyRelationship ? GetSort(expressionsInCurrentScope, resourceType) : null, @@ -245,9 +252,14 @@ private IImmutableSet ProcessIncludeSet(IImmutableSet< Selection = GetSelectionForSparseAttributeSet(resourceType) }; - selectors.IncludeRelationship(includeElement.Relationship, child); + if (subLayer is { Pagination.PageSize: not null, Sort: null }) + { + subLayer.Sort = CreateSortById(resourceType); + } - IImmutableSet updatedChildren = ProcessIncludeSet(includeElement.Children, child, relationshipChain, constraints); + selectors.IncludeRelationship(includeElement.Relationship, subLayer); + + IImmutableSet updatedChildren = ProcessIncludeSet(includeElement.Children, subLayer, relationshipChain, constraints); if (!ReferenceEquals(includeElement.Children, updatedChildren)) { @@ -256,9 +268,30 @@ private IImmutableSet ProcessIncludeSet(IImmutableSet< } } + EliminateRedundantSelectors(parentLayer); + return updatesInChildren.Count == 0 ? includeElementsEvaluated : ApplyIncludeElementUpdates(includeElementsEvaluated, updatesInChildren); } + private static void EliminateRedundantSelectors(QueryLayer parentLayer) + { + if (parentLayer.Selection != null) + { + foreach ((ResourceType resourceType, FieldSelectors selectors) in parentLayer.Selection.ToArray()) + { + if (selectors.ContainsOnlyRelationships && selectors.Values.OfType().All(subLayer => subLayer.IsEmpty)) + { + parentLayer.Selection.Remove(resourceType); + } + } + + if (parentLayer.Selection.IsEmpty) + { + parentLayer.Selection = null; + } + } + } + private static ImmutableHashSet ApplyIncludeElementUpdates(IImmutableSet includeElements, Dictionary> updatesInChildren) { @@ -507,23 +540,21 @@ protected virtual IImmutableSet GetIncludeElements(IIm return _resourceDefinitionAccessor.OnApplyFilter(resourceType, filter); } - protected virtual SortExpression GetSort(IReadOnlyCollection expressionsInScope, ResourceType resourceType) + protected virtual SortExpression? GetSort(IReadOnlyCollection expressionsInScope, ResourceType resourceType) { ArgumentNullException.ThrowIfNull(expressionsInScope); ArgumentNullException.ThrowIfNull(resourceType); SortExpression? sort = expressionsInScope.OfType().FirstOrDefault(); - sort = _resourceDefinitionAccessor.OnApplySort(resourceType, sort); - - if (sort == null) - { - AttrAttribute idAttribute = GetIdAttribute(resourceType); - var idAscendingSort = new SortElementExpression(new ResourceFieldChainExpression(idAttribute), true); - sort = new SortExpression(ImmutableArray.Create(idAscendingSort)); - } + return _resourceDefinitionAccessor.OnApplySort(resourceType, sort); + } - return sort; + private SortExpression CreateSortById(ResourceType resourceType) + { + AttrAttribute idAttribute = GetIdAttribute(resourceType); + var idAscendingSort = new SortElementExpression(new ResourceFieldChainExpression(idAttribute), true); + return new SortExpression(ImmutableArray.Create(idAscendingSort)); } protected virtual PaginationExpression GetPagination(IReadOnlyCollection expressionsInScope, ResourceType resourceType) diff --git a/test/DapperTests/IntegrationTests/QueryStrings/FilterTests.cs b/test/DapperTests/IntegrationTests/QueryStrings/FilterTests.cs index f7da3533f..c303d7034 100644 --- a/test/DapperTests/IntegrationTests/QueryStrings/FilterTests.cs +++ b/test/DapperTests/IntegrationTests/QueryStrings/FilterTests.cs @@ -78,7 +78,6 @@ SELECT COUNT(*) FROM "Tags" AS t1 LEFT JOIN "RgbColors" AS t2 ON t1."Id" = t2."TagId" WHERE t2."Id" = @p1 - ORDER BY t1."Id" """)); command.Parameters.Should().HaveCount(1); @@ -144,7 +143,6 @@ SELECT COUNT(*) FROM "Tags" AS t1 LEFT JOIN "RgbColors" AS t2 ON t1."Id" = t2."TagId" WHERE t2."Id" IN (@p1, @p2) - ORDER BY t1."Id" """)); command.Parameters.Should().HaveCount(2); @@ -662,7 +660,6 @@ SELECT COUNT(*) SELECT t1."Id", t1."FirstName", t1."LastName" FROM "People" AS t1 WHERE (NOT (t1."FirstName" = @p1)) OR (t1."FirstName" IS NULL) - ORDER BY t1."Id" """)); command.Parameters.Should().HaveCount(1); @@ -867,7 +864,6 @@ SELECT COUNT(*) SELECT t1."Id", t1."Name" FROM "Tags" AS t1 WHERE (t1."Name" LIKE '%A\%%' ESCAPE '\') OR (t1."Name" LIKE '%A\_%' ESCAPE '\') OR (t1."Name" LIKE '%A\\%' ESCAPE '\') OR (t1."Name" LIKE '%A''%') OR (t1."Name" LIKE '%\%\_\\''%' ESCAPE '\') - ORDER BY t1."Id" """)); command.Parameters.Should().BeEmpty(); @@ -1177,7 +1173,6 @@ SELECT 1 LEFT JOIN "People" AS t3 ON t2."AssigneeId" = t3."Id" WHERE (t1."Id" = t2."OwnerId") AND (NOT (t3."Id" IS NULL)) AND (t3."FirstName" IS NULL) ) - ORDER BY t1."Id" """)); command.Parameters.Should().BeEmpty(); diff --git a/test/DapperTests/IntegrationTests/QueryStrings/IncludeTests.cs b/test/DapperTests/IntegrationTests/QueryStrings/IncludeTests.cs index 77805ee1b..84625b463 100644 --- a/test/DapperTests/IntegrationTests/QueryStrings/IncludeTests.cs +++ b/test/DapperTests/IntegrationTests/QueryStrings/IncludeTests.cs @@ -165,7 +165,7 @@ SELECT COUNT(*) INNER JOIN "People" AS t3 ON t1."OwnerId" = t3."Id" LEFT JOIN "TodoItems" AS t4 ON t3."Id" = t4."AssigneeId" LEFT JOIN "Tags" AS t5 ON t1."Id" = t5."TodoItemId" - ORDER BY t1."Priority", t1."LastModifiedAt" DESC, t4."Priority", t4."LastModifiedAt" DESC, t5."Id" + ORDER BY t1."Priority", t1."LastModifiedAt" DESC, t4."Priority", t4."LastModifiedAt" DESC """)); command.Parameters.Should().BeEmpty(); @@ -231,7 +231,7 @@ SELECT COUNT(*) FROM "TodoItems" AS t1 LEFT JOIN "Tags" AS t2 ON t1."Id" = t2."TodoItemId" LEFT JOIN "RgbColors" AS t3 ON t2."Id" = t3."TagId" - ORDER BY t1."Priority", t1."LastModifiedAt" DESC, t2."Id" + ORDER BY t1."Priority", t1."LastModifiedAt" DESC """)); command.Parameters.Should().BeEmpty(); diff --git a/test/DapperTests/IntegrationTests/QueryStrings/SortTests.cs b/test/DapperTests/IntegrationTests/QueryStrings/SortTests.cs index 488dda2cc..6a155d152 100644 --- a/test/DapperTests/IntegrationTests/QueryStrings/SortTests.cs +++ b/test/DapperTests/IntegrationTests/QueryStrings/SortTests.cs @@ -349,7 +349,7 @@ ORDER BY ( SELECT COUNT(*) FROM "Tags" AS t3 WHERE t2."Id" = t3."TodoItemId" - ) DESC, t2."Id", t4."Id" + ) DESC, t2."Id" """)); command.Parameters.Should().HaveCount(1); @@ -415,7 +415,7 @@ SELECT COUNT(*) SELECT t1."Id", t1."FirstName", t1."LastName", t2."Id", t2."CreatedAt", t2."Description", t2."DurationInHours", t2."LastModifiedAt", t2."Priority" FROM "People" AS t1 LEFT JOIN "TodoItems" AS t2 ON t1."Id" = t2."OwnerId" - ORDER BY t1."Id", ( + ORDER BY ( SELECT COUNT(*) FROM "Tags" AS t3 WHERE t2."Id" = t3."TodoItemId" diff --git a/test/DapperTests/IntegrationTests/QueryStrings/SparseFieldSets.cs b/test/DapperTests/IntegrationTests/QueryStrings/SparseFieldSets.cs index b2e0c68f8..a1d4524c9 100644 --- a/test/DapperTests/IntegrationTests/QueryStrings/SparseFieldSets.cs +++ b/test/DapperTests/IntegrationTests/QueryStrings/SparseFieldSets.cs @@ -215,7 +215,6 @@ SELECT COUNT(*) FROM "TodoItems" AS t1 LEFT JOIN "Tags" AS t2 ON t1."Id" = t2."TodoItemId" WHERE t1."Id" = @p1 - ORDER BY t2."Id" """)); command.Parameters.Should().HaveCount(1); @@ -400,7 +399,6 @@ await _testContext.RunOnDatabaseAsync(async dbContext => FROM "TodoItems" AS t1 LEFT JOIN "Tags" AS t2 ON t1."Id" = t2."TodoItemId" WHERE t1."Id" = @p1 - ORDER BY t2."Id" """)); command.Parameters.Should().HaveCount(1); diff --git a/test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs b/test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs index d4703dc99..9783672e6 100644 --- a/test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs +++ b/test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs @@ -168,7 +168,6 @@ SELECT COUNT(*) FROM "TodoItems" AS t1 LEFT JOIN "Tags" AS t2 ON t1."Id" = t2."TodoItemId" WHERE t1."Id" = @p1 - ORDER BY t2."Id" """)); command.Parameters.Should().HaveCount(1); diff --git a/test/DapperTests/IntegrationTests/ReadWrite/Resources/FetchResourceTests.cs b/test/DapperTests/IntegrationTests/ReadWrite/Resources/FetchResourceTests.cs index bd7139e5c..52bb378b2 100644 --- a/test/DapperTests/IntegrationTests/ReadWrite/Resources/FetchResourceTests.cs +++ b/test/DapperTests/IntegrationTests/ReadWrite/Resources/FetchResourceTests.cs @@ -246,7 +246,6 @@ SELECT COUNT(*) FROM "TodoItems" AS t1 LEFT JOIN "Tags" AS t2 ON t1."Id" = t2."TodoItemId" WHERE t1."Id" = @p1 - ORDER BY t2."Id" """)); command.Parameters.Should().HaveCount(1); diff --git a/test/DapperTests/IntegrationTests/Sql/SubQueryInJoinTests.cs b/test/DapperTests/IntegrationTests/Sql/SubQueryInJoinTests.cs index 8b7d18d2d..9b6e62f39 100644 --- a/test/DapperTests/IntegrationTests/Sql/SubQueryInJoinTests.cs +++ b/test/DapperTests/IntegrationTests/Sql/SubQueryInJoinTests.cs @@ -62,7 +62,6 @@ SELECT COUNT(*) SELECT t1."Id", t1."FirstName", t1."LastName", t2."Id", t2."LastUsedAt", t2."UserName" FROM "People" AS t1 LEFT JOIN "LoginAccounts" AS t2 ON t1."AccountId" = t2."Id" - ORDER BY t1."Id" """)); command.Parameters.Should().BeEmpty(); @@ -111,7 +110,7 @@ SELECT COUNT(*) SELECT t1."Id", t1."FirstName", t1."LastName", t2."Id", t2."CreatedAt", t2."Description", t2."DurationInHours", t2."LastModifiedAt", t2."Priority" FROM "People" AS t1 LEFT JOIN "TodoItems" AS t2 ON t1."Id" = t2."OwnerId" - ORDER BY t1."Id", t2."Priority", t2."LastModifiedAt" DESC + ORDER BY t2."Priority", t2."LastModifiedAt" DESC """)); command.Parameters.Should().BeEmpty(); @@ -160,7 +159,7 @@ SELECT COUNT(*) SELECT t1."Id", t1."FirstName", t1."LastName", t2."Id", t2."CreatedAt", t2."Description", t2."DurationInHours", t2."LastModifiedAt", t2."Priority" FROM "People" AS t1 LEFT JOIN "TodoItems" AS t2 ON t1."Id" = t2."OwnerId" - ORDER BY t1."Id", t2."Description" + ORDER BY t2."Description" """)); command.Parameters.Should().BeEmpty(); @@ -209,7 +208,7 @@ SELECT COUNT(*) SELECT t1."Id", t1."FirstName", t1."LastName", t2."Id", t2."CreatedAt", t2."Description", t2."DurationInHours", t2."LastModifiedAt", t2."Priority" FROM "People" AS t1 LEFT JOIN "TodoItems" AS t2 ON t1."Id" = t2."OwnerId" - ORDER BY t1."Id", ( + ORDER BY ( SELECT COUNT(*) FROM "Tags" AS t3 WHERE t2."Id" = t3."TodoItemId" @@ -263,7 +262,7 @@ SELECT COUNT(*) FROM "People" AS t1 LEFT JOIN "TodoItems" AS t2 ON t1."Id" = t2."OwnerId" LEFT JOIN "Tags" AS t4 ON t2."Id" = t4."TodoItemId" - ORDER BY t1."Id", ( + ORDER BY ( SELECT COUNT(*) FROM "Tags" AS t3 WHERE t2."Id" = t3."TodoItemId" @@ -326,11 +325,11 @@ SELECT COUNT(*) SELECT COUNT(*) FROM "Tags" AS t4 WHERE t3."Id" = t4."TodoItemId" - ), t5."Id", ( + ), ( SELECT COUNT(*) FROM "Tags" AS t7 WHERE t6."Id" = t7."TodoItemId" - ), t8."Id" + ) """)); command.Parameters.Should().BeEmpty(); @@ -383,7 +382,7 @@ LEFT JOIN ( FROM "TodoItems" AS t2 WHERE t2."Description" = @p1 ) AS t3 ON t1."Id" = t3."OwnerId" - ORDER BY t1."Id", t3."Priority", t3."LastModifiedAt" DESC + ORDER BY t3."Priority", t3."LastModifiedAt" DESC """)); command.Parameters.Should().HaveCount(1); @@ -441,7 +440,7 @@ SELECT 1 WHERE t2."Id" = t3."TodoItemId" ) ) AS t4 ON t1."Id" = t4."OwnerId" - ORDER BY t1."Id", t4."Priority", t4."LastModifiedAt" DESC + ORDER BY t4."Priority", t4."LastModifiedAt" DESC """)); command.Parameters.Should().BeEmpty(); @@ -498,7 +497,7 @@ SELECT COUNT(*) WHERE t2."Id" = t3."TodoItemId" ) > @p1 ) AS t4 ON t1."Id" = t4."OwnerId" - ORDER BY t1."Id", t4."Priority", t4."LastModifiedAt" DESC + ORDER BY t4."Priority", t4."LastModifiedAt" DESC """)); command.Parameters.Should().HaveCount(1); @@ -554,7 +553,7 @@ LEFT JOIN ( LEFT JOIN "Tags" AS t4 ON t2."Id" = t4."TodoItemId" WHERE t2."Description" = @p1 ) AS t5 ON t1."Id" = t5."OwnerId" - ORDER BY t1."Id", ( + ORDER BY ( SELECT COUNT(*) FROM "Tags" AS t3 WHERE t5."Id" = t3."TodoItemId" @@ -620,7 +619,7 @@ WHERE NOT (t5."Name" = @p2) ) AS t6 ON t2."Id" = t6."TodoItemId" WHERE NOT (t2."Description" = @p1) ) AS t7 ON t1."Id" = t7."OwnerId" - ORDER BY t1."Id", ( + ORDER BY ( SELECT COUNT(*) FROM "Tags" AS t3 WHERE t7."Id" = t3."TodoItemId" From 3c6d3bebe0beedadcf8a3fcb89c83b63fbbb8076 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Wed, 4 Jun 2025 00:44:55 +0200 Subject: [PATCH 12/30] Throw when AddOpenApiForJsonApi is called before AddJsonApi (#1737) --- .../ServiceCollectionExtensions.cs | 10 ++++++++ .../IncorrectSetupOrder/RegistrationTests.cs | 24 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 test/OpenApiTests/OpenApiGenerationFailures/IncorrectSetupOrder/RegistrationTests.cs diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs index 3b421c31d..687211528 100644 --- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs +++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs @@ -1,4 +1,5 @@ using JsonApiDotNetCore.Configuration; +using JsonApiDotNetCore.Errors; using JsonApiDotNetCore.Middleware; using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata; using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators; @@ -23,6 +24,7 @@ public static class ServiceCollectionExtensions public static void AddOpenApiForJsonApi(this IServiceCollection services, Action? configureSwaggerGenOptions = null) { ArgumentNullException.ThrowIfNull(services); + AssertHasJsonApi(services); AddCustomApiExplorer(services); AddCustomSwaggerComponents(services); @@ -38,6 +40,14 @@ public static void AddOpenApiForJsonApi(this IServiceCollection services, Action services.Replace(ServiceDescriptor.Singleton()); } + private static void AssertHasJsonApi(IServiceCollection services) + { + if (services.FirstOrDefault(descriptor => descriptor.ServiceType == typeof(IJsonApiOptions)) == null) + { + throw new InvalidConfigurationException("Call 'services.AddJsonApi()' before calling 'services.AddOpenApiForJsonApi()'."); + } + } + private static void AddCustomApiExplorer(IServiceCollection services) { services.TryAddSingleton(); diff --git a/test/OpenApiTests/OpenApiGenerationFailures/IncorrectSetupOrder/RegistrationTests.cs b/test/OpenApiTests/OpenApiGenerationFailures/IncorrectSetupOrder/RegistrationTests.cs new file mode 100644 index 000000000..603310008 --- /dev/null +++ b/test/OpenApiTests/OpenApiGenerationFailures/IncorrectSetupOrder/RegistrationTests.cs @@ -0,0 +1,24 @@ +using FluentAssertions; +using JsonApiDotNetCore.Errors; +using JsonApiDotNetCore.OpenApi.Swashbuckle; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace OpenApiTests.OpenApiGenerationFailures.IncorrectSetupOrder; + +public sealed class RegistrationTests +{ + [Fact] + public void Fails_when_OpenAPI_registered_without_JsonApi() + { + // Arrange + var services = new ServiceCollection(); + + // Act + Action action = () => services.AddOpenApiForJsonApi(); + + // Arrange + action.Should().ThrowExactly() + .WithMessage("Call 'services.AddJsonApi()' before calling 'services.AddOpenApiForJsonApi()'."); + } +} From e02db08ae14480a250bda355bdc978f08abfc391 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Sat, 14 Jun 2025 00:28:53 +0200 Subject: [PATCH 13/30] Package updates (#1740) --- .config/dotnet-tools.json | 2 +- package-versions.props | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f14a93f95..9d271bea8 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -31,7 +31,7 @@ "rollForward": false }, "microsoft.openapi.kiota": { - "version": "1.25.1", + "version": "1.27.0", "commands": [ "kiota" ], diff --git a/package-versions.props b/package-versions.props index 0403a83c0..0f2c3f6e7 100644 --- a/package-versions.props +++ b/package-versions.props @@ -4,11 +4,11 @@ 4.1.0 0.4.1 2.14.1 - 8.0.0 + 9.0.1 13.0.3 - 0.14.* + 0.15.* 1.0.* 35.6.* 4.14.* @@ -23,12 +23,12 @@ 14.4.* 13.0.* 4.1.* - 2.3.* - 8.*-* + 2.4.* + 9.*-* 9.0.* 17.14.* 2.9.* - 2.8.* + 3.1.* From 8877a58f50b8b57b3313702f35b86aad46a3187b Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Sat, 14 Jun 2025 01:16:20 +0200 Subject: [PATCH 14/30] Remove kiota limitation from list of known issues (the bug was fixed) --- docs/usage/openapi-client.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/usage/openapi-client.md b/docs/usage/openapi-client.md index 277d28021..5dc40ce6f 100644 --- a/docs/usage/openapi-client.md +++ b/docs/usage/openapi-client.md @@ -341,7 +341,6 @@ demonstrates how to use them. It uses local IDs to: | Properties are always nullable | - | https://github.com/microsoft/kiota/issues/3911 | | JSON:API query strings are inaccessible | Use `SetQueryStringHttpMessageHandler.CreateScope` from `JsonApiDotNetCore.OpenApi.Client.Kiota` package | https://github.com/microsoft/kiota/issues/3800 | | HTTP 304 (Not Modified) is not properly recognized | Catch `ApiException` and inspect the response status code | https://github.com/microsoft/kiota/issues/4190, https://github.com/microsoft/kiota-dotnet/issues/531 | -| No `Accept` header sent when only error responses define `Content-Type` | `JsonApiDotNetCore.OpenApi.Swashbuckle` package contains workaround | https://github.com/microsoft/kiota/issues/6572 | | Generator warns about unsupported formats | Use `JsonApiDotNetCore.OpenApi.Client.Kiota` package | https://github.com/microsoft/kiota/issues/4227 | | `Stream` response for HEAD request | - | https://github.com/microsoft/kiota/issues/4245 | | Unhelpful exception messages | - | https://github.com/microsoft/kiota/issues/4349 | From b438837feb1698559adbde5ee982b8134f1ad46a Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Sun, 15 Jun 2025 00:36:23 +0200 Subject: [PATCH 15/30] Update VERSIONING_POLICY.md Remove references to types that no longer exist. --- VERSIONING_POLICY.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSIONING_POLICY.md b/VERSIONING_POLICY.md index d44770cfc..a32ee43d7 100644 --- a/VERSIONING_POLICY.md +++ b/VERSIONING_POLICY.md @@ -1,8 +1,8 @@ # JsonApiDotNetCore versioning policy -Basically, we strive to adhere to [semantic versioning](https://semver.org/). +Basically, we strive to adhere to [Semantic Versioning](https://semver.org/). -However, we believe that our userbase is still small enough to allow for some flexibility in _minor_ updates, see below. +However, we believe that our user base is still small enough to allow for some flexibility in _minor_ updates, see below. ## Major updates @@ -10,9 +10,9 @@ For breaking changes in _major_ updates, we intend to list the ones that may aff ## Minor updates -We **WILL NOT** introduce breaking changes in _minor_ updates on our common extensibility points such as controllers, resource services, resource repositories, resource definitions, and `Identifiable` as well as common annotations such as `[Attr]`, `[HasOne]`, `[HasMany]`, and `[HasManyThrough]`. The same applies to the URL routes, JSON structure of request/response bodies, and query string syntax. +We **WILL NOT** introduce breaking changes in _minor_ updates on our common extensibility points, such as controllers, resource services, resource repositories, resource definitions, and `Identifiable`, as well as common annotations, such as `[Attr]`, `[HasOne]`, and `[HasMany]`. The same applies to the URL routes, JSON structure of request and response bodies, and query string syntax. -In previous versions of JsonApiDotNetCore, almost everything was public. While that makes customizations very easy for users, it kinda puts us in a corner: nearly every change would require a new major version. Therefore we try to balance between adding new features to the next _minor_ version or postpone them to the next _major_ version. This means we **CAREFULLY CONSIDER** if we can prevent breaking changes in _minor_ updates to signatures of "pubternal" types (public types in `Internal` namespaces), as well as exposed types of which we believe users are unlikely to have taken a direct dependency on. One example would be to inject an additional dependency in the constructor of a not-so-well-known class, such as `IncludedResourceObjectBuilder`. In the unlikely case that a user has taken a dependency on this class, the compiler error message is clear and the fix is obvious and easy. We may introduce binary breaking changes (such as adding an optional constructor parameter to a custom exception type), which requires users to recompile their existing code. +In previous versions of JsonApiDotNetCore, almost everything was public. While that makes customizations very easy for users, it kinda puts us in a corner: nearly every change would require a new major version. Therefore, we try to balance between adding new features to the next _minor_ version or postponing them to the next _major_ version. This means we **CAREFULLY CONSIDER** if we can prevent breaking changes in _minor_ updates to signatures of "pubternal" types (public types in `Internal` namespaces), as well as exposed types of which we believe users are unlikely to have taken a direct dependency on. One example would be to inject an additional dependency in the constructor of a not-so-well-known class, such as `OperationsProcessor`. In the unlikely case that a user has taken a dependency on this class, the compiler error message is clear, and the fix is obvious and easy. We may introduce binary breaking changes (such as adding an optional constructor parameter to a custom exception type), which requires users to recompile their existing code. Our goal is to try to minimize such breaks and require only a recompile of existing API projects. This also means that we'll need to publish an updated release for [JsonApiDotNetCore.MongoDb](https://github.com/json-api-dotnet/JsonApiDotNetCore.MongoDb) when this happens. @@ -20,4 +20,4 @@ We may also correct error messages in _minor_ updates. ## Backports -When users report that they are unable to upgrade as a result of breaking changes in a _minor_ version, we're willing to consider backporting fixes they need to an earlier _minor_ version. +When users report that they're unable to upgrade as a result of breaking changes in a _minor_ version, we're willing to consider backporting fixes they need to an earlier _minor_ version. From 1beae23ab605a12697fa1c611d0bd83864c1bca2 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Sat, 28 Jun 2025 13:47:28 +0200 Subject: [PATCH 16/30] Update JetBrains logo (#1741) --- README.md | 19 +++++++++++++++---- docs/home/assets/home.js | 2 +- docs/home/assets/img/jetbrains-logo-dark.svg | 13 +++++++++++++ docs/home/assets/img/jetbrains-logo-light.svg | 13 +++++++++++++ docs/home/index.html | 6 +++++- 5 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 docs/home/assets/img/jetbrains-logo-dark.svg create mode 100644 docs/home/assets/img/jetbrains-logo-light.svg diff --git a/README.md b/README.md index 5ab49fae3..dc8d5579b 100644 --- a/README.md +++ b/README.md @@ -287,9 +287,20 @@ pwsh Build.ps1 ## Sponsors -We are very grateful to the sponsors below, who have provided us with a no-cost license for their tools. - -

+We are grateful to the following sponsors, who provide the team with a no-cost license for using their tools. + +

+ + + + + + + + + + + +

Do you like this project? Consider to [sponsor](https://github.com/sponsors/json-api-dotnet), or just reward us by giving our repository a star. diff --git a/docs/home/assets/home.js b/docs/home/assets/home.js index 40e31c15a..3288b5647 100644 --- a/docs/home/assets/home.js +++ b/docs/home/assets/home.js @@ -83,7 +83,7 @@ function initTheme() { } // Sponsor panels linking - $('div[sponsor]#jetbrains').on('click', () => navigateExternalTo('https://jb.gg/OpenSourceSupport')); + $('div[sponsor]#jetbrains').on('click', () => navigateExternalTo('https://www.jetbrains.com/community/opensource')); $('div[sponsor]#araxis').on('click', () => navigateExternalTo('https://www.araxis.com/buy/open-source')); const navigateExternalTo = (url) => { diff --git a/docs/home/assets/img/jetbrains-logo-dark.svg b/docs/home/assets/img/jetbrains-logo-dark.svg new file mode 100644 index 000000000..6c68019bf --- /dev/null +++ b/docs/home/assets/img/jetbrains-logo-dark.svg @@ -0,0 +1,13 @@ + diff --git a/docs/home/assets/img/jetbrains-logo-light.svg b/docs/home/assets/img/jetbrains-logo-light.svg new file mode 100644 index 000000000..cb3a2a0e5 --- /dev/null +++ b/docs/home/assets/img/jetbrains-logo-light.svg @@ -0,0 +1,13 @@ + diff --git a/docs/home/index.html b/docs/home/index.html index a8530ec89..4b3294631 100644 --- a/docs/home/index.html +++ b/docs/home/index.html @@ -303,7 +303,11 @@

Sponsors

From d69f2bbfec7ab6f5db5f862b409da0e832318b3b Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Thu, 3 Jul 2025 23:03:38 +0200 Subject: [PATCH 18/30] Update Resharper (#1742) --- .config/dotnet-tools.json | 4 ++-- .../RestrictedControllers/CreateResourceTests.cs | 8 ++++---- .../RestrictedControllers/CreateResourceTests.cs | 8 ++++---- test/OpenApiTests/QueryStrings/QueryStringTests.cs | 4 ++-- test/SourceGeneratorTests/ControllerGenerationTests.cs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9d271bea8..de3b40bc0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "jetbrains.resharper.globaltools": { - "version": "2024.3.6", + "version": "2025.1.4", "commands": [ "jb" ], @@ -38,4 +38,4 @@ "rollForward": false } } -} \ No newline at end of file +} diff --git a/test/OpenApiKiotaEndToEndTests/RestrictedControllers/CreateResourceTests.cs b/test/OpenApiKiotaEndToEndTests/RestrictedControllers/CreateResourceTests.cs index fca3f3622..8a453ca10 100644 --- a/test/OpenApiKiotaEndToEndTests/RestrictedControllers/CreateResourceTests.cs +++ b/test/OpenApiKiotaEndToEndTests/RestrictedControllers/CreateResourceTests.cs @@ -107,15 +107,15 @@ await _testContext.RunOnDatabaseAsync(async dbContext => response.Included.Should().HaveCount(2); - response.Included.OfType().Should().ContainSingle(include => include.Id == existingVideoStream.StringId).Subject.With( - include => + response.Included.OfType().Should().ContainSingle(include => include.Id == existingVideoStream.StringId).Subject + .With(include => { include.Attributes.Should().NotBeNull(); include.Attributes.BytesTransmitted.Should().Be((long?)existingVideoStream.BytesTransmitted); }); - response.Included.OfType().Should().ContainSingle(include => include.Id == existingAudioStream.StringId).Subject.With( - include => + response.Included.OfType().Should().ContainSingle(include => include.Id == existingAudioStream.StringId).Subject + .With(include => { include.Attributes.Should().NotBeNull(); include.Attributes.BytesTransmitted.Should().Be((long?)existingAudioStream.BytesTransmitted); diff --git a/test/OpenApiNSwagEndToEndTests/RestrictedControllers/CreateResourceTests.cs b/test/OpenApiNSwagEndToEndTests/RestrictedControllers/CreateResourceTests.cs index 0fa4bec35..cfbfd95a0 100644 --- a/test/OpenApiNSwagEndToEndTests/RestrictedControllers/CreateResourceTests.cs +++ b/test/OpenApiNSwagEndToEndTests/RestrictedControllers/CreateResourceTests.cs @@ -103,15 +103,15 @@ await _testContext.RunOnDatabaseAsync(async dbContext => response.Included.Should().HaveCount(2); - response.Included.OfType().Should().ContainSingle(include => include.Id == existingVideoStream.StringId).Subject.With( - include => + response.Included.OfType().Should().ContainSingle(include => include.Id == existingVideoStream.StringId).Subject + .With(include => { include.Attributes.Should().NotBeNull(); include.Attributes.BytesTransmitted.Should().Be((long?)existingVideoStream.BytesTransmitted); }); - response.Included.OfType().Should().ContainSingle(include => include.Id == existingAudioStream.StringId).Subject.With( - include => + response.Included.OfType().Should().ContainSingle(include => include.Id == existingAudioStream.StringId).Subject + .With(include => { include.Attributes.Should().NotBeNull(); include.Attributes.BytesTransmitted.Should().Be((long?)existingAudioStream.BytesTransmitted); diff --git a/test/OpenApiTests/QueryStrings/QueryStringTests.cs b/test/OpenApiTests/QueryStrings/QueryStringTests.cs index f74f77379..af897df00 100644 --- a/test/OpenApiTests/QueryStrings/QueryStringTests.cs +++ b/test/OpenApiTests/QueryStrings/QueryStringTests.cs @@ -46,8 +46,8 @@ public async Task Endpoints_have_query_string_parameter(string endpointPath) { verbElement.Should().ContainPath("parameters").With(parametersElement => { - parametersElement.EnumerateArray().Should().ContainSingle(element => element.GetProperty("in").ValueEquals("query")).Subject.With( - parameterElement => + parametersElement.EnumerateArray().Should().ContainSingle(element => element.GetProperty("in").ValueEquals("query")).Subject + .With(parameterElement => { parameterElement.Should().HaveProperty("name", "query"); diff --git a/test/SourceGeneratorTests/ControllerGenerationTests.cs b/test/SourceGeneratorTests/ControllerGenerationTests.cs index 8f24b882a..098778dd0 100644 --- a/test/SourceGeneratorTests/ControllerGenerationTests.cs +++ b/test/SourceGeneratorTests/ControllerGenerationTests.cs @@ -225,7 +225,7 @@ public sealed class Item : Identifiable { private const JsonApiEndpoints NoRelationshipEndpoints = JsonApiEndpoints.GetCollection | JsonApiEndpoints.GetSingle | JsonApiEndpoints.Post | JsonApiEndpoints.Patch | JsonApiEndpoints.Delete; - + [Attr] public int Value { get; set; } } From e10a0785045fd60fb777faf0bf820f727d68dc21 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Thu, 3 Jul 2025 23:11:42 +0200 Subject: [PATCH 19/30] Update sponsor links --- README.md | 4 ++-- docs/home/assets/home.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dc8d5579b..d9719db34 100644 --- a/README.md +++ b/README.md @@ -290,7 +290,7 @@ pwsh Build.ps1 We are grateful to the following sponsors, who provide the team with a no-cost license for using their tools.

- + @@ -298,7 +298,7 @@ We are grateful to the following sponsors, who provide the team with a no-cost l - +

diff --git a/docs/home/assets/home.js b/docs/home/assets/home.js index 3288b5647..8661ee6b1 100644 --- a/docs/home/assets/home.js +++ b/docs/home/assets/home.js @@ -83,8 +83,8 @@ function initTheme() { } // Sponsor panels linking - $('div[sponsor]#jetbrains').on('click', () => navigateExternalTo('https://www.jetbrains.com/community/opensource')); - $('div[sponsor]#araxis').on('click', () => navigateExternalTo('https://www.araxis.com/buy/open-source')); + $('div[sponsor]#jetbrains').on('click', () => navigateExternalTo('https://jb.gg/OpenSource')); + $('div[sponsor]#araxis').on('click', () => navigateExternalTo('https://www.araxis.com')); const navigateExternalTo = (url) => { window.open(url, "_blank"); From 267876985c5457ed1f55514d14c5ea27ade1e916 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Sat, 12 Jul 2025 00:58:51 +0200 Subject: [PATCH 20/30] Update Qodana workflow, cleanup (#1743) --- .github/workflows/build.yml | 74 +++++++------------ .github/workflows/codeql.yml | 5 +- .github/workflows/qodana.yml | 45 +++++++---- .../AmbientTransactionFactory.cs | 2 +- .../Serialization/Response/LinkBuilder.cs | 2 +- 5 files changed, 63 insertions(+), 65 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc38da9f3..5c7db60d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,9 +9,9 @@ name: Build on: - push: - branches: [ 'master', 'release/**' ] + workflow_dispatch: pull_request: + push: branches: [ 'master', 'release/**' ] release: types: [published] @@ -57,17 +57,15 @@ jobs: - name: Git checkout uses: actions/checkout@v4 - name: Restore tools - run: | - dotnet tool restore + run: dotnet tool restore - name: Restore packages - run: | - dotnet restore + run: dotnet restore - name: Calculate version suffix shell: pwsh run: | if ($env:GITHUB_REF_TYPE -eq 'tag') { # Get the version prefix/suffix from the git tag. For example: 'v1.0.0-preview1-final' => '1.0.0' and 'preview1-final' - $segments = $env:GITHUB_REF_NAME -split "-" + $segments = $env:GITHUB_REF_NAME -split '-' $versionPrefix = $segments[0].TrimStart('v') $versionSuffix = $segments.Length -eq 1 ? '' : $segments[1..$($segments.Length - 1)] -join '-' @@ -93,9 +91,7 @@ jobs: Write-Output "Using version suffix: $versionSuffix" Write-Output "PACKAGE_VERSION_SUFFIX=$versionSuffix" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Build - shell: pwsh - run: | - dotnet build --no-restore --configuration Release /p:VersionSuffix=$env:PACKAGE_VERSION_SUFFIX + run: dotnet build --no-restore --configuration Release /p:VersionSuffix=${{ env.PACKAGE_VERSION_SUFFIX }} - name: Test env: # Override log levels, to reduce logging output when running tests in ci-build. @@ -104,10 +100,9 @@ jobs: Logging__LogLevel__Microsoft.Extensions.Hosting.Internal.Host: 'None' Logging__LogLevel__Microsoft.EntityFrameworkCore.Database.Command: 'None' Logging__LogLevel__JsonApiDotNetCore: 'None' - run: | - dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;summary.includeSkippedTests=true" + run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;summary.includeSkippedTests=true" - name: Upload coverage to codecov.io - if: matrix.os == 'ubuntu-latest' + if: ${{ matrix.os == 'ubuntu-latest' }} env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} uses: codecov/codecov-action@v5 @@ -115,11 +110,9 @@ jobs: fail_ci_if_error: true verbose: true - name: Generate packages - shell: pwsh - run: | - dotnet pack --no-build --configuration Release --output $env:GITHUB_WORKSPACE/artifacts/packages /p:VersionSuffix=$env:PACKAGE_VERSION_SUFFIX + run: dotnet pack --no-build --configuration Release --output ${{ github.workspace }}/artifacts/packages /p:VersionSuffix=${{ env.PACKAGE_VERSION_SUFFIX }} - name: Upload packages to artifacts - if: matrix.os == 'ubuntu-latest' + if: ${{ matrix.os == 'ubuntu-latest' }} uses: actions/upload-artifact@v4 with: name: packages @@ -127,7 +120,7 @@ jobs: - name: Generate documentation shell: pwsh env: - # This contains the git tag name on release; in that case we build the docs without publishing them. + # This contains the git tag name on release; in that case, we build the docs without publishing them. DOCFX_SOURCE_BRANCH_NAME: ${{ github.base_ref || github.ref_name }} run: | cd docs @@ -142,7 +135,7 @@ jobs: New-Item -Force _site/styles -ItemType Directory | Out-Null Copy-Item -Recurse home/assets/* _site/styles/ - name: Upload documentation to artifacts - if: matrix.os == 'ubuntu-latest' + if: ${{ matrix.os == 'ubuntu-latest' }} uses: actions/upload-artifact@v4 with: name: documentation @@ -169,8 +162,7 @@ jobs: - name: Git checkout uses: actions/checkout@v4 - name: Restore tools - run: | - dotnet tool restore + run: dotnet tool restore - name: InspectCode shell: pwsh run: | @@ -199,7 +191,7 @@ jobs: } if ($failed) { - Write-Error "One or more projects failed code inspection." + Write-Error 'One or more projects failed code inspection.' } } @@ -226,13 +218,11 @@ jobs: with: fetch-depth: 2 - name: Restore tools - run: | - dotnet tool restore + run: dotnet tool restore - name: Restore packages - run: | - dotnet restore + run: dotnet restore - name: CleanupCode (on PR diff) - if: github.event_name == 'pull_request' + if: ${{ github.event_name == 'pull_request' }} shell: pwsh run: | # Not using the environment variables for SHAs, because they may be outdated. This may happen on force-push after the build is queued, but before it starts. @@ -243,10 +233,10 @@ jobs: Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request." dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff - name: CleanupCode (on branch) - if: github.event_name == 'push' || github.event_name == 'release' + if: ${{ github.event_name == 'push' || github.event_name == 'release' }} shell: pwsh run: | - Write-Output "Running code cleanup on all files." + Write-Output 'Running code cleanup on all files.' dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN --fail-on-diff --print-diff publish: @@ -263,23 +253,17 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v4 - name: Publish to GitHub Packages - if: github.event_name == 'push' || github.event_name == 'release' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - shell: pwsh + if: ${{ github.event_name == 'push' || github.event_name == 'release' }} run: | - dotnet nuget add source --username 'json-api-dotnet' --password "$env:GITHUB_TOKEN" --store-password-in-clear-text --name 'github' 'https://nuget.pkg.github.com/json-api-dotnet/index.json' - dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:GITHUB_TOKEN" --source 'github' + dotnet nuget add source --username 'json-api-dotnet' --password '${{ secrets.GITHUB_TOKEN }}' --store-password-in-clear-text --name 'github' 'https://nuget.pkg.github.com/json-api-dotnet/index.json' + dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key '${{ secrets.GITHUB_TOKEN }}' --source 'github' - name: Publish to feedz.io - if: github.event_name == 'push' || github.event_name == 'release' - env: - FEEDZ_IO_API_KEY: ${{ secrets.FEEDZ_IO_API_KEY }} - shell: pwsh + if: ${{ github.event_name == 'push' || github.event_name == 'release' }} run: | dotnet nuget add source --name 'feedz-io' 'https://f.feedz.io/json-api-dotnet/jsonapidotnetcore/nuget/index.json' - dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:FEEDZ_IO_API_KEY" --source 'feedz-io' + dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key '${{ secrets.FEEDZ_IO_API_KEY }}' --source 'feedz-io' - name: Publish documentation - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} @@ -287,9 +271,5 @@ jobs: publish_dir: ./documentation commit_message: 'Auto-generated documentation from' - name: Publish to NuGet - if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') - env: - NUGET_ORG_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }} - shell: pwsh - run: | - dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:NUGET_ORG_API_KEY" --source 'nuget.org' --skip-duplicate + if: ${{ github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v') }} + run: dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key '${{ secrets.NUGET_ORG_API_KEY }}' --source 'nuget.org' --skip-duplicate diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 508d21015..705d75d68 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,10 +1,9 @@ name: "CodeQL" on: - push: - branches: [ 'master', 'release/**' ] + workflow_dispatch: pull_request: - # The branches below must be a subset of the branches above + push: branches: [ 'master', 'release/**' ] schedule: - cron: '0 0 * * 5' diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 8ce0acd5d..0f88a90f3 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -1,13 +1,17 @@ -# https://www.jetbrains.com/help/qodana/cloud-forward-reports.html#cloud-forward-reports-github-actions - name: Qodana on: workflow_dispatch: pull_request: push: - branches: - - master - - 'release/*' + branches: [ 'master', 'release/**' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + DOTNET_NOLOGO: true + DOTNET_CLI_TELEMETRY_OPTOUT: true jobs: qodana: @@ -17,17 +21,32 @@ jobs: pull-requests: write checks: write steps: - - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 8.0.* + 9.0.* + - name: Git checkout + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit fetch-depth: 0 # a full history is required for pull request analysis - - name: 'Qodana Scan' - uses: JetBrains/qodana-action@v2024.1 + - name: Restore tools + run: dotnet tool restore + - name: Restore packages + run: dotnet restore + - name: Build + run: dotnet build --no-restore --configuration Release + - name: Qodana scan + uses: JetBrains/qodana-action@v2025.1 + with: + args: --ide,QDNET,--profile-name,qodana.recommended,--configuration,Release,--apply-fixes + push-fixes: pull-request + upload-result: true env: QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} - - name: Upload results to artifacts on failure - if: failure() - uses: actions/upload-artifact@v4 + - name: Upload SARIF report + uses: github/codeql-action/upload-sarif@v3 with: - name: qodana_results - path: ${{ runner.temp }}/qodana/results + sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json diff --git a/src/Examples/DapperExample/AtomicOperations/AmbientTransactionFactory.cs b/src/Examples/DapperExample/AtomicOperations/AmbientTransactionFactory.cs index 82790819f..715310e04 100644 --- a/src/Examples/DapperExample/AtomicOperations/AmbientTransactionFactory.cs +++ b/src/Examples/DapperExample/AtomicOperations/AmbientTransactionFactory.cs @@ -26,7 +26,7 @@ public AmbientTransactionFactory(IJsonApiOptions options, IDataModelService data internal async Task BeginTransactionAsync(CancellationToken cancellationToken) { - var instance = (IOperationsTransactionFactory)this; + IOperationsTransactionFactory instance = this; IOperationsTransaction transaction = await instance.BeginTransactionAsync(cancellationToken); return (AmbientTransaction)transaction; diff --git a/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs b/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs index b7f200dd4..df712d6ee 100644 --- a/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs +++ b/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs @@ -219,7 +219,7 @@ private string GetLinkForPagination(int pageOffset, string? pageSizeValue) private string GetQueryStringInPaginationLink(int pageOffset, string? pageSizeValue) { - Dictionary parameters = HttpContext.Request.Query.ToDictionary(pair => pair.Key, pair => (string?)pair.Value.ToString()); + Dictionary parameters = HttpContext.Request.Query.ToDictionary(pair => pair.Key, string? (pair) => pair.Value.ToString()); if (pageSizeValue == null) { From 8c59d1b640fe87c70ff8a5488cbd041036c4a504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Harrtell?= Date: Thu, 17 Jul 2025 00:14:31 +0200 Subject: [PATCH 21/30] Add note on included and pagination (#1744) * Add note on included and pagination * Update docs/usage/reading/pagination.md Co-authored-by: Bart Koelman <10324372+bkoelman@users.noreply.github.com> --------- Co-authored-by: Bart Koelman <10324372+bkoelman@users.noreply.github.com> --- docs/usage/reading/pagination.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/usage/reading/pagination.md b/docs/usage/reading/pagination.md index ea4e30e62..e53ae1c3a 100644 --- a/docs/usage/reading/pagination.md +++ b/docs/usage/reading/pagination.md @@ -18,6 +18,10 @@ and on included resources, for example: GET /api/blogs/1/articles?include=revisions&page[size]=10,revisions:5&page[number]=2,revisions:3 HTTP/1.1 ``` +> [!NOTE] +> For optimal performance, pagination links and total meta are not returned for *included* to-many relationships. +> See [here](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1738) for details. + ## Configuring Default Behavior You can configure the global default behavior as described [here](~/usage/options.md#pagination). From e380c568028db53c5aae379c2fdc0a30a4375082 Mon Sep 17 00:00:00 2001 From: Bart Koelman <10324372+bkoelman@users.noreply.github.com> Date: Fri, 1 Aug 2025 11:35:12 +0200 Subject: [PATCH 22/30] OpenAPI: Show custom endpoints, fix content negotiation (#1747) * Add some .http files * Include custom controllers and minimal API endpoints in OpenAPI; log warning for non-standard JSON:API action methods; fix broken content negotiation. --- .config/dotnet-tools.json | 4 +- package-versions.props | 1 + .../GettingStarted/GettingStarted.http | 85 ++ .../Controllers/NonJsonApiController.cs | 25 +- .../JsonApiDotNetCoreExample.json | 137 +++ .../JsonApiDotNetCoreExample.http | 47 + .../GeneratedCode/ExampleApiClient.cs | 7 + .../NonJsonApi/NonJsonApiRequestBuilder.cs | 206 +++++ .../ActionDescriptorExtensions.cs | 27 +- .../ConfigureMvcOptions.cs | 9 +- .../ConfigureSwaggerGenOptions.cs | 28 +- ...onApiActionDescriptorCollectionProvider.cs | 489 ++++++++-- .../AtomicOperationsActionMethod.cs | 9 + .../BuiltinJsonApiActionMethod.cs | 18 + .../CustomControllerActionMethod.cs | 13 + .../CustomJsonApiActionMethod.cs | 15 + .../ActionMethods/JsonApiActionMethod.cs | 17 + .../ActionMethods/OpenApiActionMethod.cs | 58 ++ .../AtomicOperationsRequestMetadata.cs | 6 +- .../AtomicOperationsResponseMetadata.cs | 6 +- .../EmptyRelationshipResponseMetadata.cs | 15 + .../Documents/IJsonApiRequestMetadata.cs | 3 + .../Documents/IJsonApiResponseMetadata.cs | 3 + .../Documents/JsonApiEndpointMetadata.cs | 7 + .../Documents/NonPrimaryResponseMetadata.cs | 15 + .../{ => Documents}/PrimaryRequestMetadata.cs | 2 +- .../Documents/PrimaryResponseMetadata.cs | 6 + .../Documents/RelationshipRequestMetadata.cs | 15 + .../Documents/RelationshipResponseMetadata.cs | 6 + .../Documents/SecondaryResponseMetadata.cs | 6 + .../JsonApiMetadata/EndpointResolver.cs | 38 - .../IJsonApiEndpointMetadata.cs | 3 - .../IJsonApiRequestMetadata.cs | 3 - .../IJsonApiResponseMetadata.cs | 3 - .../JsonApiEndpointMetadataContainer.cs | 10 - .../JsonApiEndpointMetadataProvider.cs | 78 +- .../NonPrimaryEndpointMetadata.cs | 13 - .../PrimaryResponseMetadata.cs | 13 - .../RelationshipRequestMetadata.cs | 4 - .../RelationshipResponseMetadata.cs | 4 - .../SecondaryResponseMetadata.cs | 4 - .../JsonApiRequestFormatMetadataProvider.cs | 21 +- .../JsonApiSchemaFacts.cs | 34 +- .../OpenApiContentTypeProvider.cs | 56 ++ .../OpenApiEndpointConvention.cs | 348 ------- .../OpenApiOperationIdSelector.cs | 42 +- ...ceOrRelationshipDocumentSchemaGenerator.cs | 27 +- .../GenerationCacheSchemaGenerator.cs | 19 +- .../JsonApiSchemaGenerator.cs | 36 +- .../ServiceCollectionExtensions.cs | 24 +- .../DocumentationOpenApiOperationFilter.cs | 5 +- .../Mixed/AtomicLoggingTests.cs | 7 +- .../Mixed/AtomicTraceLoggingTests.cs | 8 +- .../Authorization/Scopes/ScopesStartup.cs | 2 +- .../ApiControllerAttributeLogTests.cs | 6 +- .../ExceptionHandlerTests.cs | 6 +- .../HostingInIIS/HostingStartup.cs | 4 +- .../IntegrationTests/Logging/LoggingTests.cs | 8 +- .../KebabCasingConventionStartup.cs | 4 +- .../PascalCasingConventionStartup.cs | 4 +- .../AbsoluteLinksInApiNamespaceStartup.cs | 4 +- .../AbsoluteLinksNoNamespaceStartup.cs | 4 +- .../Startups/NoModelStateValidationStartup.cs | 4 +- .../RelativeLinksInApiNamespaceStartup.cs | 4 +- .../RelativeLinksNoNamespaceStartup.cs | 4 +- .../ResourceObjectConverterTests.cs | 4 +- .../SourcePointerInExceptionTests.cs | 4 +- .../AdditionalPropertiesTests.cs | 20 +- .../CupOfCoffeesRequestBuilder.cs | 140 +++ .../Item/CupOfCoffeesItemRequestBuilder.cs | 80 ++ .../Emails/EmailsRequestBuilder.cs | 52 ++ .../Emails/Send/SendRequestBuilder.cs | 86 ++ .../SentSince/SentSinceRequestBuilder.cs | 128 +++ .../FileTransfersRequestBuilder.cs | 156 ++++ .../FileTransfers/Find/FindRequestBuilder.cs | 118 +++ .../GeneratedCode/MixedControllersClient.cs | 68 ++ .../Models/AttributesInCupOfCoffeeResponse.cs | 68 ++ .../Models/AttributesInResponse.cs | 75 ++ .../CupOfCoffeeCollectionResponseDocument.cs | 97 ++ .../Models/DataInCupOfCoffeeResponse.cs | 77 ++ .../GeneratedCode/Models/Email.cs | 105 +++ .../GeneratedCode/Models/ErrorLinks.cs | 79 ++ .../GeneratedCode/Models/ErrorObject.cs | 133 +++ .../Models/ErrorResponseDocument.cs | 92 ++ .../GeneratedCode/Models/ErrorSource.cs | 88 ++ .../Models/ErrorTopLevelLinks.cs | 79 ++ .../Models/HttpValidationProblemDetails.cs | 128 +++ .../HttpValidationProblemDetails_errors.cs | 70 ++ .../GeneratedCode/Models/Meta.cs | 70 ++ .../Models/ResourceCollectionTopLevelLinks.cs | 115 +++ .../Models/ResourceInResponse.cs | 84 ++ .../GeneratedCode/Models/ResourceLinks.cs | 70 ++ .../GeneratedCode/Models/ResourceType.cs | 18 + .../MixedControllers/MixedControllerTests.cs | 314 +++++++ .../OpenApiKiotaEndToEndTests.csproj | 7 + .../AtomicOperations/MediaTypeTests.cs | 83 ++ .../MixedControllers/MixedControllerTests.cs | 316 +++++++ .../OpenApiNSwagEndToEndTests.csproj | 6 + .../RestrictedControllers/MediaTypeTests.cs | 115 +++ .../Documentation/DocumentationStartup.cs | 10 +- .../LegacyOpenApi/LegacyStartup.cs | 4 +- .../MixedControllers/CoffeeDbContext.cs | 12 + .../MixedControllers/CoffeeSummary.cs | 26 + .../CoffeeSummaryController.cs | 85 ++ .../MixedControllers/CupOfCoffee.cs | 20 + test/OpenApiTests/MixedControllers/Email.cs | 41 + .../FileTransferController.cs | 68 ++ .../GeneratedSwagger/swagger.g.json | 847 ++++++++++++++++++ .../MixedControllers/InMemoryFileStorage.cs | 8 + .../InMemoryOutgoingEmailsProvider.cs | 8 + .../MixedControllers/LoggingTests.cs | 51 ++ .../MinimalApiStartupFilter.cs | 117 +++ .../MixedControllers/MixedControllerFakers.cs | 27 + .../MixedControllerStartup.cs | 14 + .../MixedControllers/MixedControllerTests.cs | 230 +++++ .../CamelCaseNamingConventionStartup.cs | 4 +- .../KebabCaseNamingConventionStartup.cs | 4 +- .../PascalCaseNamingConventionStartup.cs | 4 +- test/OpenApiTests/OpenApiStartup.cs | 8 +- test/OpenApiTests/OpenApiTests.csproj | 1 + .../ResourceFieldValidation/MsvOffStartup.cs | 4 +- test/TestBuildingBlocks/TestableStartup.cs | 10 +- 122 files changed, 6119 insertions(+), 768 deletions(-) create mode 100644 src/Examples/GettingStarted/GettingStarted.http create mode 100644 src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.http create mode 100644 src/Examples/OpenApiKiotaClientExample/GeneratedCode/NonJsonApi/NonJsonApiRequestBuilder.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/AtomicOperationsActionMethod.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/BuiltinJsonApiActionMethod.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/CustomControllerActionMethod.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/CustomJsonApiActionMethod.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/JsonApiActionMethod.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/OpenApiActionMethod.cs rename src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/{ => Documents}/AtomicOperationsRequestMetadata.cs (51%) rename src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/{ => Documents}/AtomicOperationsResponseMetadata.cs (51%) create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/EmptyRelationshipResponseMetadata.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/IJsonApiRequestMetadata.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/IJsonApiResponseMetadata.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/JsonApiEndpointMetadata.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/NonPrimaryResponseMetadata.cs rename src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/{ => Documents}/PrimaryRequestMetadata.cs (78%) create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/PrimaryResponseMetadata.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/RelationshipRequestMetadata.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/RelationshipResponseMetadata.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/SecondaryResponseMetadata.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiEndpointMetadata.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiRequestMetadata.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiResponseMetadata.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryEndpointMetadata.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryResponseMetadata.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipRequestMetadata.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipResponseMetadata.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/SecondaryResponseMetadata.cs create mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiContentTypeProvider.cs delete mode 100644 src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/CupOfCoffees/CupOfCoffeesRequestBuilder.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/CupOfCoffees/Item/CupOfCoffeesItemRequestBuilder.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/EmailsRequestBuilder.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/Send/SendRequestBuilder.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/SentSince/SentSinceRequestBuilder.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/FileTransfers/FileTransfersRequestBuilder.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/FileTransfers/Find/FindRequestBuilder.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/MixedControllersClient.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/AttributesInCupOfCoffeeResponse.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/AttributesInResponse.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/CupOfCoffeeCollectionResponseDocument.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/DataInCupOfCoffeeResponse.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/Email.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorLinks.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorObject.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorResponseDocument.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorSource.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorTopLevelLinks.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/HttpValidationProblemDetails.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/HttpValidationProblemDetails_errors.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/Meta.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceCollectionTopLevelLinks.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceInResponse.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceLinks.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceType.cs create mode 100644 test/OpenApiKiotaEndToEndTests/MixedControllers/MixedControllerTests.cs create mode 100644 test/OpenApiNSwagEndToEndTests/AtomicOperations/MediaTypeTests.cs create mode 100644 test/OpenApiNSwagEndToEndTests/MixedControllers/MixedControllerTests.cs create mode 100644 test/OpenApiNSwagEndToEndTests/RestrictedControllers/MediaTypeTests.cs create mode 100644 test/OpenApiTests/MixedControllers/CoffeeDbContext.cs create mode 100644 test/OpenApiTests/MixedControllers/CoffeeSummary.cs create mode 100644 test/OpenApiTests/MixedControllers/CoffeeSummaryController.cs create mode 100644 test/OpenApiTests/MixedControllers/CupOfCoffee.cs create mode 100644 test/OpenApiTests/MixedControllers/Email.cs create mode 100644 test/OpenApiTests/MixedControllers/FileTransferController.cs create mode 100644 test/OpenApiTests/MixedControllers/GeneratedSwagger/swagger.g.json create mode 100644 test/OpenApiTests/MixedControllers/InMemoryFileStorage.cs create mode 100644 test/OpenApiTests/MixedControllers/InMemoryOutgoingEmailsProvider.cs create mode 100644 test/OpenApiTests/MixedControllers/LoggingTests.cs create mode 100644 test/OpenApiTests/MixedControllers/MinimalApiStartupFilter.cs create mode 100644 test/OpenApiTests/MixedControllers/MixedControllerFakers.cs create mode 100644 test/OpenApiTests/MixedControllers/MixedControllerStartup.cs create mode 100644 test/OpenApiTests/MixedControllers/MixedControllerTests.cs diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index de3b40bc0..b665b78a1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -31,11 +31,11 @@ "rollForward": false }, "microsoft.openapi.kiota": { - "version": "1.27.0", + "version": "1.28.0", "commands": [ "kiota" ], "rollForward": false } } -} +} \ No newline at end of file diff --git a/package-versions.props b/package-versions.props index 0f2c3f6e7..4344ce16e 100644 --- a/package-versions.props +++ b/package-versions.props @@ -20,6 +20,7 @@ 1.* 9.0.* 9.0.* + 0.9.* 14.4.* 13.0.* 4.1.* diff --git a/src/Examples/GettingStarted/GettingStarted.http b/src/Examples/GettingStarted/GettingStarted.http new file mode 100644 index 000000000..271f493a1 --- /dev/null +++ b/src/Examples/GettingStarted/GettingStarted.http @@ -0,0 +1,85 @@ +@hostAddress = http://localhost:14141 + +### Get all books with their authors. + +GET {{hostAddress}}/api/books?include=author + +### Get the first two books. + +GET {{hostAddress}}/api/books?page[size]=2 + +### Filter books whose title contains whitespace, sort descending by publication year. + +GET {{hostAddress}}/api/books?filter=contains(title,'%20')&sort=-publishYear + +### Get only the titles of all books. + +GET {{hostAddress}}/api/books?fields[books]=title + +### Get the names of all people. + +GET {{hostAddress}}/api/people?fields[people]=name + +### Create a new person. + +POST {{hostAddress}}/api/people +Content-Type: application/vnd.api+json + +{ + "data": { + "type": "people", + "attributes": { + "name": "Alice" + } + } +} + +### Create a new book, authored by the created person. + +POST {{hostAddress}}/api/books +Content-Type: application/vnd.api+json + +{ + "data": { + "type": "books", + "attributes": { + "title": "Getting started with JSON:API", + "publishYear": 2000 + }, + "relationships": { + "author": { + "data": { + "type": "people", + "id": "4" + } + } + } + } +} + +### Change the publication year and author of the book with ID 1. + +PATCH {{hostAddress}}/api/books/1 +Content-Type: application/vnd.api+json + +{ + "data": { + "type": "books", + "id": "1", + "attributes": { + "publishYear": 1820 + }, + "relationships": { + "author": { + "data": { + "type": "people", + "id": "4" + } + } + } + } +} + +### Delete the book with ID 1. + +DELETE {{hostAddress}}/api/books/1 diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/NonJsonApiController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/NonJsonApiController.cs index aa5111086..8d072b1ec 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Controllers/NonJsonApiController.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Controllers/NonJsonApiController.cs @@ -3,9 +3,13 @@ namespace JsonApiDotNetCoreExample.Controllers; [Route("[controller]")] +[Tags("nonJsonApi")] public sealed class NonJsonApiController : ControllerBase { - [HttpGet] + [HttpGet(Name = "welcomeGet")] + [HttpHead(Name = "welcomeHead")] + [EndpointDescription("Returns a single-element JSON array.")] + [ProducesResponseType>(StatusCodes.Status200OK, "application/json")] public IActionResult Get() { string[] result = ["Welcome!"]; @@ -14,12 +18,15 @@ public IActionResult Get() } [HttpPost] - public async Task PostAsync() + [EndpointDescription("Returns a greeting text, based on your name.")] + [Consumes("application/json")] + [ProducesResponseType(StatusCodes.Status200OK, "text/plain")] + [ProducesResponseType(StatusCodes.Status400BadRequest, "text/plain")] + public async Task PostAsync([FromBody] string? name) { - using var reader = new StreamReader(Request.Body, leaveOpen: true); - string name = await reader.ReadToEndAsync(); + await Task.Yield(); - if (string.IsNullOrEmpty(name)) + if (string.IsNullOrWhiteSpace(name)) { return BadRequest("Please send your name."); } @@ -29,14 +36,18 @@ public async Task PostAsync() } [HttpPut] - public IActionResult Put([FromBody] string name) + [EndpointDescription("Returns another greeting text.")] + [ProducesResponseType(StatusCodes.Status200OK, "text/plain")] + public IActionResult Put([FromQuery] string? name) { string result = $"Hi, {name}"; return Ok(result); } [HttpPatch] - public IActionResult Patch(string name) + [EndpointDescription("Wishes you a good day.")] + [ProducesResponseType(StatusCodes.Status200OK, "text/plain")] + public IActionResult Patch([FromHeader] string? name) { string result = $"Good day, {name}"; return Ok(result); diff --git a/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json b/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json index 486300059..15fe87de7 100644 --- a/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json +++ b/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json @@ -10,6 +10,143 @@ } ], "paths": { + "/NonJsonApi": { + "get": { + "tags": [ + "nonJsonApi" + ], + "description": "Returns a single-element JSON array.", + "operationId": "welcomeGet", + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + } + } + }, + "head": { + "tags": [ + "nonJsonApi" + ], + "description": "Returns a single-element JSON array.", + "operationId": "welcomeHead", + "responses": { + "200": { + "description": "OK" + } + } + }, + "post": { + "tags": [ + "nonJsonApi" + ], + "description": "Returns a greeting text, based on your name.", + "requestBody": { + "content": { + "application/json": { + "schema": { + "type": "string" + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "type": "string" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "type": "string" + } + } + } + } + } + }, + "put": { + "tags": [ + "nonJsonApi" + ], + "description": "Returns another greeting text.", + "parameters": [ + { + "name": "name", + "in": "query", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "type": "string" + } + } + } + } + } + }, + "patch": { + "tags": [ + "nonJsonApi" + ], + "description": "Wishes you a good day.", + "parameters": [ + { + "name": "name", + "in": "header", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain": { + "schema": { + "type": "string" + } + } + } + } + } + }, + "delete": { + "tags": [ + "nonJsonApi" + ], + "responses": { + "200": { + "description": "OK" + } + } + } + }, "/api/operations": { "post": { "tags": [ diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.http b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.http new file mode 100644 index 000000000..6ea166d4e --- /dev/null +++ b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.http @@ -0,0 +1,47 @@ +@hostAddress = https://localhost:44340 + +### Gets all high-priority todo-items, including their owner, assignee and tags. + +GET {{hostAddress}}/api/todoItems?include=owner,assignee,tags&filter=equals(priority,'High') + +### Creates a todo-item, linking it to an existing owner, assignee and tags. + +POST {{hostAddress}}/api/todoItems +Content-Type: application/vnd.api+json + +{ + "data": { + "type": "todoItems", + "attributes": { + "description": "Create release", + "priority": "High", + "durationInHours": 1 + }, + "relationships": { + "owner": { + "data": { + "type": "people", + "id": "1" + } + }, + "assignee": { + "data": { + "type": "people", + "id": "1" + } + }, + "tags": { + "data": [ + { + "type": "tags", + "id": "1" + }, + { + "type": "tags", + "id": "2" + } + ] + } + } + } +} diff --git a/src/Examples/OpenApiKiotaClientExample/GeneratedCode/ExampleApiClient.cs b/src/Examples/OpenApiKiotaClientExample/GeneratedCode/ExampleApiClient.cs index 15ea89704..4a9cbd037 100644 --- a/src/Examples/OpenApiKiotaClientExample/GeneratedCode/ExampleApiClient.cs +++ b/src/Examples/OpenApiKiotaClientExample/GeneratedCode/ExampleApiClient.cs @@ -10,6 +10,7 @@ using Microsoft.Kiota.Serialization.Multipart; using Microsoft.Kiota.Serialization.Text; using OpenApiKiotaClientExample.GeneratedCode.Api; +using OpenApiKiotaClientExample.GeneratedCode.NonJsonApi; using System.Collections.Generic; using System.IO; using System.Threading.Tasks; @@ -28,6 +29,12 @@ public partial class ExampleApiClient : BaseRequestBuilder get => new global::OpenApiKiotaClientExample.GeneratedCode.Api.ApiRequestBuilder(PathParameters, RequestAdapter); } + ///

The NonJsonApi property

+ public global::OpenApiKiotaClientExample.GeneratedCode.NonJsonApi.NonJsonApiRequestBuilder NonJsonApi + { + get => new global::OpenApiKiotaClientExample.GeneratedCode.NonJsonApi.NonJsonApiRequestBuilder(PathParameters, RequestAdapter); + } + ///

/// Instantiates a new and sets the default values. ///

diff --git a/src/Examples/OpenApiKiotaClientExample/GeneratedCode/NonJsonApi/NonJsonApiRequestBuilder.cs b/src/Examples/OpenApiKiotaClientExample/GeneratedCode/NonJsonApi/NonJsonApiRequestBuilder.cs new file mode 100644 index 000000000..8aa2eb0d3 --- /dev/null +++ b/src/Examples/OpenApiKiotaClientExample/GeneratedCode/NonJsonApi/NonJsonApiRequestBuilder.cs @@ -0,0 +1,206 @@ +// +#nullable enable +#pragma warning disable CS8625 +#pragma warning disable CS0618 +using Microsoft.Kiota.Abstractions.Extensions; +using Microsoft.Kiota.Abstractions.Serialization; +using Microsoft.Kiota.Abstractions; +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; +using System.Threading; +using System; +namespace OpenApiKiotaClientExample.GeneratedCode.NonJsonApi +{ + ///

+ /// Builds and executes requests for operations under \NonJsonApi + ///

+ [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")] + public partial class NonJsonApiRequestBuilder : BaseRequestBuilder + { + ///

+ /// Instantiates a new and sets the default values. + ///

+ /// Path parameters for the request + /// The request adapter to use to execute the requests. + public NonJsonApiRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/NonJsonApi{?name*}", pathParameters) + { + } + + ///

+ /// Instantiates a new and sets the default values. + ///

+ /// The raw URL to use for the request builder. + /// The request adapter to use to execute the requests. + public NonJsonApiRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/NonJsonApi{?name*}", rawUrl) + { + } + /// A + /// Cancellation token to use when cancelling requests + /// Configuration for the request such as headers, query parameters, and middleware options. + public async Task DeleteAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default) + { + var requestInfo = ToDeleteRequestInformation(requestConfiguration); + return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false); + } + + ///

+ /// Returns a single-element JSON array. + ///

+ /// A List<string> + /// Cancellation token to use when cancelling requests + /// Configuration for the request such as headers, query parameters, and middleware options. + public async Task?> GetAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default) + { + var requestInfo = ToGetRequestInformation(requestConfiguration); + var collectionResult = await RequestAdapter.SendPrimitiveCollectionAsync(requestInfo, default, cancellationToken).ConfigureAwait(false); + return collectionResult?.AsList(); + } + + ///

+ /// Returns a single-element JSON array. + ///

+ /// Wishes you a good day. + ///

+ /// Returns a greeting text, based on your name. + ///

+ /// A + /// The request body + /// Cancellation token to use when cancelling requests + /// Configuration for the request such as headers, query parameters, and middleware options. + public async Task PostAsync(string body, Action>? requestConfiguration = default, CancellationToken cancellationToken = default) + { + if(string.IsNullOrEmpty(body)) throw new ArgumentNullException(nameof(body)); + var requestInfo = ToPostRequestInformation(body, requestConfiguration); + return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false); + } + + ///

+ /// Returns another greeting text. + ///

+ /// A + /// Cancellation token to use when cancelling requests + /// Configuration for the request such as headers, query parameters, and middleware options. + public async Task PutAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default) + { + var requestInfo = ToPutRequestInformation(requestConfiguration); + return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false); + } + /// A + /// Configuration for the request such as headers, query parameters, and middleware options. + public RequestInformation ToDeleteRequestInformation(Action>? requestConfiguration = default) + { + var requestInfo = new RequestInformation(Method.DELETE, UrlTemplate, PathParameters); + requestInfo.Configure(requestConfiguration); + return requestInfo; + } + + ///

+ /// Returns a single-element JSON array. + ///

+ /// A + /// Configuration for the request such as headers, query parameters, and middleware options. + public RequestInformation ToGetRequestInformation(Action>? requestConfiguration = default) + { + var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters); + requestInfo.Configure(requestConfiguration); + requestInfo.Headers.TryAdd("Accept", "application/json"); + return requestInfo; + } + + ///

+ /// Returns a single-element JSON array. + ///

+ /// A + /// Configuration for the request such as headers, query parameters, and middleware options. + public RequestInformation ToHeadRequestInformation(Action>? requestConfiguration = default) + { + var requestInfo = new RequestInformation(Method.HEAD, UrlTemplate, PathParameters); + requestInfo.Configure(requestConfiguration); + return requestInfo; + } + + ///

+ /// Wishes you a good day. + ///

+ /// A + /// Configuration for the request such as headers, query parameters, and middleware options. + public RequestInformation ToPatchRequestInformation(Action>? requestConfiguration = default) + { + var requestInfo = new RequestInformation(Method.PATCH, UrlTemplate, PathParameters); + requestInfo.Configure(requestConfiguration); + requestInfo.Headers.TryAdd("Accept", "text/plain;q=0.9"); + return requestInfo; + } + + ///

+ /// Returns a greeting text, based on your name. + ///

+ /// A + /// The request body + /// Configuration for the request such as headers, query parameters, and middleware options. + public RequestInformation ToPostRequestInformation(string body, Action>? requestConfiguration = default) + { + if(string.IsNullOrEmpty(body)) throw new ArgumentNullException(nameof(body)); + var requestInfo = new RequestInformation(Method.POST, UrlTemplate, PathParameters); + requestInfo.Configure(requestConfiguration); + requestInfo.Headers.TryAdd("Accept", "text/plain;q=0.9"); + requestInfo.SetContentFromScalar(RequestAdapter, "application/json", body); + return requestInfo; + } + + ///

+ /// Returns another greeting text. + ///

+ /// A + /// Configuration for the request such as headers, query parameters, and middleware options. + public RequestInformation ToPutRequestInformation(Action>? requestConfiguration = default) + { + var requestInfo = new RequestInformation(Method.PUT, UrlTemplate, PathParameters); + requestInfo.Configure(requestConfiguration); + requestInfo.Headers.TryAdd("Accept", "text/plain;q=0.9"); + return requestInfo; + } + + ///

+ /// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored. + ///

+ /// A + /// The raw URL to use for the request builder. + public global::OpenApiKiotaClientExample.GeneratedCode.NonJsonApi.NonJsonApiRequestBuilder WithUrl(string rawUrl) + { + return new global::OpenApiKiotaClientExample.GeneratedCode.NonJsonApi.NonJsonApiRequestBuilder(rawUrl, RequestAdapter); + } + + ///

+ /// Returns another greeting text. + ///

+ [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")] + public partial class NonJsonApiRequestBuilderPutQueryParameters + { + [QueryParameter("name")] + public string? Name { get; set; } + } + } +} +#pragma warning restore CS0618 diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs index 1892aca57..6993d10cd 100644 --- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs +++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs @@ -1,7 +1,6 @@ using System.Reflection; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Controllers; -using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ModelBinding; namespace JsonApiDotNetCore.OpenApi.Swashbuckle; @@ -12,22 +11,32 @@ public static MethodInfo GetActionMethod(this ActionDescriptor descriptor) { ArgumentNullException.ThrowIfNull(descriptor); - return ((ControllerActionDescriptor)descriptor).MethodInfo; - } + if (descriptor is ControllerActionDescriptor controllerActionDescriptor) + { + return controllerActionDescriptor.MethodInfo; + } - public static TFilterMetaData? GetFilterMetadata(this ActionDescriptor descriptor) - where TFilterMetaData : IFilterMetadata - { - ArgumentNullException.ThrowIfNull(descriptor); + MethodInfo? methodInfo = descriptor.EndpointMetadata.OfType().FirstOrDefault(); + ConsistencyGuard.ThrowIf(methodInfo == null); - return descriptor.FilterDescriptors.Select(filterDescriptor => filterDescriptor.Filter).OfType().FirstOrDefault(); + return methodInfo; } public static ControllerParameterDescriptor? GetBodyParameterDescriptor(this ActionDescriptor descriptor) { ArgumentNullException.ThrowIfNull(descriptor); - return (ControllerParameterDescriptor?)descriptor.Parameters.FirstOrDefault(parameterDescriptor => + ParameterDescriptor? parameterDescriptor = descriptor.Parameters.FirstOrDefault(parameterDescriptor => parameterDescriptor.BindingInfo?.BindingSource == BindingSource.Body); + + if (parameterDescriptor != null) + { + var controllerParameterDescriptor = parameterDescriptor as ControllerParameterDescriptor; + ConsistencyGuard.ThrowIf(controllerParameterDescriptor == null); + + return controllerParameterDescriptor; + } + + return null; } } diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs index e1e04a246..73e612fa2 100644 --- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs +++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs @@ -1,7 +1,6 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; namespace JsonApiDotNetCore.OpenApi.Swashbuckle; @@ -9,20 +8,17 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle; internal sealed class ConfigureMvcOptions : IConfigureOptions { private readonly IJsonApiRoutingConvention _jsonApiRoutingConvention; - private readonly OpenApiEndpointConvention _openApiEndpointConvention; private readonly JsonApiRequestFormatMetadataProvider _jsonApiRequestFormatMetadataProvider; private readonly IJsonApiOptions _jsonApiOptions; - public ConfigureMvcOptions(IJsonApiRoutingConvention jsonApiRoutingConvention, OpenApiEndpointConvention openApiEndpointConvention, - JsonApiRequestFormatMetadataProvider jsonApiRequestFormatMetadataProvider, IJsonApiOptions jsonApiOptions) + public ConfigureMvcOptions(IJsonApiRoutingConvention jsonApiRoutingConvention, JsonApiRequestFormatMetadataProvider jsonApiRequestFormatMetadataProvider, + IJsonApiOptions jsonApiOptions) { ArgumentNullException.ThrowIfNull(jsonApiRoutingConvention); - ArgumentNullException.ThrowIfNull(openApiEndpointConvention); ArgumentNullException.ThrowIfNull(jsonApiRequestFormatMetadataProvider); ArgumentNullException.ThrowIfNull(jsonApiOptions); _jsonApiRoutingConvention = jsonApiRoutingConvention; - _openApiEndpointConvention = openApiEndpointConvention; _jsonApiRequestFormatMetadataProvider = jsonApiRequestFormatMetadataProvider; _jsonApiOptions = jsonApiOptions; } @@ -34,7 +30,6 @@ public void Configure(MvcOptions options) AddSwashbuckleCliCompatibility(options); options.InputFormatters.Add(_jsonApiRequestFormatMetadataProvider); - options.Conventions.Add(_openApiEndpointConvention); ((JsonApiOptions)_jsonApiOptions).IncludeExtensions(OpenApiMediaTypeExtension.OpenApi, OpenApiMediaTypeExtension.RelaxedOpenApi); } diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs index f3fb5198c..efef31c7e 100644 --- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs +++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs @@ -1,6 +1,6 @@ -using System.Reflection; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; +using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods; using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations; using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.ResourceObjects; using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents; @@ -33,6 +33,8 @@ internal sealed class ConfigureSwaggerGenOptions : IConfigureOptions) ]; + private static readonly Func> DefaultTagsSelector = new SwaggerGeneratorOptions().TagsSelector; + private readonly OpenApiOperationIdSelector _operationIdSelector; private readonly JsonApiSchemaIdSelector _schemaIdSelector; private readonly IControllerResourceMapping _controllerResourceMapping; @@ -142,11 +144,27 @@ private static void IncludeDerivedTypes(ResourceType baseType, List clrTyp } } - private static List GetOpenApiOperationTags(ApiDescription description, IControllerResourceMapping controllerResourceMapping) + private static IList GetOpenApiOperationTags(ApiDescription description, IControllerResourceMapping controllerResourceMapping) { - MethodInfo actionMethod = description.ActionDescriptor.GetActionMethod(); - ResourceType? resourceType = controllerResourceMapping.GetResourceTypeForController(actionMethod.ReflectedType); + var actionMethod = OpenApiActionMethod.Create(description.ActionDescriptor); + + switch (actionMethod) + { + case AtomicOperationsActionMethod: + { + return ["operations"]; + } + case JsonApiActionMethod jsonApiActionMethod: + { + ResourceType? resourceType = controllerResourceMapping.GetResourceTypeForController(jsonApiActionMethod.ControllerType); + ConsistencyGuard.ThrowIf(resourceType == null); - return resourceType == null ? ["operations"] : [resourceType.PublicName]; + return [resourceType.PublicName]; + } + default: + { + return DefaultTagsSelector(description); + } + } } } diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs index 6d63a540c..72d0dcfab 100644 --- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs +++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs @@ -1,194 +1,325 @@ +using System.Net; using System.Reflection; +using JsonApiDotNetCore.Configuration; +using JsonApiDotNetCore.Controllers; using JsonApiDotNetCore.Errors; using JsonApiDotNetCore.Middleware; using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata; +using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods; +using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents; using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents; +using JsonApiDotNetCore.Resources.Annotations; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Routing; -using Microsoft.Net.Http.Headers; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.Logging; namespace JsonApiDotNetCore.OpenApi.Swashbuckle; ///

-/// Adds JsonApiDotNetCore metadata to s if available. This translates to updating response types in -/// and performing an expansion for secondary and relationship endpoints. For example: -///

s and performs endpoint expansion for secondary and relationship
+/// endpoints. For example:  /article/{id}/author, /article/{id}/revisions, etc.
 /// ]]>
 ///


-internal sealed class JsonApiActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
+internal sealed partial class JsonApiActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
 {
-    private static readonly string DefaultMediaType = JsonApiMediaType.Default.ToString();
+    private const int FilterScope = 10;
+    private static readonly Type ErrorDocumentType = typeof(ErrorResponseDocument);
 
     private readonly IActionDescriptorCollectionProvider _defaultProvider;
+    private readonly IControllerResourceMapping _controllerResourceMapping;
     private readonly JsonApiEndpointMetadataProvider _jsonApiEndpointMetadataProvider;
+    private readonly IJsonApiOptions _options;
+    private readonly ILogger _logger;
 
     public ActionDescriptorCollection ActionDescriptors => GetActionDescriptors();
 
-    public JsonApiActionDescriptorCollectionProvider(IActionDescriptorCollectionProvider defaultProvider,
-        JsonApiEndpointMetadataProvider jsonApiEndpointMetadataProvider)
+    public JsonApiActionDescriptorCollectionProvider(IActionDescriptorCollectionProvider defaultProvider, IControllerResourceMapping controllerResourceMapping,
+        JsonApiEndpointMetadataProvider jsonApiEndpointMetadataProvider, IJsonApiOptions options, ILogger logger)
     {
         ArgumentNullException.ThrowIfNull(defaultProvider);
+        ArgumentNullException.ThrowIfNull(controllerResourceMapping);
         ArgumentNullException.ThrowIfNull(jsonApiEndpointMetadataProvider);
+        ArgumentNullException.ThrowIfNull(options);
+        ArgumentNullException.ThrowIfNull(logger);
 
         _defaultProvider = defaultProvider;
+        _controllerResourceMapping = controllerResourceMapping;
         _jsonApiEndpointMetadataProvider = jsonApiEndpointMetadataProvider;
+        _options = options;
+        _logger = logger;
     }
 
     private ActionDescriptorCollection GetActionDescriptors()
     {
-        List newDescriptors = _defaultProvider.ActionDescriptors.Items.ToList();
-        ActionDescriptor[] endpoints = newDescriptors.Where(IsVisibleJsonApiEndpoint).ToArray();
+        List descriptors = [];
 
-        foreach (ActionDescriptor endpoint in endpoints)
+        foreach (ActionDescriptor descriptor in _defaultProvider.ActionDescriptors.Items)
         {
-            MethodInfo actionMethod = endpoint.GetActionMethod();
-            JsonApiEndpointMetadataContainer endpointMetadataContainer = _jsonApiEndpointMetadataProvider.Get(actionMethod);
+            if (!descriptor.EndpointMetadata.OfType().SelectMany(metadata => metadata.HttpMethods).Any())
+            {
+                // Technically incorrect: when no verbs, the endpoint is exposed on all verbs. But Swashbuckle hides it anyway.
+                continue;
+            }
 
-            List replacementDescriptorsForEndpoint =
-            [
-                .. AddJsonApiMetadataToAction(endpoint, endpointMetadataContainer.RequestMetadata),
-                .. AddJsonApiMetadataToAction(endpoint, endpointMetadataContainer.ResponseMetadata)
-            ];
+            var actionMethod = OpenApiActionMethod.Create(descriptor);
+
+            if (actionMethod is CustomJsonApiActionMethod)
+            {
+                // A non-standard action method in a JSON:API controller. Not yet implemented, so skip to prevent downstream crashes.
+                string httpMethods = string.Join(", ", descriptor.EndpointMetadata.OfType().SelectMany(metadata => metadata.HttpMethods));
+                LogSuppressedActionMethod(httpMethods, descriptor.DisplayName);
+
+                continue;
+            }
 
-            if (replacementDescriptorsForEndpoint.Count > 0)
+            if (actionMethod is BuiltinJsonApiActionMethod builtinActionMethod)
             {
-                newDescriptors.InsertRange(newDescriptors.IndexOf(endpoint), replacementDescriptorsForEndpoint);
-                newDescriptors.Remove(endpoint);
+                if (!IsVisibleEndpoint(descriptor))
+                {
+                    continue;
+                }
+
+                ResourceType? resourceType = _controllerResourceMapping.GetResourceTypeForController(builtinActionMethod.ControllerType);
+
+                if (builtinActionMethod is JsonApiActionMethod jsonApiActionMethod)
+                {
+                    ConsistencyGuard.ThrowIf(resourceType == null);
+
+                    if (ShouldSuppressEndpoint(jsonApiActionMethod.Endpoint, resourceType))
+                    {
+                        continue;
+                    }
+                }
+
+                ActionDescriptor[] replacementDescriptors = SetEndpointMetadata(descriptor, builtinActionMethod, resourceType);
+                descriptors.AddRange(replacementDescriptors);
+
+                continue;
             }
+
+            descriptors.Add(descriptor);
         }
 
         int descriptorVersion = _defaultProvider.ActionDescriptors.Version;
-        return new ActionDescriptorCollection(newDescriptors.AsReadOnly(), descriptorVersion);
+        return new ActionDescriptorCollection(descriptors.AsReadOnly(), descriptorVersion);
     }
 
-    internal static bool IsVisibleJsonApiEndpoint(ActionDescriptor descriptor)
+    internal static bool IsVisibleEndpoint(ActionDescriptor descriptor)
     {
         // Only if in a convention ApiExplorer.IsVisible was set to false, the ApiDescriptionActionData will not be present.
-        return descriptor is ControllerActionDescriptor controllerAction && controllerAction.Properties.ContainsKey(typeof(ApiDescriptionActionData));
+        return descriptor is ControllerActionDescriptor controllerDescriptor && controllerDescriptor.Properties.ContainsKey(typeof(ApiDescriptionActionData));
     }
 
-    private static List AddJsonApiMetadataToAction(ActionDescriptor endpoint, IJsonApiEndpointMetadata? jsonApiEndpointMetadata)
+    private static bool ShouldSuppressEndpoint(JsonApiEndpoints endpoint, ResourceType resourceType)
     {
-        switch (jsonApiEndpointMetadata)
+        if (!IsEndpointAvailable(endpoint, resourceType))
         {
-            case PrimaryResponseMetadata primaryMetadata:
-            {
-                UpdateProducesResponseTypeAttribute(endpoint, primaryMetadata.DocumentType);
-                return [];
-            }
-            case PrimaryRequestMetadata primaryMetadata:
-            {
-                UpdateBodyParameterDescriptor(endpoint, primaryMetadata.DocumentType, null);
-                return [];
-            }
-            case NonPrimaryEndpointMetadata nonPrimaryEndpointMetadata and (RelationshipResponseMetadata or SecondaryResponseMetadata):
-            {
-                return Expand(endpoint, nonPrimaryEndpointMetadata,
-                    (expandedEndpoint, documentType, _) => UpdateProducesResponseTypeAttribute(expandedEndpoint, documentType));
-            }
-            case NonPrimaryEndpointMetadata nonPrimaryEndpointMetadata and RelationshipRequestMetadata:
-            {
-                return Expand(endpoint, nonPrimaryEndpointMetadata, UpdateBodyParameterDescriptor);
-            }
-            case AtomicOperationsRequestMetadata:
-            {
-                UpdateBodyParameterDescriptor(endpoint, typeof(OperationsRequestDocument), null);
-                return [];
-            }
-            case AtomicOperationsResponseMetadata:
+            return true;
+        }
+
+        if (IsSecondaryOrRelationshipEndpoint(endpoint))
+        {
+            if (resourceType.Relationships.Count == 0)
             {
-                UpdateProducesResponseTypeAttribute(endpoint, typeof(OperationsResponseDocument));
-                return [];
+                return true;
             }
-            default:
+
+            if (endpoint is JsonApiEndpoints.DeleteRelationship or JsonApiEndpoints.PostRelationship)
             {
-                return [];
+                return !resourceType.Relationships.OfType().Any();
             }
         }
+
+        return false;
     }
 
-    private static void UpdateProducesResponseTypeAttribute(ActionDescriptor endpoint, Type responseDocumentType)
+    private static bool IsEndpointAvailable(JsonApiEndpoints endpoint, ResourceType resourceType)
     {
-        ProducesResponseTypeAttribute? attribute = null;
+        JsonApiEndpoints availableEndpoints = GetGeneratedControllerEndpoints(resourceType);
 
-        if (ProducesJsonApiResponseDocument(endpoint))
+        if (availableEndpoints == JsonApiEndpoints.None)
         {
-            var producesResponse = endpoint.GetFilterMetadata();
-
-            if (producesResponse != null)
-            {
-                attribute = producesResponse;
-            }
+            // Auto-generated controllers are disabled, so we can't know what to hide.
+            // It is assumed that a handwritten JSON:API controller only provides action methods for what it supports.
+            // To accomplish that, derive from BaseJsonApiController instead of JsonApiController.
+            return true;
         }
 
-        ConsistencyGuard.ThrowIf(attribute == null);
-        attribute.Type = responseDocumentType;
+        // For an overridden JSON:API action method in a partial class to show up, it's flag must be turned on in [Resource].
+        // Otherwise, it is considered to be an action method that throws because the endpoint is unavailable.
+        return IncludesEndpoint(endpoint, availableEndpoints);
     }
 
-    private static bool ProducesJsonApiResponseDocument(ActionDescriptor endpoint)
+    private static JsonApiEndpoints GetGeneratedControllerEndpoints(ResourceType resourceType)
     {
-        var produces = endpoint.GetFilterMetadata();
+        var resourceAttribute = resourceType.ClrType.GetCustomAttribute();
+        return resourceAttribute?.GenerateControllerEndpoints ?? JsonApiEndpoints.None;
+    }
+
+    private static bool IncludesEndpoint(JsonApiEndpoints endpoint, JsonApiEndpoints availableEndpoints)
+    {
+        bool? isIncluded = null;
 
-        if (produces != null)
+        if (endpoint == JsonApiEndpoints.GetCollection)
         {
-            foreach (string contentType in produces.ContentTypes)
-            {
-                if (MediaTypeHeaderValue.TryParse(contentType, out MediaTypeHeaderValue? headerValue))
-                {
-                    if (headerValue.MediaType.Equals(DefaultMediaType, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return true;
-                    }
-                }
-            }
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.GetCollection);
+        }
+        else if (endpoint == JsonApiEndpoints.GetSingle)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.GetSingle);
+        }
+        else if (endpoint == JsonApiEndpoints.GetSecondary)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.GetSecondary);
+        }
+        else if (endpoint == JsonApiEndpoints.GetRelationship)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.GetRelationship);
+        }
+        else if (endpoint == JsonApiEndpoints.Post)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.Post);
+        }
+        else if (endpoint == JsonApiEndpoints.PostRelationship)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.PostRelationship);
+        }
+        else if (endpoint == JsonApiEndpoints.Patch)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.Patch);
+        }
+        else if (endpoint == JsonApiEndpoints.PatchRelationship)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.PatchRelationship);
+        }
+        else if (endpoint == JsonApiEndpoints.Delete)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.Delete);
+        }
+        else if (endpoint == JsonApiEndpoints.DeleteRelationship)
+        {
+            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.DeleteRelationship);
         }
 
-        return false;
+        ConsistencyGuard.ThrowIf(isIncluded == null);
+        return isIncluded.Value;
     }
 
-    private static List Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,
-        Action expansionCallback)
+    private static bool IsSecondaryOrRelationshipEndpoint(JsonApiEndpoints endpoint)
     {
-        List expansion = [];
+        return endpoint is JsonApiEndpoints.GetSecondary or JsonApiEndpoints.GetRelationship or JsonApiEndpoints.PostRelationship or
+            JsonApiEndpoints.PatchRelationship or JsonApiEndpoints.DeleteRelationship;
+    }
 
-        foreach ((string relationshipName, Type documentType) in metadata.DocumentTypesByRelationshipName)
+    private ActionDescriptor[] SetEndpointMetadata(ActionDescriptor descriptor, BuiltinJsonApiActionMethod actionMethod, ResourceType? resourceType)
+    {
+        Dictionary descriptorsByRelationship = [];
+
+        JsonApiEndpointMetadata? endpointMetadata = _jsonApiEndpointMetadataProvider.Get(descriptor);
+
+        switch (endpointMetadata?.RequestMetadata)
         {
-            if (genericEndpoint.AttributeRouteInfo == null)
+            case AtomicOperationsRequestMetadata atomicOperationsRequestMetadata:
             {
-                throw new NotSupportedException("Only attribute routing is supported for JsonApiDotNetCore endpoints.");
+                SetConsumes(descriptor, atomicOperationsRequestMetadata.DocumentType, JsonApiMediaType.AtomicOperations);
+                UpdateRequestBodyParameterDescriptor(descriptor, atomicOperationsRequestMetadata.DocumentType, null);
+
+                break;
             }
+            case PrimaryRequestMetadata primaryRequestMetadata:
+            {
+                SetConsumes(descriptor, primaryRequestMetadata.DocumentType, JsonApiMediaType.Default);
+                UpdateRequestBodyParameterDescriptor(descriptor, primaryRequestMetadata.DocumentType, null);
+
+                break;
+            }
+            case RelationshipRequestMetadata relationshipRequestMetadata:
+            {
+                ConsistencyGuard.ThrowIf(descriptor.AttributeRouteInfo == null);
+
+                foreach ((RelationshipAttribute relationship, Type documentType) in relationshipRequestMetadata.DocumentTypesByRelationship)
+                {
+                    ActionDescriptor relationshipDescriptor = Clone(descriptor);
 
-            ActionDescriptor expandedEndpoint = Clone(genericEndpoint);
+                    RemovePathParameter(relationshipDescriptor.Parameters, "relationshipName");
+                    ExpandTemplate(relationshipDescriptor.AttributeRouteInfo!, relationship.PublicName);
+                    SetConsumes(descriptor, documentType, JsonApiMediaType.Default);
+                    UpdateRequestBodyParameterDescriptor(relationshipDescriptor, documentType, relationship.PublicName);
 
-            RemovePathParameter(expandedEndpoint.Parameters, "relationshipName");
+                    descriptorsByRelationship[relationship] = relationshipDescriptor;
+                }
+
+                break;
+            }
+        }
+
+        switch (endpointMetadata?.ResponseMetadata)
+        {
+            case AtomicOperationsResponseMetadata atomicOperationsResponseMetadata:
+            {
+                SetProduces(descriptor, atomicOperationsResponseMetadata.DocumentType);
+                SetProducesResponseTypes(descriptor, actionMethod, resourceType, atomicOperationsResponseMetadata.DocumentType);
 
-            ExpandTemplate(expandedEndpoint.AttributeRouteInfo!, relationshipName);
+                break;
+            }
+            case PrimaryResponseMetadata primaryResponseMetadata:
+            {
+                SetProduces(descriptor, primaryResponseMetadata.DocumentType);
+                SetProducesResponseTypes(descriptor, actionMethod, resourceType, primaryResponseMetadata.DocumentType);
+                break;
+            }
+            case NonPrimaryResponseMetadata nonPrimaryResponseMetadata:
+            {
+                foreach ((RelationshipAttribute relationship, Type documentType) in nonPrimaryResponseMetadata.DocumentTypesByRelationship)
+                {
+                    SetNonPrimaryResponseMetadata(descriptor, actionMethod, resourceType, descriptorsByRelationship, relationship, documentType);
+                }
 
-            expansionCallback(expandedEndpoint, documentType, relationshipName);
+                break;
+            }
+            case EmptyRelationshipResponseMetadata emptyRelationshipResponseMetadata:
+            {
+                foreach (RelationshipAttribute relationship in emptyRelationshipResponseMetadata.Relationships)
+                {
+                    SetNonPrimaryResponseMetadata(descriptor, actionMethod, resourceType, descriptorsByRelationship, relationship, null);
+                }
 
-            expansion.Add(expandedEndpoint);
+                break;
+            }
         }
 
-        return expansion;
+        return descriptorsByRelationship.Count == 0 ? [descriptor] : descriptorsByRelationship.Values.ToArray();
     }
 
-    private static void UpdateBodyParameterDescriptor(ActionDescriptor endpoint, Type documentType, string? parameterName)
+    private static void SetConsumes(ActionDescriptor descriptor, Type requestType, JsonApiMediaType mediaType)
     {
-        ControllerParameterDescriptor? requestBodyDescriptor = endpoint.GetBodyParameterDescriptor();
+        // This value doesn't actually appear in the OpenAPI document, but is only used to invoke
+        // JsonApiRequestFormatMetadataProvider.GetSupportedContentTypes(), which determines the actual request content type.
+        string contentType = mediaType.ToString();
+
+        descriptor.FilterDescriptors.Add(new FilterDescriptor(new ConsumesAttribute(requestType, contentType), FilterScope));
+    }
+
+    private static void UpdateRequestBodyParameterDescriptor(ActionDescriptor descriptor, Type documentType, string? parameterName)
+    {
+        ControllerParameterDescriptor? requestBodyDescriptor = descriptor.GetBodyParameterDescriptor();
 
         if (requestBodyDescriptor == null)
         {
-            MethodInfo actionMethod = endpoint.GetActionMethod();
+            MethodInfo actionMethod = descriptor.GetActionMethod();
 
             throw new InvalidConfigurationException(
                 $"The action method '{actionMethod}' on type '{actionMethod.ReflectedType?.FullName}' contains no parameter with a [FromBody] attribute.");
         }
 
+        descriptor.EndpointMetadata.Add(new ConsumesAttribute(JsonApiMediaType.Default.ToString()));
+
         requestBodyDescriptor.ParameterType = documentType;
         requestBodyDescriptor.ParameterInfo = new ParameterInfoWrapper(requestBodyDescriptor.ParameterInfo, documentType, parameterName);
     }
@@ -218,8 +349,172 @@ private static void RemovePathParameter(ICollection paramet
         parameters.Remove(descriptor);
     }
 
-    private static void ExpandTemplate(AttributeRouteInfo route, string expansionParameter)
+    private static void ExpandTemplate(AttributeRouteInfo route, string parameterName)
+    {
+        route.Template = route.Template!.Replace("{relationshipName}", parameterName);
+    }
+
+    private void SetProduces(ActionDescriptor descriptor, Type? documentType)
+    {
+        IReadOnlyList contentTypes = OpenApiContentTypeProvider.Instance.GetResponseContentTypes(documentType);
+
+        if (contentTypes.Count > 0)
+        {
+            descriptor.FilterDescriptors.Add(new FilterDescriptor(new ProducesAttribute(contentTypes[0]), FilterScope));
+        }
+    }
+
+    private void SetProducesResponseTypes(ActionDescriptor descriptor, BuiltinJsonApiActionMethod actionMethod, ResourceType? resourceType, Type? documentType)
+    {
+        foreach (HttpStatusCode statusCode in GetSuccessStatusCodesForActionMethod(actionMethod))
+        {
+            descriptor.FilterDescriptors.Add(documentType == null || StatusCodeHasNoResponseBody(statusCode)
+                ? new FilterDescriptor(new ProducesResponseTypeAttribute(typeof(void), (int)statusCode), FilterScope)
+                : new FilterDescriptor(new ProducesResponseTypeAttribute(documentType, (int)statusCode), FilterScope));
+        }
+
+        string? errorContentType = null;
+
+        if (documentType == null)
+        {
+            IReadOnlyList errorContentTypes = OpenApiContentTypeProvider.Instance.GetResponseContentTypes(ErrorDocumentType);
+            ConsistencyGuard.ThrowIf(errorContentTypes.Count == 0);
+            errorContentType = errorContentTypes[0];
+        }
+
+        foreach (HttpStatusCode statusCode in GetErrorStatusCodesForActionMethod(actionMethod, resourceType))
+        {
+            descriptor.FilterDescriptors.Add(errorContentType != null
+                ? new FilterDescriptor(new ProducesResponseTypeAttribute(ErrorDocumentType, (int)statusCode, errorContentType), FilterScope)
+                : new FilterDescriptor(new ProducesResponseTypeAttribute(ErrorDocumentType, (int)statusCode), FilterScope));
+        }
+    }
+
+    private static HttpStatusCode[] GetSuccessStatusCodesForActionMethod(BuiltinJsonApiActionMethod actionMethod)
+    {
+        HttpStatusCode[]? statusCodes = null;
+
+        if (actionMethod is AtomicOperationsActionMethod)
+        {
+            statusCodes =
+            [
+                HttpStatusCode.OK,
+                HttpStatusCode.NoContent
+            ];
+        }
+        else if (actionMethod is JsonApiActionMethod jsonApiActionMethod)
+        {
+            statusCodes = jsonApiActionMethod.Endpoint switch
+            {
+                JsonApiEndpoints.GetCollection or JsonApiEndpoints.GetSingle or JsonApiEndpoints.GetSecondary or JsonApiEndpoints.GetRelationship =>
+                [
+                    HttpStatusCode.OK,
+                    HttpStatusCode.NotModified
+                ],
+                JsonApiEndpoints.Post =>
+                [
+                    HttpStatusCode.Created,
+                    HttpStatusCode.NoContent
+                ],
+                JsonApiEndpoints.Patch =>
+                [
+                    HttpStatusCode.OK,
+                    HttpStatusCode.NoContent
+                ],
+                JsonApiEndpoints.Delete or JsonApiEndpoints.PostRelationship or JsonApiEndpoints.PatchRelationship or JsonApiEndpoints.DeleteRelationship =>
+                [
+                    HttpStatusCode.NoContent
+                ],
+                _ => null
+            };
+        }
+
+        ConsistencyGuard.ThrowIf(statusCodes == null);
+        return statusCodes;
+    }
+
+    private static bool StatusCodeHasNoResponseBody(HttpStatusCode statusCode)
     {
-        route.Template = route.Template!.Replace("{relationshipName}", expansionParameter);
+        return statusCode is HttpStatusCode.NoContent or HttpStatusCode.NotModified;
     }
+
+    private HttpStatusCode[] GetErrorStatusCodesForActionMethod(BuiltinJsonApiActionMethod actionMethod, ResourceType? resourceType)
+    {
+        HttpStatusCode[]? statusCodes = null;
+
+        if (actionMethod is AtomicOperationsActionMethod)
+        {
+            statusCodes =
+            [
+                HttpStatusCode.BadRequest,
+                HttpStatusCode.Forbidden,
+                HttpStatusCode.NotFound,
+                HttpStatusCode.Conflict,
+                HttpStatusCode.UnprocessableEntity
+            ];
+        }
+        else if (actionMethod is JsonApiActionMethod jsonApiActionMethod)
+        {
+            // Condition doesn't apply to atomic operations, because Forbidden is also used when an operation is not accessible.
+            ClientIdGenerationMode clientIdGeneration = resourceType?.ClientIdGeneration ?? _options.ClientIdGeneration;
+
+            statusCodes = jsonApiActionMethod.Endpoint switch
+            {
+                JsonApiEndpoints.GetCollection => [HttpStatusCode.BadRequest],
+                JsonApiEndpoints.GetSingle or JsonApiEndpoints.GetSecondary or JsonApiEndpoints.GetRelationship =>
+                [
+                    HttpStatusCode.BadRequest,
+                    HttpStatusCode.NotFound
+                ],
+                JsonApiEndpoints.Post when clientIdGeneration == ClientIdGenerationMode.Forbidden =>
+                [
+                    HttpStatusCode.BadRequest,
+                    HttpStatusCode.Forbidden,
+                    HttpStatusCode.NotFound,
+                    HttpStatusCode.Conflict,
+                    HttpStatusCode.UnprocessableEntity
+                ],
+                JsonApiEndpoints.Post or JsonApiEndpoints.Patch =>
+                [
+                    HttpStatusCode.BadRequest,
+                    HttpStatusCode.NotFound,
+                    HttpStatusCode.Conflict,
+                    HttpStatusCode.UnprocessableEntity
+                ],
+                JsonApiEndpoints.Delete => [HttpStatusCode.NotFound],
+                JsonApiEndpoints.PostRelationship or JsonApiEndpoints.PatchRelationship or JsonApiEndpoints.DeleteRelationship =>
+                [
+                    HttpStatusCode.BadRequest,
+                    HttpStatusCode.NotFound,
+                    HttpStatusCode.Conflict,
+                    HttpStatusCode.UnprocessableEntity
+                ],
+                _ => null
+            };
+        }
+
+        ConsistencyGuard.ThrowIf(statusCodes == null);
+        return statusCodes;
+    }
+
+    private void SetNonPrimaryResponseMetadata(ActionDescriptor descriptor, BuiltinJsonApiActionMethod actionMethod, ResourceType? resourceType,
+        Dictionary descriptorsByRelationship, RelationshipAttribute relationship, Type? documentType)
+    {
+        ConsistencyGuard.ThrowIf(descriptor.AttributeRouteInfo == null);
+
+        if (!descriptorsByRelationship.TryGetValue(relationship, out ActionDescriptor? relationshipDescriptor))
+        {
+            relationshipDescriptor = Clone(descriptor);
+            RemovePathParameter(relationshipDescriptor.Parameters, "relationshipName");
+        }
+
+        ExpandTemplate(relationshipDescriptor.AttributeRouteInfo!, relationship.PublicName);
+        SetProduces(relationshipDescriptor, documentType);
+        SetProducesResponseTypes(relationshipDescriptor, actionMethod, resourceType, documentType);
+
+        descriptorsByRelationship[relationship] = relationshipDescriptor;
+    }
+
+    [LoggerMessage(Level = LogLevel.Warning, Message = "Hiding unsupported custom JSON:API action method [{HttpMethods}] {ActionMethod} in OpenAPI.")]
+    private partial void LogSuppressedActionMethod(string httpMethods, string? actionMethod);
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/AtomicOperationsActionMethod.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/AtomicOperationsActionMethod.cs
new file mode 100644
index 000000000..d80a86cd0
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/AtomicOperationsActionMethod.cs
@@ -0,0 +1,9 @@
+using JsonApiDotNetCore.Controllers;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
+
+/// 
+/// The built-in JSON:API operations action method .
+/// 
+internal sealed class AtomicOperationsActionMethod(Type controllerType)
+    : BuiltinJsonApiActionMethod(controllerType);
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/BuiltinJsonApiActionMethod.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/BuiltinJsonApiActionMethod.cs
new file mode 100644
index 000000000..a6374801b
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/BuiltinJsonApiActionMethod.cs
@@ -0,0 +1,18 @@
+using JsonApiDotNetCore.Controllers;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
+
+/// 
+/// A built-in JSON:API action method on .
+/// 
+internal abstract class BuiltinJsonApiActionMethod : OpenApiActionMethod
+{
+    public Type ControllerType { get; }
+
+    protected BuiltinJsonApiActionMethod(Type controllerType)
+    {
+        ArgumentNullException.ThrowIfNull(controllerType);
+
+        ControllerType = controllerType;
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/CustomControllerActionMethod.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/CustomControllerActionMethod.cs
new file mode 100644
index 000000000..c5b89f27f
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/CustomControllerActionMethod.cs
@@ -0,0 +1,13 @@
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
+
+/// 
+/// An action method in a custom controller, unrelated to JSON:API.
+/// 
+internal sealed class CustomControllerActionMethod : OpenApiActionMethod
+{
+    public static CustomControllerActionMethod Instance { get; } = new();
+
+    private CustomControllerActionMethod()
+    {
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/CustomJsonApiActionMethod.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/CustomJsonApiActionMethod.cs
new file mode 100644
index 000000000..194d623d9
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/CustomJsonApiActionMethod.cs
@@ -0,0 +1,15 @@
+using JsonApiDotNetCore.Controllers;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
+
+/// 
+/// A custom action method on .
+/// 
+internal sealed class CustomJsonApiActionMethod : OpenApiActionMethod
+{
+    public static CustomJsonApiActionMethod Instance { get; } = new();
+
+    private CustomJsonApiActionMethod()
+    {
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/JsonApiActionMethod.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/JsonApiActionMethod.cs
new file mode 100644
index 000000000..3cbfeff77
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/JsonApiActionMethod.cs
@@ -0,0 +1,17 @@
+using JsonApiDotNetCore.Controllers;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
+
+/// 
+/// One of the built-in JSON:API action methods on .
+/// 
+internal sealed class JsonApiActionMethod(JsonApiEndpoints endpoint, Type controllerType)
+    : BuiltinJsonApiActionMethod(controllerType)
+{
+    public JsonApiEndpoints Endpoint { get; } = endpoint;
+
+    public override string ToString()
+    {
+        return Endpoint.ToString();
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/OpenApiActionMethod.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/OpenApiActionMethod.cs
new file mode 100644
index 000000000..f8519f414
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/ActionMethods/OpenApiActionMethod.cs
@@ -0,0 +1,58 @@
+using System.Reflection;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Middleware;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
+
+internal abstract class OpenApiActionMethod
+{
+    public static OpenApiActionMethod Create(ActionDescriptor descriptor)
+    {
+        ArgumentNullException.ThrowIfNull(descriptor);
+
+        MethodInfo actionMethod = descriptor.GetActionMethod();
+
+        if (IsJsonApiController(actionMethod))
+        {
+            Type? controllerType = actionMethod.ReflectedType;
+            ConsistencyGuard.ThrowIf(controllerType == null);
+
+            if (IsAtomicOperationsController(actionMethod))
+            {
+                var httpPostAttribute = actionMethod.GetCustomAttribute(true);
+
+                if (httpPostAttribute != null)
+                {
+                    return new AtomicOperationsActionMethod(controllerType);
+                }
+            }
+            else
+            {
+                IEnumerable httpMethodAttributes = actionMethod.GetCustomAttributes(true);
+                JsonApiEndpoints endpoint = httpMethodAttributes.GetJsonApiEndpoint();
+
+                if (endpoint != JsonApiEndpoints.None)
+                {
+                    return new JsonApiActionMethod(endpoint, controllerType);
+                }
+            }
+
+            return CustomJsonApiActionMethod.Instance;
+        }
+
+        return CustomControllerActionMethod.Instance;
+    }
+
+    private static bool IsJsonApiController(MethodInfo controllerAction)
+    {
+        return typeof(CoreJsonApiController).IsAssignableFrom(controllerAction.ReflectedType);
+    }
+
+    private static bool IsAtomicOperationsController(MethodInfo controllerAction)
+    {
+        return typeof(BaseJsonApiOperationsController).IsAssignableFrom(controllerAction.ReflectedType);
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/AtomicOperationsRequestMetadata.cs
similarity index 51%
rename from src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsRequestMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/AtomicOperationsRequestMetadata.cs
index b9b0f4446..9fcfa9098 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/AtomicOperationsRequestMetadata.cs
@@ -1,9 +1,13 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
 
 internal sealed class AtomicOperationsRequestMetadata : IJsonApiRequestMetadata
 {
     public static AtomicOperationsRequestMetadata Instance { get; } = new();
 
+    public Type DocumentType => typeof(OperationsRequestDocument);
+
     private AtomicOperationsRequestMetadata()
     {
     }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/AtomicOperationsResponseMetadata.cs
similarity index 51%
rename from src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsResponseMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/AtomicOperationsResponseMetadata.cs
index 838055c37..f259b76fb 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/AtomicOperationsResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/AtomicOperationsResponseMetadata.cs
@@ -1,9 +1,13 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
 
 internal sealed class AtomicOperationsResponseMetadata : IJsonApiResponseMetadata
 {
     public static AtomicOperationsResponseMetadata Instance { get; } = new();
 
+    public Type DocumentType => typeof(OperationsResponseDocument);
+
     private AtomicOperationsResponseMetadata()
     {
     }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/EmptyRelationshipResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/EmptyRelationshipResponseMetadata.cs
new file mode 100644
index 000000000..3cc784f9c
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/EmptyRelationshipResponseMetadata.cs
@@ -0,0 +1,15 @@
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal sealed class EmptyRelationshipResponseMetadata : IJsonApiResponseMetadata
+{
+    public IReadOnlyCollection Relationships { get; }
+
+    public EmptyRelationshipResponseMetadata(IReadOnlyCollection relationships)
+    {
+        ArgumentNullException.ThrowIfNull(relationships);
+
+        Relationships = relationships;
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/IJsonApiRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/IJsonApiRequestMetadata.cs
new file mode 100644
index 000000000..78206521f
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/IJsonApiRequestMetadata.cs
@@ -0,0 +1,3 @@
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal interface IJsonApiRequestMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/IJsonApiResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/IJsonApiResponseMetadata.cs
new file mode 100644
index 000000000..205e8cb4d
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/IJsonApiResponseMetadata.cs
@@ -0,0 +1,3 @@
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal interface IJsonApiResponseMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/JsonApiEndpointMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/JsonApiEndpointMetadata.cs
new file mode 100644
index 000000000..4a57c6a68
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/JsonApiEndpointMetadata.cs
@@ -0,0 +1,7 @@
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal sealed class JsonApiEndpointMetadata(IJsonApiRequestMetadata? requestMetadata, IJsonApiResponseMetadata? responseMetadata)
+{
+    public IJsonApiRequestMetadata? RequestMetadata { get; } = requestMetadata;
+    public IJsonApiResponseMetadata? ResponseMetadata { get; } = responseMetadata;
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/NonPrimaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/NonPrimaryResponseMetadata.cs
new file mode 100644
index 000000000..3a4b7ad43
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/NonPrimaryResponseMetadata.cs
@@ -0,0 +1,15 @@
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal class NonPrimaryResponseMetadata : IJsonApiResponseMetadata
+{
+    public IReadOnlyDictionary DocumentTypesByRelationship { get; }
+
+    protected NonPrimaryResponseMetadata(IReadOnlyDictionary documentTypesByRelationship)
+    {
+        ArgumentNullException.ThrowIfNull(documentTypesByRelationship);
+
+        DocumentTypesByRelationship = documentTypesByRelationship;
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/PrimaryRequestMetadata.cs
similarity index 78%
rename from src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryRequestMetadata.cs
rename to src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/PrimaryRequestMetadata.cs
index 7c224417f..cbcf6ad58 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/PrimaryRequestMetadata.cs
@@ -1,4 +1,4 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
 
 internal sealed class PrimaryRequestMetadata : IJsonApiRequestMetadata
 {
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/PrimaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/PrimaryResponseMetadata.cs
new file mode 100644
index 000000000..af0761be2
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/PrimaryResponseMetadata.cs
@@ -0,0 +1,6 @@
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal sealed class PrimaryResponseMetadata(Type? documentType) : IJsonApiResponseMetadata
+{
+    public Type? DocumentType { get; } = documentType;
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/RelationshipRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/RelationshipRequestMetadata.cs
new file mode 100644
index 000000000..71c82337a
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/RelationshipRequestMetadata.cs
@@ -0,0 +1,15 @@
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal sealed class RelationshipRequestMetadata : IJsonApiRequestMetadata
+{
+    public IReadOnlyDictionary DocumentTypesByRelationship { get; }
+
+    public RelationshipRequestMetadata(IReadOnlyDictionary documentTypesByRelationship)
+    {
+        ArgumentNullException.ThrowIfNull(documentTypesByRelationship);
+
+        DocumentTypesByRelationship = documentTypesByRelationship;
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/RelationshipResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/RelationshipResponseMetadata.cs
new file mode 100644
index 000000000..14d43cd44
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/RelationshipResponseMetadata.cs
@@ -0,0 +1,6 @@
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal sealed class RelationshipResponseMetadata(IReadOnlyDictionary documentTypesByRelationship)
+    : NonPrimaryResponseMetadata(documentTypesByRelationship);
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/SecondaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/SecondaryResponseMetadata.cs
new file mode 100644
index 000000000..47349ce44
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/Documents/SecondaryResponseMetadata.cs
@@ -0,0 +1,6 @@
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
+
+internal sealed class SecondaryResponseMetadata(IReadOnlyDictionary documentTypesByRelationship)
+    : NonPrimaryResponseMetadata(documentTypesByRelationship);
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs
deleted file mode 100644
index e4c074f08..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/EndpointResolver.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Reflection;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Middleware;
-using Microsoft.AspNetCore.Mvc.Routing;
-
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal sealed class EndpointResolver
-{
-    public static EndpointResolver Instance { get; } = new();
-
-    private EndpointResolver()
-    {
-    }
-
-    public JsonApiEndpoints GetEndpoint(MethodInfo controllerAction)
-    {
-        ArgumentNullException.ThrowIfNull(controllerAction);
-
-        if (!IsJsonApiController(controllerAction))
-        {
-            return JsonApiEndpoints.None;
-        }
-
-        IEnumerable httpMethodAttributes = controllerAction.GetCustomAttributes(true);
-        return httpMethodAttributes.GetJsonApiEndpoint();
-    }
-
-    private bool IsJsonApiController(MethodInfo controllerAction)
-    {
-        return typeof(CoreJsonApiController).IsAssignableFrom(controllerAction.ReflectedType);
-    }
-
-    public bool IsAtomicOperationsController(MethodInfo controllerAction)
-    {
-        return typeof(BaseJsonApiOperationsController).IsAssignableFrom(controllerAction.ReflectedType);
-    }
-}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiEndpointMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiEndpointMetadata.cs
deleted file mode 100644
index 01a8247ec..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiEndpointMetadata.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal interface IJsonApiEndpointMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiRequestMetadata.cs
deleted file mode 100644
index 86fbddebb..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiRequestMetadata.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal interface IJsonApiRequestMetadata : IJsonApiEndpointMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiResponseMetadata.cs
deleted file mode 100644
index 85fb69e85..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/IJsonApiResponseMetadata.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal interface IJsonApiResponseMetadata : IJsonApiEndpointMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
deleted file mode 100644
index 60b7182eb..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-/// 
-/// Metadata available at runtime about a JsonApiDotNetCore endpoint.
-/// 
-internal sealed class JsonApiEndpointMetadataContainer(IJsonApiRequestMetadata? requestMetadata, IJsonApiResponseMetadata? responseMetadata)
-{
-    public IJsonApiRequestMetadata? RequestMetadata { get; } = requestMetadata;
-    public IJsonApiResponseMetadata? ResponseMetadata { get; } = responseMetadata;
-}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
index 6fd6f9e42..dc4d7cdd9 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
@@ -1,15 +1,16 @@
-using System.Reflection;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.Documents;
 using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 using JsonApiDotNetCore.Resources.Annotations;
+using Microsoft.AspNetCore.Mvc.Abstractions;
 
 namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
 
 /// 
-/// Provides JsonApiDotNetCore related metadata for an ASP.NET controller action that can only be computed from the  at
-/// runtime.
+/// Provides JsonApiDotNetCore related metadata for an ASP.NET action method that can only be computed from the  at runtime.
 /// 
 internal sealed class JsonApiEndpointMetadataProvider
 {
@@ -25,28 +26,32 @@ public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerReso
         _nonPrimaryDocumentTypeFactory = nonPrimaryDocumentTypeFactory;
     }
 
-    public JsonApiEndpointMetadataContainer Get(MethodInfo controllerAction)
+    public JsonApiEndpointMetadata? Get(ActionDescriptor descriptor)
     {
-        ArgumentNullException.ThrowIfNull(controllerAction);
+        ArgumentNullException.ThrowIfNull(descriptor);
 
-        if (EndpointResolver.Instance.IsAtomicOperationsController(controllerAction))
-        {
-            return new JsonApiEndpointMetadataContainer(AtomicOperationsRequestMetadata.Instance, AtomicOperationsResponseMetadata.Instance);
-        }
-
-        JsonApiEndpoints endpoint = EndpointResolver.Instance.GetEndpoint(controllerAction);
+        var actionMethod = OpenApiActionMethod.Create(descriptor);
 
-        if (endpoint == JsonApiEndpoints.None)
+        switch (actionMethod)
         {
-            throw new NotSupportedException($"Unable to provide metadata for non-JSON:API endpoint '{controllerAction.ReflectedType!.FullName}'.");
+            case AtomicOperationsActionMethod:
+            {
+                return new JsonApiEndpointMetadata(AtomicOperationsRequestMetadata.Instance, AtomicOperationsResponseMetadata.Instance);
+            }
+            case JsonApiActionMethod jsonApiActionMethod:
+            {
+                ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(jsonApiActionMethod.ControllerType);
+                ConsistencyGuard.ThrowIf(primaryResourceType == null);
+
+                IJsonApiRequestMetadata? requestMetadata = GetRequestMetadata(jsonApiActionMethod.Endpoint, primaryResourceType);
+                IJsonApiResponseMetadata? responseMetadata = GetResponseMetadata(jsonApiActionMethod.Endpoint, primaryResourceType);
+                return new JsonApiEndpointMetadata(requestMetadata, responseMetadata);
+            }
+            default:
+            {
+                return null;
+            }
         }
-
-        ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(controllerAction.ReflectedType);
-        ConsistencyGuard.ThrowIf(primaryResourceType == null);
-
-        IJsonApiRequestMetadata? requestMetadata = GetRequestMetadata(endpoint, primaryResourceType);
-        IJsonApiResponseMetadata? responseMetadata = GetResponseMetadata(endpoint, primaryResourceType);
-        return new JsonApiEndpointMetadataContainer(requestMetadata, responseMetadata);
     }
 
     private IJsonApiRequestMetadata? GetRequestMetadata(JsonApiEndpoints endpoint, ResourceType primaryResourceType)
@@ -75,14 +80,14 @@ private static PrimaryRequestMetadata GetPatchResourceRequestMetadata(Type resou
         return new PrimaryRequestMetadata(documentType);
     }
 
-    private RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable relationships, bool ignoreHasOneRelationships)
+    private RelationshipRequestMetadata GetRelationshipRequestMetadata(IReadOnlyCollection relationships, bool ignoreHasOneRelationships)
     {
         IEnumerable relationshipsOfEndpoint = ignoreHasOneRelationships ? relationships.OfType() : relationships;
 
-        IDictionary requestDocumentTypesByRelationshipName = relationshipsOfEndpoint.ToDictionary(relationship => relationship.PublicName,
+        Dictionary documentTypesByRelationship = relationshipsOfEndpoint.ToDictionary(relationship => relationship,
             _nonPrimaryDocumentTypeFactory.GetForRelationshipRequest);
 
-        return new RelationshipRequestMetadata(requestDocumentTypesByRelationshipName);
+        return new RelationshipRequestMetadata(documentTypesByRelationship.AsReadOnly());
     }
 
     private IJsonApiResponseMetadata? GetResponseMetadata(JsonApiEndpoints endpoint, ResourceType primaryResourceType)
@@ -91,12 +96,20 @@ private RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable GetPrimaryResponseMetadata(
                 primaryResourceType.ClrType, endpoint == JsonApiEndpoints.GetCollection),
+            JsonApiEndpoints.Delete => GetEmptyPrimaryResponseMetadata(),
             JsonApiEndpoints.GetSecondary => GetSecondaryResponseMetadata(primaryResourceType.Relationships),
             JsonApiEndpoints.GetRelationship => GetRelationshipResponseMetadata(primaryResourceType.Relationships),
+            JsonApiEndpoints.PostRelationship or JsonApiEndpoints.PatchRelationship or JsonApiEndpoints.DeleteRelationship =>
+                GetEmptyRelationshipResponseMetadata(primaryResourceType.Relationships, endpoint != JsonApiEndpoints.PatchRelationship),
             _ => null
         };
     }
 
+    private static PrimaryResponseMetadata GetEmptyPrimaryResponseMetadata()
+    {
+        return new PrimaryResponseMetadata(null);
+    }
+
     private static PrimaryResponseMetadata GetPrimaryResponseMetadata(Type resourceClrType, bool endpointReturnsCollection)
     {
         Type documentOpenType = endpointReturnsCollection ? typeof(CollectionResponseDocument<>) : typeof(PrimaryResponseDocument<>);
@@ -107,17 +120,26 @@ private static PrimaryResponseMetadata GetPrimaryResponseMetadata(Type resourceC
 
     private SecondaryResponseMetadata GetSecondaryResponseMetadata(IEnumerable relationships)
     {
-        IDictionary responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,
+        Dictionary documentTypesByRelationship = relationships.ToDictionary(relationship => relationship,
             _nonPrimaryDocumentTypeFactory.GetForSecondaryResponse);
 
-        return new SecondaryResponseMetadata(responseDocumentTypesByRelationshipName);
+        return new SecondaryResponseMetadata(documentTypesByRelationship.AsReadOnly());
     }
 
-    private RelationshipResponseMetadata GetRelationshipResponseMetadata(IEnumerable relationships)
+    private RelationshipResponseMetadata GetRelationshipResponseMetadata(IReadOnlyCollection relationships)
     {
-        IDictionary responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,
+        Dictionary documentTypesByRelationship = relationships.ToDictionary(relationship => relationship,
             _nonPrimaryDocumentTypeFactory.GetForRelationshipResponse);
 
-        return new RelationshipResponseMetadata(responseDocumentTypesByRelationshipName);
+        return new RelationshipResponseMetadata(documentTypesByRelationship.AsReadOnly());
+    }
+
+    private static EmptyRelationshipResponseMetadata GetEmptyRelationshipResponseMetadata(IReadOnlyCollection relationships,
+        bool ignoreHasOneRelationships)
+    {
+        IReadOnlyCollection relationshipsOfEndpoint =
+            ignoreHasOneRelationships ? relationships.OfType().ToList().AsReadOnly() : relationships;
+
+        return new EmptyRelationshipResponseMetadata(relationshipsOfEndpoint);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryEndpointMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
deleted file mode 100644
index ed43dc4da..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal abstract class NonPrimaryEndpointMetadata
-{
-    public IDictionary DocumentTypesByRelationshipName { get; }
-
-    protected NonPrimaryEndpointMetadata(IDictionary documentTypesByRelationshipName)
-    {
-        ArgumentNullException.ThrowIfNull(documentTypesByRelationshipName);
-
-        DocumentTypesByRelationshipName = documentTypesByRelationshipName;
-    }
-}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryResponseMetadata.cs
deleted file mode 100644
index 2d2590be7..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/PrimaryResponseMetadata.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal sealed class PrimaryResponseMetadata : IJsonApiResponseMetadata
-{
-    public Type DocumentType { get; }
-
-    public PrimaryResponseMetadata(Type documentType)
-    {
-        ArgumentNullException.ThrowIfNull(documentType);
-
-        DocumentType = documentType;
-    }
-}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipRequestMetadata.cs
deleted file mode 100644
index e2636da07..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipRequestMetadata.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal sealed class RelationshipRequestMetadata(IDictionary documentTypesByRelationshipName)
-    : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiRequestMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipResponseMetadata.cs
deleted file mode 100644
index 7221dfbe5..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/RelationshipResponseMetadata.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal sealed class RelationshipResponseMetadata(IDictionary documentTypesByRelationshipName)
-    : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiResponseMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/SecondaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/SecondaryResponseMetadata.cs
deleted file mode 100644
index 39b8ce8d4..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/SecondaryResponseMetadata.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-
-internal sealed class SecondaryResponseMetadata(IDictionary documentTypesByRelationshipName)
-    : NonPrimaryEndpointMetadata(documentTypesByRelationshipName), IJsonApiResponseMetadata;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
index 6def822bd..e73c0d120 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
@@ -1,15 +1,14 @@
 using System.Diagnostics;
-using JsonApiDotNetCore.Middleware;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Formatters;
-using Microsoft.Net.Http.Headers;
 
 namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
+/// 
+/// Determines the Content-Type used in OpenAPI documents for request bodies of JSON:API endpoints.
+/// 
 internal sealed class JsonApiRequestFormatMetadataProvider : IInputFormatter, IApiRequestFormatMetadataProvider
 {
-    private static readonly string DefaultMediaType = JsonApiMediaType.Default.ToString();
-
     /// 
     public bool CanRead(InputFormatterContext context)
     {
@@ -23,20 +22,10 @@ public Task ReadAsync(InputFormatterContext context)
     }
 
     /// 
-    public IReadOnlyList GetSupportedContentTypes(string contentType, Type objectType)
+    public IReadOnlyList GetSupportedContentTypes(string? contentType, Type objectType)
     {
-        ArgumentException.ThrowIfNullOrEmpty(contentType);
         ArgumentNullException.ThrowIfNull(objectType);
 
-        if (JsonApiSchemaFacts.IsRequestBodySchemaType(objectType) && MediaTypeHeaderValue.TryParse(contentType, out MediaTypeHeaderValue? headerValue) &&
-            headerValue.MediaType.Equals(DefaultMediaType, StringComparison.OrdinalIgnoreCase))
-        {
-            return new MediaTypeCollection
-            {
-                headerValue
-            };
-        }
-
-        return [];
+        return OpenApiContentTypeProvider.Instance.GetRequestContentTypes(objectType);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaFacts.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaFacts.cs
index bf91aed0e..87e8ae24f 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaFacts.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaFacts.cs
@@ -7,14 +7,24 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class JsonApiSchemaFacts
 {
-    private static readonly Type[] RequestBodySchemaTypes =
+    private static readonly Type[] RequestDocumentSchemaOpenTypes =
     [
         typeof(CreateRequestDocument<>),
         typeof(UpdateRequestDocument<>),
         typeof(ToOneInRequest<>),
         typeof(NullableToOneInRequest<>),
-        typeof(ToManyInRequest<>),
-        typeof(OperationsRequestDocument)
+        typeof(ToManyInRequest<>)
+    ];
+
+    private static readonly Type[] ResponseDocumentSchemaOpenTypes =
+    [
+        typeof(CollectionResponseDocument<>),
+        typeof(PrimaryResponseDocument<>),
+        typeof(SecondaryResponseDocument<>),
+        typeof(NullableSecondaryResponseDocument<>),
+        typeof(IdentifierResponseDocument<>),
+        typeof(NullableIdentifierResponseDocument<>),
+        typeof(IdentifierCollectionResponseDocument<>)
     ];
 
     private static readonly Type[] SchemaTypesHavingNullableDataProperty =
@@ -32,14 +42,26 @@ internal static class JsonApiSchemaFacts
         typeof(NullableToOneInResponse<>)
     ];
 
-    public static bool IsRequestBodySchemaType(Type schemaType)
+    public static bool IsRequestDocumentSchemaType(Type schemaType)
+    {
+        ArgumentNullException.ThrowIfNull(schemaType);
+
+        Type lookupType = schemaType.ConstructedToOpenType();
+        return RequestDocumentSchemaOpenTypes.Contains(lookupType);
+    }
+
+    public static bool IsResponseDocumentSchemaType(Type schemaType)
     {
+        ArgumentNullException.ThrowIfNull(schemaType);
+
         Type lookupType = schemaType.ConstructedToOpenType();
-        return RequestBodySchemaTypes.Contains(lookupType);
+        return ResponseDocumentSchemaOpenTypes.Contains(lookupType);
     }
 
     public static bool HasNullableDataProperty(Type schemaType)
     {
+        ArgumentNullException.ThrowIfNull(schemaType);
+
         // Swashbuckle infers non-nullable because our Data properties are [Required].
 
         Type lookupType = schemaType.ConstructedToOpenType();
@@ -48,6 +70,8 @@ public static bool HasNullableDataProperty(Type schemaType)
 
     public static bool IsRelationshipInResponseType(Type schemaType)
     {
+        ArgumentNullException.ThrowIfNull(schemaType);
+
         Type lookupType = schemaType.ConstructedToOpenType();
         return RelationshipInResponseSchemaTypes.Contains(lookupType);
     }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiContentTypeProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiContentTypeProvider.cs
new file mode 100644
index 000000000..00b5a5f17
--- /dev/null
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiContentTypeProvider.cs
@@ -0,0 +1,56 @@
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
+
+namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
+
+/// 
+/// Determines the Content-Type used in OpenAPI documents for request/response bodies of JSON:API endpoints.
+/// 
+internal sealed class OpenApiContentTypeProvider
+{
+    public static OpenApiContentTypeProvider Instance { get; } = new();
+
+    private OpenApiContentTypeProvider()
+    {
+    }
+
+    public IReadOnlyList GetRequestContentTypes(Type documentType)
+    {
+        ArgumentNullException.ThrowIfNull(documentType);
+
+        // Don't return multiple media types, see https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1729#issuecomment-2972032608.
+
+        if (documentType == typeof(OperationsRequestDocument))
+        {
+            return [OpenApiMediaTypes.RelaxedAtomicOperationsWithRelaxedOpenApi.ToString()];
+        }
+
+        if (JsonApiSchemaFacts.IsRequestDocumentSchemaType(documentType))
+        {
+            return [OpenApiMediaTypes.RelaxedOpenApi.ToString()];
+        }
+
+        return [];
+    }
+
+    public IReadOnlyList GetResponseContentTypes(Type? documentType)
+    {
+        // Don't return multiple media types, see https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1729#issuecomment-2972032608.
+
+        if (documentType == typeof(OperationsResponseDocument))
+        {
+            return [OpenApiMediaTypes.RelaxedAtomicOperationsWithRelaxedOpenApi.ToString()];
+        }
+
+        if (documentType == typeof(ErrorResponseDocument))
+        {
+            return [OpenApiMediaTypes.RelaxedOpenApi.ToString()];
+        }
+
+        if (documentType != null && JsonApiSchemaFacts.IsResponseDocumentSchemaType(documentType))
+        {
+            return [OpenApiMediaTypes.RelaxedOpenApi.ToString()];
+        }
+
+        return [];
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs
deleted file mode 100644
index 75649b85a..000000000
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiEndpointConvention.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-using System.Net;
-using System.Reflection;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Middleware;
-using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
-using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
-using JsonApiDotNetCore.Resources.Annotations;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
-
-namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
-
-/// 
-/// Sets metadata on controllers for OpenAPI documentation generation by Swagger. Only targets JsonApiDotNetCore controllers.
-/// 
-internal sealed class OpenApiEndpointConvention : IActionModelConvention
-{
-    private readonly IControllerResourceMapping _controllerResourceMapping;
-    private readonly IJsonApiOptions _options;
-
-    public OpenApiEndpointConvention(IControllerResourceMapping controllerResourceMapping, IJsonApiOptions options)
-    {
-        ArgumentNullException.ThrowIfNull(controllerResourceMapping);
-        ArgumentNullException.ThrowIfNull(options);
-
-        _controllerResourceMapping = controllerResourceMapping;
-        _options = options;
-    }
-
-    public void Apply(ActionModel action)
-    {
-        ArgumentNullException.ThrowIfNull(action);
-
-        JsonApiEndpointWrapper endpoint = JsonApiEndpointWrapper.FromActionModel(action);
-
-        if (endpoint.IsUnknown)
-        {
-            // Not a JSON:API controller, or a non-standard action method in a JSON:API controller.
-            // None of these are yet implemented, so hide them to avoid downstream crashes.
-            action.ApiExplorer.IsVisible = false;
-            return;
-        }
-
-        ResourceType? resourceType = _controllerResourceMapping.GetResourceTypeForController(action.Controller.ControllerType);
-
-        if (ShouldSuppressEndpoint(endpoint, resourceType))
-        {
-            action.ApiExplorer.IsVisible = false;
-            return;
-        }
-
-        SetResponseMetadata(action, endpoint, resourceType);
-        SetRequestMetadata(action, endpoint);
-    }
-
-    private bool ShouldSuppressEndpoint(JsonApiEndpointWrapper endpoint, ResourceType? resourceType)
-    {
-        if (resourceType == null)
-        {
-            return false;
-        }
-
-        if (!IsEndpointAvailable(endpoint.Value, resourceType))
-        {
-            return true;
-        }
-
-        if (IsSecondaryOrRelationshipEndpoint(endpoint.Value))
-        {
-            if (resourceType.Relationships.Count == 0)
-            {
-                return true;
-            }
-
-            if (endpoint.Value is JsonApiEndpoints.DeleteRelationship or JsonApiEndpoints.PostRelationship)
-            {
-                return !resourceType.Relationships.OfType().Any();
-            }
-        }
-
-        return false;
-    }
-
-    private static bool IsEndpointAvailable(JsonApiEndpoints endpoint, ResourceType resourceType)
-    {
-        JsonApiEndpoints availableEndpoints = GetGeneratedControllerEndpoints(resourceType);
-
-        if (availableEndpoints == JsonApiEndpoints.None)
-        {
-            // Auto-generated controllers are disabled, so we can't know what to hide.
-            // It is assumed that a handwritten JSON:API controller only provides action methods for what it supports.
-            // To accomplish that, derive from BaseJsonApiController instead of JsonApiController.
-            return true;
-        }
-
-        // For an overridden JSON:API action method in a partial class to show up, it's flag must be turned on in [Resource].
-        // Otherwise, it is considered to be an action method that throws because the endpoint is unavailable.
-        return IncludesEndpoint(endpoint, availableEndpoints);
-    }
-
-    private static bool IncludesEndpoint(JsonApiEndpoints endpoint, JsonApiEndpoints availableEndpoints)
-    {
-        bool? isIncluded = null;
-
-        if (endpoint == JsonApiEndpoints.GetCollection)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.GetCollection);
-        }
-        else if (endpoint == JsonApiEndpoints.GetSingle)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.GetSingle);
-        }
-        else if (endpoint == JsonApiEndpoints.GetSecondary)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.GetSecondary);
-        }
-        else if (endpoint == JsonApiEndpoints.GetRelationship)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.GetRelationship);
-        }
-        else if (endpoint == JsonApiEndpoints.Post)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.Post);
-        }
-        else if (endpoint == JsonApiEndpoints.PostRelationship)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.PostRelationship);
-        }
-        else if (endpoint == JsonApiEndpoints.Patch)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.Patch);
-        }
-        else if (endpoint == JsonApiEndpoints.PatchRelationship)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.PatchRelationship);
-        }
-        else if (endpoint == JsonApiEndpoints.Delete)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.Delete);
-        }
-        else if (endpoint == JsonApiEndpoints.DeleteRelationship)
-        {
-            isIncluded = availableEndpoints.HasFlag(JsonApiEndpoints.DeleteRelationship);
-        }
-
-        ConsistencyGuard.ThrowIf(isIncluded == null);
-        return isIncluded.Value;
-    }
-
-    private static JsonApiEndpoints GetGeneratedControllerEndpoints(ResourceType resourceType)
-    {
-        var resourceAttribute = resourceType.ClrType.GetCustomAttribute();
-        return resourceAttribute?.GenerateControllerEndpoints ?? JsonApiEndpoints.None;
-    }
-
-    private static bool IsSecondaryOrRelationshipEndpoint(JsonApiEndpoints endpoint)
-    {
-        return endpoint is JsonApiEndpoints.GetSecondary or JsonApiEndpoints.GetRelationship or JsonApiEndpoints.PostRelationship or
-            JsonApiEndpoints.PatchRelationship or JsonApiEndpoints.DeleteRelationship;
-    }
-
-    private void SetResponseMetadata(ActionModel action, JsonApiEndpointWrapper endpoint, ResourceType? resourceType)
-    {
-        JsonApiMediaType mediaType = GetMediaTypeForEndpoint(endpoint);
-        action.Filters.Add(new ProducesAttribute(mediaType.ToString()));
-
-        foreach (HttpStatusCode statusCode in GetSuccessStatusCodesForEndpoint(endpoint))
-        {
-            // The return type is set later by JsonApiActionDescriptorCollectionProvider.
-            action.Filters.Add(new ProducesResponseTypeAttribute((int)statusCode));
-        }
-
-        foreach (HttpStatusCode statusCode in GetErrorStatusCodesForEndpoint(endpoint, resourceType))
-        {
-            action.Filters.Add(new ProducesResponseTypeAttribute(typeof(ErrorResponseDocument), (int)statusCode));
-        }
-    }
-
-    private JsonApiMediaType GetMediaTypeForEndpoint(JsonApiEndpointWrapper endpoint)
-    {
-        return endpoint.IsAtomicOperationsEndpoint ? OpenApiMediaTypes.RelaxedAtomicOperationsWithRelaxedOpenApi : OpenApiMediaTypes.RelaxedOpenApi;
-    }
-
-    private static HttpStatusCode[] GetSuccessStatusCodesForEndpoint(JsonApiEndpointWrapper endpoint)
-    {
-        if (endpoint.IsAtomicOperationsEndpoint)
-        {
-            return
-            [
-                HttpStatusCode.OK,
-                HttpStatusCode.NoContent
-            ];
-        }
-
-        HttpStatusCode[]? statusCodes = null;
-
-        if (endpoint.Value is JsonApiEndpoints.GetCollection or JsonApiEndpoints.GetSingle or JsonApiEndpoints.GetSecondary or JsonApiEndpoints.GetRelationship)
-        {
-            statusCodes =
-            [
-                HttpStatusCode.OK,
-                HttpStatusCode.NotModified
-            ];
-        }
-        else if (endpoint.Value == JsonApiEndpoints.Post)
-        {
-            statusCodes =
-            [
-                HttpStatusCode.Created,
-                HttpStatusCode.NoContent
-            ];
-        }
-        else if (endpoint.Value == JsonApiEndpoints.Patch)
-        {
-            statusCodes =
-            [
-                HttpStatusCode.OK,
-                HttpStatusCode.NoContent
-            ];
-        }
-        else if (endpoint.Value is JsonApiEndpoints.Delete or JsonApiEndpoints.PostRelationship or JsonApiEndpoints.PatchRelationship or
-            JsonApiEndpoints.DeleteRelationship)
-        {
-            statusCodes = [HttpStatusCode.NoContent];
-        }
-
-        ConsistencyGuard.ThrowIf(statusCodes == null);
-        return statusCodes;
-    }
-
-    private HttpStatusCode[] GetErrorStatusCodesForEndpoint(JsonApiEndpointWrapper endpoint, ResourceType? resourceType)
-    {
-        if (endpoint.IsAtomicOperationsEndpoint)
-        {
-            return
-            [
-                HttpStatusCode.BadRequest,
-                HttpStatusCode.Forbidden,
-                HttpStatusCode.NotFound,
-                HttpStatusCode.Conflict,
-                HttpStatusCode.UnprocessableEntity
-            ];
-        }
-
-        // Condition doesn't apply to atomic operations, because Forbidden is also used when an operation is not accessible.
-        ClientIdGenerationMode clientIdGeneration = resourceType?.ClientIdGeneration ?? _options.ClientIdGeneration;
-
-        HttpStatusCode[]? statusCodes = null;
-
-        if (endpoint.Value == JsonApiEndpoints.GetCollection)
-        {
-            statusCodes = [HttpStatusCode.BadRequest];
-        }
-        else if (endpoint.Value is JsonApiEndpoints.GetSingle or JsonApiEndpoints.GetSecondary or JsonApiEndpoints.GetRelationship)
-        {
-            statusCodes =
-            [
-                HttpStatusCode.BadRequest,
-                HttpStatusCode.NotFound
-            ];
-        }
-        else if (endpoint.Value == JsonApiEndpoints.Post && clientIdGeneration == ClientIdGenerationMode.Forbidden)
-        {
-            statusCodes =
-            [
-                HttpStatusCode.BadRequest,
-                HttpStatusCode.Forbidden,
-                HttpStatusCode.NotFound,
-                HttpStatusCode.Conflict,
-                HttpStatusCode.UnprocessableEntity
-            ];
-        }
-        else if (endpoint.Value is JsonApiEndpoints.Post or JsonApiEndpoints.Patch)
-        {
-            statusCodes =
-            [
-                HttpStatusCode.BadRequest,
-                HttpStatusCode.NotFound,
-                HttpStatusCode.Conflict,
-                HttpStatusCode.UnprocessableEntity
-            ];
-        }
-        else if (endpoint.Value == JsonApiEndpoints.Delete)
-        {
-            statusCodes = [HttpStatusCode.NotFound];
-        }
-        else if (endpoint.Value is JsonApiEndpoints.PostRelationship or JsonApiEndpoints.PatchRelationship or JsonApiEndpoints.DeleteRelationship)
-        {
-            statusCodes =
-            [
-                HttpStatusCode.BadRequest,
-                HttpStatusCode.NotFound,
-                HttpStatusCode.Conflict,
-                HttpStatusCode.UnprocessableEntity
-            ];
-        }
-
-        ConsistencyGuard.ThrowIf(statusCodes == null);
-        return statusCodes;
-    }
-
-    private void SetRequestMetadata(ActionModel action, JsonApiEndpointWrapper endpoint)
-    {
-        if (RequiresRequestBody(endpoint))
-        {
-            JsonApiMediaType mediaType = GetMediaTypeForEndpoint(endpoint);
-            action.Filters.Add(new ConsumesAttribute(mediaType.ToString()));
-        }
-    }
-
-    private static bool RequiresRequestBody(JsonApiEndpointWrapper endpoint)
-    {
-        return endpoint.IsAtomicOperationsEndpoint || endpoint.Value is JsonApiEndpoints.Post or JsonApiEndpoints.Patch or JsonApiEndpoints.PostRelationship or
-            JsonApiEndpoints.PatchRelationship or JsonApiEndpoints.DeleteRelationship;
-    }
-
-    private sealed class JsonApiEndpointWrapper
-    {
-        private static readonly JsonApiEndpointWrapper AtomicOperations = new(true, JsonApiEndpoints.None);
-
-        public bool IsAtomicOperationsEndpoint { get; }
-        public JsonApiEndpoints Value { get; }
-        public bool IsUnknown => !IsAtomicOperationsEndpoint && Value == JsonApiEndpoints.None;
-
-        private JsonApiEndpointWrapper(bool isAtomicOperationsEndpoint, JsonApiEndpoints value)
-        {
-            IsAtomicOperationsEndpoint = isAtomicOperationsEndpoint;
-            Value = value;
-        }
-
-        public static JsonApiEndpointWrapper FromActionModel(ActionModel actionModel)
-        {
-            if (EndpointResolver.Instance.IsAtomicOperationsController(actionModel.ActionMethod))
-            {
-                return AtomicOperations;
-            }
-
-            JsonApiEndpoints endpoint = EndpointResolver.Instance.GetEndpoint(actionModel.ActionMethod);
-            return new JsonApiEndpointWrapper(false, endpoint);
-        }
-
-        public override string ToString()
-        {
-            return IsAtomicOperationsEndpoint ? "PostOperations" : Value.ToString();
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs
index ed11481e2..c59470f37 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiOperationIdSelector.cs
@@ -1,13 +1,14 @@
-using System.Reflection;
 using System.Text.Json;
 using Humanizer;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
 using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
 using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Controllers;
+using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
@@ -37,6 +38,8 @@ internal sealed class OpenApiOperationIdSelector
         [typeof(OperationsRequestDocument)] = AtomicOperationsIdTemplate
     };
 
+    private static readonly Func DefaultOperationIdSelector = new SwaggerGeneratorOptions().OperationIdSelector;
+
     private readonly IControllerResourceMapping _controllerResourceMapping;
     private readonly IJsonApiOptions _options;
 
@@ -53,34 +56,47 @@ public string GetOpenApiOperationId(ApiDescription endpoint)
     {
         ArgumentNullException.ThrowIfNull(endpoint);
 
-        MethodInfo actionMethod = endpoint.ActionDescriptor.GetActionMethod();
-        ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(actionMethod.ReflectedType);
+        var actionMethod = OpenApiActionMethod.Create(endpoint.ActionDescriptor);
 
-        string template = GetTemplate(endpoint);
-        return ApplyTemplate(template, primaryResourceType, endpoint);
+        switch (actionMethod)
+        {
+            case BuiltinJsonApiActionMethod builtinJsonApiActionMethod:
+            {
+                ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(builtinJsonApiActionMethod.ControllerType);
+
+                string template = GetTemplate(endpoint);
+                return ApplyTemplate(template, primaryResourceType, endpoint);
+            }
+            default:
+            {
+                return DefaultOperationIdSelector(endpoint);
+            }
+        }
     }
 
     private static string GetTemplate(ApiDescription endpoint)
     {
-        Type bodyType = GetBodyType(endpoint);
-        ConsistencyGuard.ThrowIf(!SchemaOpenTypeToOpenApiOperationIdTemplateMap.TryGetValue(bodyType, out string? template));
+        Type documentType = GetDocumentType(endpoint);
+        ConsistencyGuard.ThrowIf(!SchemaOpenTypeToOpenApiOperationIdTemplateMap.TryGetValue(documentType, out string? template));
         return template;
     }
 
-    private static Type GetBodyType(ApiDescription endpoint)
+    private static Type GetDocumentType(ApiDescription endpoint)
     {
-        var producesResponseTypeAttribute = endpoint.ActionDescriptor.GetFilterMetadata();
+        ProducesResponseTypeAttribute? producesResponseTypeAttribute = endpoint.ActionDescriptor.FilterDescriptors
+            .Select(filterDescriptor => filterDescriptor.Filter).OfType().FirstOrDefault();
+
         ConsistencyGuard.ThrowIf(producesResponseTypeAttribute == null);
 
         ControllerParameterDescriptor? requestBodyDescriptor = endpoint.ActionDescriptor.GetBodyParameterDescriptor();
-        Type bodyType = (requestBodyDescriptor?.ParameterType ?? producesResponseTypeAttribute.Type).ConstructedToOpenType();
+        Type documentOpenType = (requestBodyDescriptor?.ParameterType ?? producesResponseTypeAttribute.Type).ConstructedToOpenType();
 
-        if (bodyType == typeof(CollectionResponseDocument<>) && endpoint.ParameterDescriptions.Count > 0)
+        if (documentOpenType == typeof(CollectionResponseDocument<>) && endpoint.ParameterDescriptions.Count > 0)
         {
-            bodyType = typeof(SecondaryResponseDocument<>);
+            documentOpenType = typeof(SecondaryResponseDocument<>);
         }
 
-        return bodyType;
+        return documentOpenType;
     }
 
     private string ApplyTemplate(string openApiOperationIdTemplate, ResourceType? resourceType, ApiDescription endpoint)
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Documents/ResourceOrRelationshipDocumentSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Documents/ResourceOrRelationshipDocumentSchemaGenerator.cs
index 767f0d014..0762e5b8c 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Documents/ResourceOrRelationshipDocumentSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Documents/ResourceOrRelationshipDocumentSchemaGenerator.cs
@@ -1,6 +1,4 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Documents;
-using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Components;
 using JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 using Microsoft.OpenApi.Models;
@@ -13,26 +11,6 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators.Documents;
 /// 
 internal sealed class ResourceOrRelationshipDocumentSchemaGenerator : DocumentSchemaGenerator
 {
-    private static readonly Type[] RequestDocumentSchemaTypes =
-    [
-        typeof(CreateRequestDocument<>),
-        typeof(UpdateRequestDocument<>),
-        typeof(ToOneInRequest<>),
-        typeof(NullableToOneInRequest<>),
-        typeof(ToManyInRequest<>)
-    ];
-
-    private static readonly Type[] ResponseDocumentSchemaTypes =
-    [
-        typeof(CollectionResponseDocument<>),
-        typeof(PrimaryResponseDocument<>),
-        typeof(SecondaryResponseDocument<>),
-        typeof(NullableSecondaryResponseDocument<>),
-        typeof(IdentifierResponseDocument<>),
-        typeof(NullableIdentifierResponseDocument<>),
-        typeof(IdentifierCollectionResponseDocument<>)
-    ];
-
     private readonly SchemaGenerator _defaultSchemaGenerator;
     private readonly DataContainerSchemaGenerator _dataContainerSchemaGenerator;
     private readonly IResourceGraph _resourceGraph;
@@ -53,8 +31,7 @@ public ResourceOrRelationshipDocumentSchemaGenerator(SchemaGenerationTracer sche
 
     public override bool CanGenerate(Type schemaType)
     {
-        Type schemaOpenType = schemaType.ConstructedToOpenType();
-        return RequestDocumentSchemaTypes.Contains(schemaOpenType) || ResponseDocumentSchemaTypes.Contains(schemaOpenType);
+        return JsonApiSchemaFacts.IsRequestDocumentSchemaType(schemaType) || JsonApiSchemaFacts.IsResponseDocumentSchemaType(schemaType);
     }
 
     protected override OpenApiSchema GenerateDocumentSchema(Type schemaType, SchemaRepository schemaRepository)
@@ -63,7 +40,7 @@ protected override OpenApiSchema GenerateDocumentSchema(Type schemaType, SchemaR
         ArgumentNullException.ThrowIfNull(schemaRepository);
 
         var resourceSchemaType = ResourceSchemaType.Create(schemaType, _resourceGraph);
-        bool isRequestSchema = RequestDocumentSchemaTypes.Contains(resourceSchemaType.SchemaOpenType);
+        bool isRequestSchema = JsonApiSchemaFacts.IsRequestDocumentSchemaType(resourceSchemaType.SchemaOpenType);
 
         _ = _dataContainerSchemaGenerator.GenerateSchema(schemaType, resourceSchemaType.ResourceType, isRequestSchema, !isRequestSchema, schemaRepository);
 
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/GenerationCacheSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/GenerationCacheSchemaGenerator.cs
index beba632eb..beb10f94b 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/GenerationCacheSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/GenerationCacheSchemaGenerator.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata;
+using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.OpenApi.Any;
@@ -18,18 +17,14 @@ internal sealed class GenerationCacheSchemaGenerator
 
     private readonly SchemaGenerationTracer _schemaGenerationTracer;
     private readonly IActionDescriptorCollectionProvider _defaultProvider;
-    private readonly JsonApiEndpointMetadataProvider _jsonApiEndpointMetadataProvider;
 
-    public GenerationCacheSchemaGenerator(SchemaGenerationTracer schemaGenerationTracer, IActionDescriptorCollectionProvider defaultProvider,
-        JsonApiEndpointMetadataProvider jsonApiEndpointMetadataProvider)
+    public GenerationCacheSchemaGenerator(SchemaGenerationTracer schemaGenerationTracer, IActionDescriptorCollectionProvider defaultProvider)
     {
         ArgumentNullException.ThrowIfNull(schemaGenerationTracer);
         ArgumentNullException.ThrowIfNull(defaultProvider);
-        ArgumentNullException.ThrowIfNull(jsonApiEndpointMetadataProvider);
 
         _schemaGenerationTracer = schemaGenerationTracer;
         _defaultProvider = defaultProvider;
-        _jsonApiEndpointMetadataProvider = jsonApiEndpointMetadataProvider;
     }
 
     public bool HasAtomicOperationsEndpoint(SchemaRepository schemaRepository)
@@ -74,15 +69,13 @@ private OpenApiSchema GenerateFullSchema(SchemaRepository schemaRepository)
 
     private bool EvaluateHasAtomicOperationsEndpoint()
     {
-        IEnumerable actionDescriptors =
-            _defaultProvider.ActionDescriptors.Items.Where(JsonApiActionDescriptorCollectionProvider.IsVisibleJsonApiEndpoint);
+        IEnumerable descriptors = _defaultProvider.ActionDescriptors.Items.Where(JsonApiActionDescriptorCollectionProvider.IsVisibleEndpoint);
 
-        foreach (ActionDescriptor actionDescriptor in actionDescriptors)
+        foreach (ActionDescriptor descriptor in descriptors)
         {
-            MethodInfo actionMethod = actionDescriptor.GetActionMethod();
-            JsonApiEndpointMetadataContainer endpointMetadataContainer = _jsonApiEndpointMetadataProvider.Get(actionMethod);
+            var actionMethod = OpenApiActionMethod.Create(descriptor);
 
-            if (endpointMetadataContainer.RequestMetadata is AtomicOperationsRequestMetadata)
+            if (actionMethod is AtomicOperationsActionMethod)
             {
                 return true;
             }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs
index 19d94eb48..c7d50572c 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs
@@ -10,14 +10,18 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SchemaGenerators;
 
 internal sealed class JsonApiSchemaGenerator : ISchemaGenerator
 {
+    private readonly SchemaGenerator _defaultSchemaGenerator;
     private readonly ResourceIdSchemaGenerator _resourceIdSchemaGenerator;
     private readonly DocumentSchemaGenerator[] _documentSchemaGenerators;
 
-    public JsonApiSchemaGenerator(ResourceIdSchemaGenerator resourceIdSchemaGenerator, IEnumerable documentSchemaGenerators)
+    public JsonApiSchemaGenerator(SchemaGenerator defaultSchemaGenerator, ResourceIdSchemaGenerator resourceIdSchemaGenerator,
+        IEnumerable documentSchemaGenerators)
     {
+        ArgumentNullException.ThrowIfNull(defaultSchemaGenerator);
         ArgumentNullException.ThrowIfNull(resourceIdSchemaGenerator);
         ArgumentNullException.ThrowIfNull(documentSchemaGenerators);
 
+        _defaultSchemaGenerator = defaultSchemaGenerator;
         _resourceIdSchemaGenerator = resourceIdSchemaGenerator;
         _documentSchemaGenerators = documentSchemaGenerators as DocumentSchemaGenerator[] ?? documentSchemaGenerators.ToArray();
     }
@@ -33,17 +37,23 @@ public OpenApiSchema GenerateSchema(Type schemaType, SchemaRepository schemaRepo
             return _resourceIdSchemaGenerator.GenerateSchema(schemaType, schemaRepository);
         }
 
-        DocumentSchemaGenerator schemaGenerator = GetDocumentSchemaGenerator(schemaType);
-        OpenApiSchema referenceSchema = schemaGenerator.GenerateSchema(schemaType, schemaRepository);
+        DocumentSchemaGenerator? schemaGenerator = GetDocumentSchemaGenerator(schemaType);
 
-        if (memberInfo != null || parameterInfo != null)
+        if (schemaGenerator != null)
         {
-            // For unknown reasons, Swashbuckle chooses to wrap request bodies in allOf, but not response bodies.
-            // We just replicate that behavior here. See https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/861#issuecomment-1373631712.
-            referenceSchema = referenceSchema.WrapInExtendedSchema();
+            OpenApiSchema referenceSchema = schemaGenerator.GenerateSchema(schemaType, schemaRepository);
+
+            if (memberInfo != null || parameterInfo != null)
+            {
+                // For unknown reasons, Swashbuckle chooses to wrap request bodies in allOf, but not response bodies.
+                // We just replicate that behavior here. See https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/861#issuecomment-1373631712.
+                referenceSchema = referenceSchema.WrapInExtendedSchema();
+            }
+
+            return referenceSchema;
         }
 
-        return referenceSchema;
+        return _defaultSchemaGenerator.GenerateSchema(schemaType, schemaRepository, memberInfo, parameterInfo, routeInfo);
     }
 
     private static bool IsJsonApiParameter(ParameterInfo parameter)
@@ -51,20 +61,16 @@ private static bool IsJsonApiParameter(ParameterInfo parameter)
         return parameter.Member.DeclaringType != null && parameter.Member.DeclaringType.IsAssignableTo(typeof(CoreJsonApiController));
     }
 
-    private DocumentSchemaGenerator GetDocumentSchemaGenerator(Type schemaType)
+    private DocumentSchemaGenerator? GetDocumentSchemaGenerator(Type schemaType)
     {
-        DocumentSchemaGenerator? generator = null;
-
         foreach (DocumentSchemaGenerator documentSchemaGenerator in _documentSchemaGenerators)
         {
             if (documentSchemaGenerator.CanGenerate(schemaType))
             {
-                generator = documentSchemaGenerator;
-                break;
+                return documentSchemaGenerator;
             }
         }
 
-        ConsistencyGuard.ThrowIf(generator == null);
-        return generator;
+        return null;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
index 687211528..10d4ec50c 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
@@ -28,14 +28,9 @@ public static void AddOpenApiForJsonApi(this IServiceCollection services, Action
 
         AddCustomApiExplorer(services);
         AddCustomSwaggerComponents(services);
-        AddSwaggerGenerator(services);
+        AddSwaggerGenerator(services, configureSwaggerGenOptions);
 
-        if (configureSwaggerGenOptions != null)
-        {
-            services.Configure(configureSwaggerGenOptions);
-        }
-
-        services.AddSingleton();
+        services.Replace(ServiceDescriptor.Singleton());
         services.TryAddSingleton();
         services.Replace(ServiceDescriptor.Singleton());
     }
@@ -50,7 +45,6 @@ private static void AssertHasJsonApi(IServiceCollection services)
 
     private static void AddCustomApiExplorer(IServiceCollection services)
     {
-        services.TryAddSingleton();
         services.TryAddSingleton();
         services.TryAddSingleton();
         services.TryAddSingleton();
@@ -73,10 +67,14 @@ private static void AddCustomApiExplorer(IServiceCollection services)
 
     private static void AddApiExplorer(IServiceCollection services)
     {
-        // The code below was copied from the implementation of MvcApiExplorerMvcCoreBuilderExtensions.AddApiExplorer(),
+        // This call was copied from the implementation of MvcApiExplorerMvcCoreBuilderExtensions.AddApiExplorer(),
         // so we don't need to take IMvcCoreBuilder as an input parameter.
-
         services.TryAddEnumerable(ServiceDescriptor.Transient());
+
+        // This call ensures that Minimal API endpoints appear in Swashbuckle.
+        // Don't be fooled to believe this call is redundant: When running from Visual Studio, a startup filter is injected
+        // that also calls this. But that doesn't happen when running from the command line or from an integration test.
+        services.AddEndpointsApiExplorer();
     }
 
     private static void AddCustomSwaggerComponents(IServiceCollection services)
@@ -87,14 +85,14 @@ private static void AddCustomSwaggerComponents(IServiceCollection services)
         services.TryAddSingleton();
     }
 
-    private static void AddSwaggerGenerator(IServiceCollection services)
+    private static void AddSwaggerGenerator(IServiceCollection services, Action? configureSwaggerGenOptions)
     {
         AddSchemaGenerators(services);
 
         services.TryAddSingleton();
-        services.AddSingleton();
+        services.Replace(ServiceDescriptor.Singleton());
 
-        services.AddSwaggerGen();
+        services.AddSwaggerGen(configureSwaggerGenOptions);
         services.AddSingleton, ConfigureSwaggerGenOptions>();
     }
 
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
index 1b5c0d5f4..0d6f89b1b 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
@@ -78,7 +78,10 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
 
         if (hasHeadVerb)
         {
-            operation.Responses.Clear();
+            foreach (OpenApiResponse response in operation.Responses.Values)
+            {
+                response.Content.Clear();
+            }
         }
 
         MethodInfo actionMethod = context.ApiDescription.ActionDescriptor.GetActionMethod();
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicLoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicLoggingTests.cs
index 1662f9387..8f6b405d3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicLoggingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicLoggingTests.cs
@@ -19,13 +19,12 @@ public AtomicLoggingTests(IntegrationTestContext();
 
-        testContext.ConfigureLogging(options =>
+        testContext.ConfigureLogging(builder =>
         {
             var loggerProvider = new CapturingLoggerProvider(LogLevel.Information);
-            options.AddProvider(loggerProvider);
-            options.SetMinimumLevel(LogLevel.Information);
+            builder.AddProvider(loggerProvider);
 
-            options.Services.AddSingleton(loggerProvider);
+            builder.Services.AddSingleton(loggerProvider);
         });
 
         testContext.ConfigureServices(services => services.AddSingleton());
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs
index 0ea01e7d3..def482f73 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs
@@ -19,15 +19,15 @@ public AtomicTraceLoggingTests(IntegrationTestContext();
 
-        testContext.ConfigureLogging(options =>
+        testContext.ConfigureLogging(builder =>
         {
             var loggerProvider = new CapturingLoggerProvider((category, level) =>
                 level == LogLevel.Trace && category.StartsWith("JsonApiDotNetCore.", StringComparison.Ordinal));
 
-            options.AddProvider(loggerProvider);
-            options.SetMinimumLevel(LogLevel.Trace);
+            builder.AddProvider(loggerProvider);
+            builder.SetMinimumLevel(LogLevel.Trace);
 
-            options.Services.AddSingleton(loggerProvider);
+            builder.Services.AddSingleton(loggerProvider);
         });
     }
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes/ScopesStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes/ScopesStartup.cs
index 0f6eaf439..8eaa59a1f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes/ScopesStartup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes/ScopesStartup.cs
@@ -13,6 +13,6 @@ public override void ConfigureServices(IServiceCollection services)
     {
         IMvcCoreBuilder mvcBuilder = services.AddMvcCore(options => options.Filters.Add(int.MaxValue));
 
-        services.AddJsonApi(SetJsonApiOptions, mvcBuilder: mvcBuilder);
+        services.AddJsonApi(ConfigureJsonApiOptions, mvcBuilder: mvcBuilder);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeLogTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeLogTests.cs
index 132fa446b..160bc3bc9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeLogTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeLogTests.cs
@@ -16,11 +16,11 @@ public ApiControllerAttributeLogTests()
 
         _loggerProvider = new CapturingLoggerProvider(LogLevel.Warning);
 
-        ConfigureLogging(options =>
+        ConfigureLogging(builder =>
         {
-            options.AddProvider(_loggerProvider);
+            builder.AddProvider(_loggerProvider);
 
-            options.Services.AddSingleton(_loggerProvider);
+            builder.Services.AddSingleton(_loggerProvider);
         });
     }
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs
index 35a536493..80155d115 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs
@@ -22,12 +22,12 @@ public ExceptionHandlerTests(IntegrationTestContext();
         testContext.UseController();
 
-        testContext.ConfigureLogging(options =>
+        testContext.ConfigureLogging(builder =>
         {
             var loggerProvider = new CapturingLoggerProvider(LogLevel.Warning);
-            options.AddProvider(loggerProvider);
+            builder.AddProvider(loggerProvider);
 
-            options.Services.AddSingleton(loggerProvider);
+            builder.Services.AddSingleton(loggerProvider);
         });
 
         testContext.ConfigureServices(services =>
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs
index 1653cd5e9..68ec695d0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs
@@ -9,9 +9,9 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
 public sealed class HostingStartup : TestableStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.Namespace = "public-api";
         options.IncludeTotalResourceCount = true;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs
index 4d35403f9..2283c6765 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs
@@ -20,15 +20,15 @@ public LoggingTests(IntegrationTestContext, Lo
         testContext.UseController();
         testContext.UseController();
 
-        testContext.ConfigureLogging(options =>
+        testContext.ConfigureLogging(builder =>
         {
             var loggerProvider = new CapturingLoggerProvider((category, level) =>
                 level >= LogLevel.Trace && category.StartsWith("JsonApiDotNetCore.", StringComparison.Ordinal));
 
-            options.AddProvider(loggerProvider);
-            options.SetMinimumLevel(LogLevel.Trace);
+            builder.AddProvider(loggerProvider);
+            builder.SetMinimumLevel(LogLevel.Trace);
 
-            options.Services.AddSingleton(loggerProvider);
+            builder.Services.AddSingleton(loggerProvider);
         });
     }
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs
index 632194371..d581bea56 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs
@@ -9,9 +9,9 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
 public sealed class KebabCasingConventionStartup : TestableStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.Namespace = "public-api";
         options.UseRelativeLinks = true;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingConventionStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingConventionStartup.cs
index dad29067c..32996706c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingConventionStartup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingConventionStartup.cs
@@ -8,9 +8,9 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
 public sealed class PascalCasingConventionStartup : TestableStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.Namespace = "PublicApi";
         options.UseRelativeLinks = true;
diff --git a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs
index 5e165653b..9ee6281d9 100644
--- a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs
@@ -8,9 +8,9 @@ namespace JsonApiDotNetCoreTests.Startups;
 public sealed class AbsoluteLinksInApiNamespaceStartup : TestableStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.Namespace = "api";
         options.UseRelativeLinks = false;
diff --git a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs
index c8234ed69..41882df04 100644
--- a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs
@@ -8,9 +8,9 @@ namespace JsonApiDotNetCoreTests.Startups;
 public sealed class AbsoluteLinksNoNamespaceStartup : TestableStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.Namespace = null;
         options.UseRelativeLinks = false;
diff --git a/test/JsonApiDotNetCoreTests/Startups/NoModelStateValidationStartup.cs b/test/JsonApiDotNetCoreTests/Startups/NoModelStateValidationStartup.cs
index ac6f9c82f..75c7b46ab 100644
--- a/test/JsonApiDotNetCoreTests/Startups/NoModelStateValidationStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/NoModelStateValidationStartup.cs
@@ -8,9 +8,9 @@ namespace JsonApiDotNetCoreTests.Startups;
 public sealed class NoModelStateValidationStartup : TestableStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.ValidateModelState = false;
     }
diff --git a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs
index 5fdfd2004..091bdff81 100644
--- a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs
@@ -8,9 +8,9 @@ namespace JsonApiDotNetCoreTests.Startups;
 public sealed class RelativeLinksInApiNamespaceStartup : TestableStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.Namespace = "api";
         options.UseRelativeLinks = true;
diff --git a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs
index 99ae80d20..7871d3ab1 100644
--- a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs
@@ -8,9 +8,9 @@ namespace JsonApiDotNetCoreTests.Startups;
 public sealed class RelativeLinksNoNamespaceStartup : TestableStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.Namespace = null;
         options.UseRelativeLinks = true;
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Extensions/ResourceObjectConverterTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Extensions/ResourceObjectConverterTests.cs
index 2b0557bcd..6b5e4e949 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Extensions/ResourceObjectConverterTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Extensions/ResourceObjectConverterTests.cs
@@ -188,7 +188,7 @@ public void Throws_for_request_body_with_extension_in_attributes_when_extension_
         };
 
         // Assert
-        JsonApiException? exception = action.Should().ThrowExactly().WithInnerExceptionExactly().Which;
+        JsonApiException exception = action.Should().ThrowExactly().WithInnerExceptionExactly().Which;
 
         exception.StackTrace.Should().Contain(nameof(ExtensionAwareResourceObjectConverter));
         exception.Errors.Should().HaveCount(1);
@@ -229,7 +229,7 @@ public void Throws_for_request_body_with_extension_in_relationships_when_extensi
         };
 
         // Assert
-        JsonApiException? exception = action.Should().ThrowExactly().WithInnerExceptionExactly().Which;
+        JsonApiException exception = action.Should().ThrowExactly().WithInnerExceptionExactly().Which;
 
         exception.StackTrace.Should().Contain(nameof(ExtensionAwareResourceObjectConverter));
         exception.Errors.Should().HaveCount(1);
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Extensions/SourcePointerInExceptionTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Extensions/SourcePointerInExceptionTests.cs
index 1638c0b0d..089a01d21 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Extensions/SourcePointerInExceptionTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Extensions/SourcePointerInExceptionTests.cs
@@ -43,7 +43,7 @@ public async Task Adds_source_pointer_to_JsonApiException_thrown_from_JsonConver
         Func action = async () => await reader.ReadAsync(httpContext.Request);
 
         // Assert
-        JsonApiException? exception = (await action.Should().ThrowExactlyAsync()).Which;
+        JsonApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
 
         exception.StackTrace.Should().Contain(nameof(ThrowingResourceObjectConverter));
         exception.Errors.Should().HaveCount(1);
@@ -71,7 +71,7 @@ public async Task Makes_source_pointer_absolute_in_JsonApiException_thrown_from_
         Func action = async () => await reader.ReadAsync(httpContext.Request);
 
         // Assert
-        JsonApiException? exception = (await action.Should().ThrowExactlyAsync()).Which;
+        JsonApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
 
         exception.StackTrace.Should().Contain(nameof(ThrowingResourceObjectConverter));
         exception.Errors.Should().HaveCount(1);
diff --git a/test/OpenApiKiotaEndToEndTests/AdditionalPropertiesTests.cs b/test/OpenApiKiotaEndToEndTests/AdditionalPropertiesTests.cs
index d3f8d75d4..400232d94 100644
--- a/test/OpenApiKiotaEndToEndTests/AdditionalPropertiesTests.cs
+++ b/test/OpenApiKiotaEndToEndTests/AdditionalPropertiesTests.cs
@@ -8,6 +8,12 @@ public sealed class AdditionalPropertiesTests
 {
     private static readonly string GeneratedCodeDirectory = $"{Path.DirectorySeparatorChar}GeneratedCode{Path.DirectorySeparatorChar}";
 
+    private static readonly HashSet Whitelist = new([
+        "Meta.cs",
+        "HttpValidationProblemDetails.cs",
+        "HttpValidationProblemDetails_errors.cs"
+    ], StringComparer.OrdinalIgnoreCase);
+
     [Fact]
     public async Task Additional_properties_are_only_allowed_in_meta()
     {
@@ -19,13 +25,17 @@ public async Task Additional_properties_are_only_allowed_in_meta()
             RecurseSubdirectories = true
         }))
         {
-            if (path.Contains(GeneratedCodeDirectory, StringComparison.OrdinalIgnoreCase) &&
-                !string.Equals(Path.GetFileName(path), "Meta.cs", StringComparison.OrdinalIgnoreCase))
+            if (path.Contains(GeneratedCodeDirectory, StringComparison.OrdinalIgnoreCase))
             {
-                string content = await File.ReadAllTextAsync(path);
-                bool containsAdditionalData = content.Contains("public IDictionary AdditionalData");
+                string fileName = Path.GetFileName(path);
+
+                if (!Whitelist.Contains(fileName))
+                {
+                    string content = await File.ReadAllTextAsync(path);
+                    bool containsAdditionalData = content.Contains("public IDictionary AdditionalData");
 
-                containsAdditionalData.Should().BeFalse($"file '{path}' should not contain AdditionalData");
+                    containsAdditionalData.Should().BeFalse($"file '{path}' should not contain AdditionalData");
+                }
             }
         }
     }
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/CupOfCoffees/CupOfCoffeesRequestBuilder.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/CupOfCoffees/CupOfCoffeesRequestBuilder.cs
new file mode 100644
index 000000000..2f2b0d0fb
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/CupOfCoffees/CupOfCoffeesRequestBuilder.cs
@@ -0,0 +1,140 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.Item;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using System.Threading;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees
+{
+    /// 
+    /// Builds and executes requests for operations under \cupOfCoffees
+    /// 
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    public partial class CupOfCoffeesRequestBuilder : BaseRequestBuilder
+    {
+        /// Gets an item from the OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.cupOfCoffees.item collection
+        /// The identifier of the cupOfCoffee to delete.
+        /// A 
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.Item.CupOfCoffeesItemRequestBuilder this[string position]
+        {
+            get
+            {
+                var urlTplParams = new Dictionary(PathParameters);
+                urlTplParams.Add("id", position);
+                return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.Item.CupOfCoffeesItemRequestBuilder(urlTplParams, RequestAdapter);
+            }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// Path parameters for the request
+        /// The request adapter to use to execute the requests.
+        public CupOfCoffeesRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/cupOfCoffees{?query*}", pathParameters)
+        {
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// The raw URL to use for the request builder.
+        /// The request adapter to use to execute the requests.
+        public CupOfCoffeesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/cupOfCoffees{?query*}", rawUrl)
+        {
+        }
+
+        /// 
+        /// Retrieves a collection of cupOfCoffees.
+        /// 
+        /// A 
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        /// When receiving a 400 status code
+        public async Task GetAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToGetRequestInformation(requestConfiguration);
+            var errorMapping = new Dictionary>
+            {
+                { "400", global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorResponseDocument.CreateFromDiscriminatorValue },
+            };
+            return await RequestAdapter.SendAsync(requestInfo, global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.CupOfCoffeeCollectionResponseDocument.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Compare the returned ETag HTTP header with an earlier one to determine if the response has changed since it was fetched.
+        /// 
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public async Task HeadAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToHeadRequestInformation(requestConfiguration);
+            await RequestAdapter.SendNoContentAsync(requestInfo, default, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Retrieves a collection of cupOfCoffees.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToGetRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            requestInfo.Headers.TryAdd("Accept", "application/vnd.api+json;ext=openapi");
+            return requestInfo;
+        }
+
+        /// 
+        /// Compare the returned ETag HTTP header with an earlier one to determine if the response has changed since it was fetched.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToHeadRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.HEAD, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            return requestInfo;
+        }
+
+        /// 
+        /// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+        /// 
+        /// A 
+        /// The raw URL to use for the request builder.
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.CupOfCoffeesRequestBuilder WithUrl(string rawUrl)
+        {
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.CupOfCoffeesRequestBuilder(rawUrl, RequestAdapter);
+        }
+
+        /// 
+        /// Retrieves a collection of cupOfCoffees.
+        /// 
+        [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+        public partial class CupOfCoffeesRequestBuilderGetQueryParameters 
+        {
+            /// For syntax, see the documentation for the [`include`](https://www.jsonapi.net/usage/reading/including-relationships.html)/[`filter`](https://www.jsonapi.net/usage/reading/filtering.html)/[`sort`](https://www.jsonapi.net/usage/reading/sorting.html)/[`page`](https://www.jsonapi.net/usage/reading/pagination.html)/[`fields`](https://www.jsonapi.net/usage/reading/sparse-fieldset-selection.html) query string parameters.
+            [QueryParameter("query")]
+            public string? Query { get; set; }
+        }
+
+        /// 
+        /// Compare the returned ETag HTTP header with an earlier one to determine if the response has changed since it was fetched.
+        /// 
+        [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+        public partial class CupOfCoffeesRequestBuilderHeadQueryParameters 
+        {
+            /// For syntax, see the documentation for the [`include`](https://www.jsonapi.net/usage/reading/including-relationships.html)/[`filter`](https://www.jsonapi.net/usage/reading/filtering.html)/[`sort`](https://www.jsonapi.net/usage/reading/sorting.html)/[`page`](https://www.jsonapi.net/usage/reading/pagination.html)/[`fields`](https://www.jsonapi.net/usage/reading/sparse-fieldset-selection.html) query string parameters.
+            [QueryParameter("query")]
+            public string? Query { get; set; }
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/CupOfCoffees/Item/CupOfCoffeesItemRequestBuilder.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/CupOfCoffees/Item/CupOfCoffeesItemRequestBuilder.cs
new file mode 100644
index 000000000..7b43a0ac4
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/CupOfCoffees/Item/CupOfCoffeesItemRequestBuilder.cs
@@ -0,0 +1,80 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using System.Threading;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.Item
+{
+    /// 
+    /// Builds and executes requests for operations under \cupOfCoffees\{id}
+    /// 
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    public partial class CupOfCoffeesItemRequestBuilder : BaseRequestBuilder
+    {
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// Path parameters for the request
+        /// The request adapter to use to execute the requests.
+        public CupOfCoffeesItemRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/cupOfCoffees/{id}", pathParameters)
+        {
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// The raw URL to use for the request builder.
+        /// The request adapter to use to execute the requests.
+        public CupOfCoffeesItemRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/cupOfCoffees/{id}", rawUrl)
+        {
+        }
+
+        /// 
+        /// Deletes an existing cupOfCoffee by its identifier.
+        /// 
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        /// When receiving a 404 status code
+        public async Task DeleteAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToDeleteRequestInformation(requestConfiguration);
+            var errorMapping = new Dictionary>
+            {
+                { "404", global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorResponseDocument.CreateFromDiscriminatorValue },
+            };
+            await RequestAdapter.SendNoContentAsync(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Deletes an existing cupOfCoffee by its identifier.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToDeleteRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.DELETE, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            requestInfo.Headers.TryAdd("Accept", "application/vnd.api+json;ext=openapi");
+            return requestInfo;
+        }
+
+        /// 
+        /// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+        /// 
+        /// A 
+        /// The raw URL to use for the request builder.
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.Item.CupOfCoffeesItemRequestBuilder WithUrl(string rawUrl)
+        {
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.Item.CupOfCoffeesItemRequestBuilder(rawUrl, RequestAdapter);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/EmailsRequestBuilder.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/EmailsRequestBuilder.cs
new file mode 100644
index 000000000..55f9b9449
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/EmailsRequestBuilder.cs
@@ -0,0 +1,52 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.Send;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.SentSince;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails
+{
+    /// 
+    /// Builds and executes requests for operations under \emails
+    /// 
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    public partial class EmailsRequestBuilder : BaseRequestBuilder
+    {
+        /// The send property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.Send.SendRequestBuilder Send
+        {
+            get => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.Send.SendRequestBuilder(PathParameters, RequestAdapter);
+        }
+
+        /// The sentSince property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.SentSince.SentSinceRequestBuilder SentSince
+        {
+            get => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.SentSince.SentSinceRequestBuilder(PathParameters, RequestAdapter);
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// Path parameters for the request
+        /// The request adapter to use to execute the requests.
+        public EmailsRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/emails", pathParameters)
+        {
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// The raw URL to use for the request builder.
+        /// The request adapter to use to execute the requests.
+        public EmailsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/emails", rawUrl)
+        {
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/Send/SendRequestBuilder.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/Send/SendRequestBuilder.cs
new file mode 100644
index 000000000..488e238f0
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/Send/SendRequestBuilder.cs
@@ -0,0 +1,86 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using System.Threading;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.Send
+{
+    /// 
+    /// Builds and executes requests for operations under \emails\send
+    /// 
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    public partial class SendRequestBuilder : BaseRequestBuilder
+    {
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// Path parameters for the request
+        /// The request adapter to use to execute the requests.
+        public SendRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/emails/send", pathParameters)
+        {
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// The raw URL to use for the request builder.
+        /// The request adapter to use to execute the requests.
+        public SendRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/emails/send", rawUrl)
+        {
+        }
+
+        /// 
+        /// Sends an email to the specified recipient.
+        /// 
+        /// A 
+        /// The email to send.
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        /// When receiving a 400 status code
+        public async Task PostAsync(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Email body, Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            _ = body ?? throw new ArgumentNullException(nameof(body));
+            var requestInfo = ToPostRequestInformation(body, requestConfiguration);
+            var errorMapping = new Dictionary>
+            {
+                { "400", global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.HttpValidationProblemDetails.CreateFromDiscriminatorValue },
+            };
+            return await RequestAdapter.SendPrimitiveAsync(requestInfo, errorMapping, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Sends an email to the specified recipient.
+        /// 
+        /// A 
+        /// The email to send.
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToPostRequestInformation(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Email body, Action>? requestConfiguration = default)
+        {
+            _ = body ?? throw new ArgumentNullException(nameof(body));
+            var requestInfo = new RequestInformation(Method.POST, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            requestInfo.Headers.TryAdd("Accept", "application/problem+json");
+            requestInfo.SetContentFromParsable(RequestAdapter, "application/json", body);
+            return requestInfo;
+        }
+
+        /// 
+        /// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+        /// 
+        /// A 
+        /// The raw URL to use for the request builder.
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.Send.SendRequestBuilder WithUrl(string rawUrl)
+        {
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.Send.SendRequestBuilder(rawUrl, RequestAdapter);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/SentSince/SentSinceRequestBuilder.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/SentSince/SentSinceRequestBuilder.cs
new file mode 100644
index 000000000..17d0f7dfa
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Emails/SentSince/SentSinceRequestBuilder.cs
@@ -0,0 +1,128 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using System.Threading;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.SentSince
+{
+    /// 
+    /// Builds and executes requests for operations under \emails\sent-since
+    /// 
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    public partial class SentSinceRequestBuilder : BaseRequestBuilder
+    {
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// Path parameters for the request
+        /// The request adapter to use to execute the requests.
+        public SentSinceRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/emails/sent-since?sinceUtc={sinceUtc}", pathParameters)
+        {
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// The raw URL to use for the request builder.
+        /// The request adapter to use to execute the requests.
+        public SentSinceRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/emails/sent-since?sinceUtc={sinceUtc}", rawUrl)
+        {
+        }
+
+        /// 
+        /// Gets all emails sent since the specified date/time.
+        /// 
+        /// A List<global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Email>
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        /// When receiving a 400 status code
+        public async Task?> GetAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToGetRequestInformation(requestConfiguration);
+            var errorMapping = new Dictionary>
+            {
+                { "400", global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.HttpValidationProblemDetails.CreateFromDiscriminatorValue },
+            };
+            var collectionResult = await RequestAdapter.SendCollectionAsync(requestInfo, global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Email.CreateFromDiscriminatorValue, errorMapping, cancellationToken).ConfigureAwait(false);
+            return collectionResult?.AsList();
+        }
+
+        /// 
+        /// Gets all emails sent since the specified date/time.
+        /// 
+        /// A 
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public async Task HeadAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToHeadRequestInformation(requestConfiguration);
+            return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Gets all emails sent since the specified date/time.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToGetRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            requestInfo.Headers.TryAdd("Accept", "application/json");
+            return requestInfo;
+        }
+
+        /// 
+        /// Gets all emails sent since the specified date/time.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToHeadRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.HEAD, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            return requestInfo;
+        }
+
+        /// 
+        /// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+        /// 
+        /// A 
+        /// The raw URL to use for the request builder.
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.SentSince.SentSinceRequestBuilder WithUrl(string rawUrl)
+        {
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.SentSince.SentSinceRequestBuilder(rawUrl, RequestAdapter);
+        }
+
+        /// 
+        /// Gets all emails sent since the specified date/time.
+        /// 
+        [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+        public partial class SentSinceRequestBuilderGetQueryParameters 
+        {
+            /// The date/time (in UTC) since which the email was sent.
+            [QueryParameter("sinceUtc")]
+            public DateTimeOffset? SinceUtc { get; set; }
+        }
+
+        /// 
+        /// Gets all emails sent since the specified date/time.
+        /// 
+        [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+        public partial class SentSinceRequestBuilderHeadQueryParameters 
+        {
+            /// The date/time (in UTC) since which the email was sent.
+            [QueryParameter("sinceUtc")]
+            public DateTimeOffset? SinceUtc { get; set; }
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/FileTransfers/FileTransfersRequestBuilder.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/FileTransfers/FileTransfersRequestBuilder.cs
new file mode 100644
index 000000000..1241d1694
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/FileTransfers/FileTransfersRequestBuilder.cs
@@ -0,0 +1,156 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.Find;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using System.Threading;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers
+{
+    /// 
+    /// Builds and executes requests for operations under \fileTransfers
+    /// 
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    public partial class FileTransfersRequestBuilder : BaseRequestBuilder
+    {
+        /// The find property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.Find.FindRequestBuilder Find
+        {
+            get => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.Find.FindRequestBuilder(PathParameters, RequestAdapter);
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// Path parameters for the request
+        /// The request adapter to use to execute the requests.
+        public FileTransfersRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/fileTransfers{?fileName*}", pathParameters)
+        {
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// The raw URL to use for the request builder.
+        /// The request adapter to use to execute the requests.
+        public FileTransfersRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/fileTransfers{?fileName*}", rawUrl)
+        {
+        }
+
+        /// 
+        /// Downloads the file with the specified name. Returns HTTP 404 if not found.
+        /// 
+        /// A 
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public async Task GetAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToGetRequestInformation(requestConfiguration);
+            return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Downloads the file with the specified name. Returns HTTP 404 if not found.
+        /// 
+        /// A 
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public async Task HeadAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToHeadRequestInformation(requestConfiguration);
+            return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Uploads a file. Returns HTTP 400 if the file is empty.
+        /// 
+        /// A 
+        /// The request body
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public async Task PostAsync(MultipartBody body, Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            _ = body ?? throw new ArgumentNullException(nameof(body));
+            var requestInfo = ToPostRequestInformation(body, requestConfiguration);
+            return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Downloads the file with the specified name. Returns HTTP 404 if not found.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToGetRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            requestInfo.Headers.TryAdd("Accept", "application/octet-stream");
+            return requestInfo;
+        }
+
+        /// 
+        /// Downloads the file with the specified name. Returns HTTP 404 if not found.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToHeadRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.HEAD, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            return requestInfo;
+        }
+
+        /// 
+        /// Uploads a file. Returns HTTP 400 if the file is empty.
+        /// 
+        /// A 
+        /// The request body
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToPostRequestInformation(MultipartBody body, Action>? requestConfiguration = default)
+        {
+            _ = body ?? throw new ArgumentNullException(nameof(body));
+            var requestInfo = new RequestInformation(Method.POST, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            requestInfo.Headers.TryAdd("Accept", "text/plain;q=0.9");
+            requestInfo.SetContentFromParsable(RequestAdapter, "multipart/form-data", body);
+            return requestInfo;
+        }
+
+        /// 
+        /// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+        /// 
+        /// A 
+        /// The raw URL to use for the request builder.
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.FileTransfersRequestBuilder WithUrl(string rawUrl)
+        {
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.FileTransfersRequestBuilder(rawUrl, RequestAdapter);
+        }
+
+        /// 
+        /// Downloads the file with the specified name. Returns HTTP 404 if not found.
+        /// 
+        [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+        public partial class FileTransfersRequestBuilderGetQueryParameters 
+        {
+            [QueryParameter("fileName")]
+            public string? FileName { get; set; }
+        }
+
+        /// 
+        /// Downloads the file with the specified name. Returns HTTP 404 if not found.
+        /// 
+        [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+        public partial class FileTransfersRequestBuilderHeadQueryParameters 
+        {
+            [QueryParameter("fileName")]
+            public string? FileName { get; set; }
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/FileTransfers/Find/FindRequestBuilder.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/FileTransfers/Find/FindRequestBuilder.cs
new file mode 100644
index 000000000..421bfe7ed
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/FileTransfers/Find/FindRequestBuilder.cs
@@ -0,0 +1,118 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using System.Threading;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.Find
+{
+    /// 
+    /// Builds and executes requests for operations under \fileTransfers\find
+    /// 
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    public partial class FindRequestBuilder : BaseRequestBuilder
+    {
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// Path parameters for the request
+        /// The request adapter to use to execute the requests.
+        public FindRequestBuilder(Dictionary pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/fileTransfers/find{?fileName*}", pathParameters)
+        {
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// The raw URL to use for the request builder.
+        /// The request adapter to use to execute the requests.
+        public FindRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/fileTransfers/find{?fileName*}", rawUrl)
+        {
+        }
+
+        /// 
+        /// Returns whether the specified file is available for download.
+        /// 
+        /// A 
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public async Task GetAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToGetRequestInformation(requestConfiguration);
+            return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Returns whether the specified file is available for download.
+        /// 
+        /// A 
+        /// Cancellation token to use when cancelling requests
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public async Task HeadAsync(Action>? requestConfiguration = default, CancellationToken cancellationToken = default)
+        {
+            var requestInfo = ToHeadRequestInformation(requestConfiguration);
+            return await RequestAdapter.SendPrimitiveAsync(requestInfo, default, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// 
+        /// Returns whether the specified file is available for download.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToGetRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.GET, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            return requestInfo;
+        }
+
+        /// 
+        /// Returns whether the specified file is available for download.
+        /// 
+        /// A 
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        public RequestInformation ToHeadRequestInformation(Action>? requestConfiguration = default)
+        {
+            var requestInfo = new RequestInformation(Method.HEAD, UrlTemplate, PathParameters);
+            requestInfo.Configure(requestConfiguration);
+            return requestInfo;
+        }
+
+        /// 
+        /// Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+        /// 
+        /// A 
+        /// The raw URL to use for the request builder.
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.Find.FindRequestBuilder WithUrl(string rawUrl)
+        {
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.Find.FindRequestBuilder(rawUrl, RequestAdapter);
+        }
+
+        /// 
+        /// Returns whether the specified file is available for download.
+        /// 
+        [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+        public partial class FindRequestBuilderGetQueryParameters 
+        {
+            [QueryParameter("fileName")]
+            public string? FileName { get; set; }
+        }
+
+        /// 
+        /// Returns whether the specified file is available for download.
+        /// 
+        [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+        public partial class FindRequestBuilderHeadQueryParameters 
+        {
+            [QueryParameter("fileName")]
+            public string? FileName { get; set; }
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/MixedControllersClient.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/MixedControllersClient.cs
new file mode 100644
index 000000000..107466452
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/MixedControllersClient.cs
@@ -0,0 +1,68 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Store;
+using Microsoft.Kiota.Abstractions;
+using Microsoft.Kiota.Serialization.Form;
+using Microsoft.Kiota.Serialization.Json;
+using Microsoft.Kiota.Serialization.Multipart;
+using Microsoft.Kiota.Serialization.Text;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode
+{
+    /// 
+    /// The main entry point of the SDK, exposes the configuration and the fluent API.
+    /// 
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    public partial class MixedControllersClient : BaseRequestBuilder
+    {
+        /// The cupOfCoffees property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.CupOfCoffeesRequestBuilder CupOfCoffees
+        {
+            get => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.CupOfCoffees.CupOfCoffeesRequestBuilder(PathParameters, RequestAdapter);
+        }
+
+        /// The emails property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.EmailsRequestBuilder Emails
+        {
+            get => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Emails.EmailsRequestBuilder(PathParameters, RequestAdapter);
+        }
+
+        /// The fileTransfers property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.FileTransfersRequestBuilder FileTransfers
+        {
+            get => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.FileTransfers.FileTransfersRequestBuilder(PathParameters, RequestAdapter);
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        /// The backing store to use for the models.
+        /// The request adapter to use to execute the requests.
+        public MixedControllersClient(IRequestAdapter requestAdapter, IBackingStoreFactory backingStore = default) : base(requestAdapter, "{+baseurl}", new Dictionary())
+        {
+            ApiClientBuilder.RegisterDefaultSerializer();
+            ApiClientBuilder.RegisterDefaultSerializer();
+            ApiClientBuilder.RegisterDefaultSerializer();
+            ApiClientBuilder.RegisterDefaultSerializer();
+            ApiClientBuilder.RegisterDefaultDeserializer();
+            ApiClientBuilder.RegisterDefaultDeserializer();
+            ApiClientBuilder.RegisterDefaultDeserializer();
+            if (string.IsNullOrEmpty(RequestAdapter.BaseUrl))
+            {
+                RequestAdapter.BaseUrl = "http://localhost";
+            }
+            PathParameters.TryAdd("baseurl", RequestAdapter.BaseUrl);
+            RequestAdapter.EnableBackingStore(backingStore);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/AttributesInCupOfCoffeeResponse.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/AttributesInCupOfCoffeeResponse.cs
new file mode 100644
index 000000000..74cab86ec
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/AttributesInCupOfCoffeeResponse.cs
@@ -0,0 +1,68 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class AttributesInCupOfCoffeeResponse : global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.AttributesInResponse, IParsable
+    #pragma warning restore CS1591
+    {
+        /// The hasMilk property
+        public bool? HasMilk
+        {
+            get { return BackingStore?.Get("hasMilk"); }
+            set { BackingStore?.Set("hasMilk", value); }
+        }
+
+        /// The hasSugar property
+        public bool? HasSugar
+        {
+            get { return BackingStore?.Get("hasSugar"); }
+            set { BackingStore?.Set("hasSugar", value); }
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.AttributesInCupOfCoffeeResponse CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.AttributesInCupOfCoffeeResponse();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public override IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>(base.GetFieldDeserializers())
+            {
+                { "hasMilk", n => { HasMilk = n.GetBoolValue(); } },
+                { "hasSugar", n => { HasSugar = n.GetBoolValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public override void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            base.Serialize(writer);
+            writer.WriteBoolValue("hasMilk", HasMilk);
+            writer.WriteBoolValue("hasSugar", HasSugar);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/AttributesInResponse.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/AttributesInResponse.cs
new file mode 100644
index 000000000..9532132b9
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/AttributesInResponse.cs
@@ -0,0 +1,75 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class AttributesInResponse : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The openapiDiscriminator property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceType? OpenapiDiscriminator
+        {
+            get { return BackingStore?.Get("openapi:discriminator"); }
+            set { BackingStore?.Set("openapi:discriminator", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public AttributesInResponse()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.AttributesInResponse CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            var mappingValue = parseNode.GetChildNode("openapi:discriminator")?.GetStringValue();
+            return mappingValue switch
+            {
+                "cupOfCoffees" => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.AttributesInCupOfCoffeeResponse(),
+                _ => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.AttributesInResponse(),
+            };
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "openapi:discriminator", n => { OpenapiDiscriminator = n.GetEnumValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteEnumValue("openapi:discriminator", OpenapiDiscriminator);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/CupOfCoffeeCollectionResponseDocument.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/CupOfCoffeeCollectionResponseDocument.cs
new file mode 100644
index 000000000..6327429d7
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/CupOfCoffeeCollectionResponseDocument.cs
@@ -0,0 +1,97 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class CupOfCoffeeCollectionResponseDocument : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The data property
+        public List? Data
+        {
+            get { return BackingStore?.Get?>("data"); }
+            set { BackingStore?.Set("data", value); }
+        }
+
+        /// The included property
+        public List? Included
+        {
+            get { return BackingStore?.Get?>("included"); }
+            set { BackingStore?.Set("included", value); }
+        }
+
+        /// The links property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceCollectionTopLevelLinks? Links
+        {
+            get { return BackingStore?.Get("links"); }
+            set { BackingStore?.Set("links", value); }
+        }
+
+        /// The meta property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta? Meta
+        {
+            get { return BackingStore?.Get("meta"); }
+            set { BackingStore?.Set("meta", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public CupOfCoffeeCollectionResponseDocument()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.CupOfCoffeeCollectionResponseDocument CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.CupOfCoffeeCollectionResponseDocument();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "data", n => { Data = n.GetCollectionOfObjectValues(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.DataInCupOfCoffeeResponse.CreateFromDiscriminatorValue)?.AsList(); } },
+                { "included", n => { Included = n.GetCollectionOfObjectValues(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceInResponse.CreateFromDiscriminatorValue)?.AsList(); } },
+                { "links", n => { Links = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceCollectionTopLevelLinks.CreateFromDiscriminatorValue); } },
+                { "meta", n => { Meta = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteCollectionOfObjectValues("data", Data);
+            writer.WriteCollectionOfObjectValues("included", Included);
+            writer.WriteObjectValue("links", Links);
+            writer.WriteObjectValue("meta", Meta);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/DataInCupOfCoffeeResponse.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/DataInCupOfCoffeeResponse.cs
new file mode 100644
index 000000000..f67b1c234
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/DataInCupOfCoffeeResponse.cs
@@ -0,0 +1,77 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class DataInCupOfCoffeeResponse : global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceInResponse, IParsable
+    #pragma warning restore CS1591
+    {
+        /// The attributes property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.AttributesInCupOfCoffeeResponse? Attributes
+        {
+            get { return BackingStore?.Get("attributes"); }
+            set { BackingStore?.Set("attributes", value); }
+        }
+
+        /// The id property
+        public string? Id
+        {
+            get { return BackingStore?.Get("id"); }
+            set { BackingStore?.Set("id", value); }
+        }
+
+        /// The links property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceLinks? Links
+        {
+            get { return BackingStore?.Get("links"); }
+            set { BackingStore?.Set("links", value); }
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.DataInCupOfCoffeeResponse CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.DataInCupOfCoffeeResponse();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public override IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>(base.GetFieldDeserializers())
+            {
+                { "attributes", n => { Attributes = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.AttributesInCupOfCoffeeResponse.CreateFromDiscriminatorValue); } },
+                { "id", n => { Id = n.GetStringValue(); } },
+                { "links", n => { Links = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceLinks.CreateFromDiscriminatorValue); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public override void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            base.Serialize(writer);
+            writer.WriteObjectValue("attributes", Attributes);
+            writer.WriteStringValue("id", Id);
+            writer.WriteObjectValue("links", Links);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/Email.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/Email.cs
new file mode 100644
index 000000000..7ee9a1eb9
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/Email.cs
@@ -0,0 +1,105 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class Email : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The email body.
+        public string? Body
+        {
+            get { return BackingStore?.Get("body"); }
+            set { BackingStore?.Set("body", value); }
+        }
+
+        /// The email address of the sender.
+        public string? From
+        {
+            get { return BackingStore?.Get("from"); }
+            set { BackingStore?.Set("from", value); }
+        }
+
+        /// The date/time (in UTC) at which this email was sent.
+        public DateTimeOffset? SentAtUtc
+        {
+            get { return BackingStore?.Get("sentAtUtc"); }
+            set { BackingStore?.Set("sentAtUtc", value); }
+        }
+
+        /// The email subject.
+        public string? Subject
+        {
+            get { return BackingStore?.Get("subject"); }
+            set { BackingStore?.Set("subject", value); }
+        }
+
+        /// The email address of the recipient.
+        public string? To
+        {
+            get { return BackingStore?.Get("to"); }
+            set { BackingStore?.Set("to", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public Email()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Email CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Email();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "body", n => { Body = n.GetStringValue(); } },
+                { "from", n => { From = n.GetStringValue(); } },
+                { "sentAtUtc", n => { SentAtUtc = n.GetDateTimeOffsetValue(); } },
+                { "subject", n => { Subject = n.GetStringValue(); } },
+                { "to", n => { To = n.GetStringValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("body", Body);
+            writer.WriteStringValue("from", From);
+            writer.WriteStringValue("subject", Subject);
+            writer.WriteStringValue("to", To);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorLinks.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorLinks.cs
new file mode 100644
index 000000000..95dc5f1bd
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorLinks.cs
@@ -0,0 +1,79 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class ErrorLinks : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// The about property
+        public string? About
+        {
+            get { return BackingStore?.Get("about"); }
+            set { BackingStore?.Set("about", value); }
+        }
+
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The type property
+        public string? Type
+        {
+            get { return BackingStore?.Get("type"); }
+            set { BackingStore?.Set("type", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public ErrorLinks()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorLinks CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorLinks();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "about", n => { About = n.GetStringValue(); } },
+                { "type", n => { Type = n.GetStringValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("about", About);
+            writer.WriteStringValue("type", Type);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorObject.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorObject.cs
new file mode 100644
index 000000000..e0d4ddbaa
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorObject.cs
@@ -0,0 +1,133 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class ErrorObject : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The code property
+        public string? Code
+        {
+            get { return BackingStore?.Get("code"); }
+            set { BackingStore?.Set("code", value); }
+        }
+
+        /// The detail property
+        public string? Detail
+        {
+            get { return BackingStore?.Get("detail"); }
+            set { BackingStore?.Set("detail", value); }
+        }
+
+        /// The id property
+        public string? Id
+        {
+            get { return BackingStore?.Get("id"); }
+            set { BackingStore?.Set("id", value); }
+        }
+
+        /// The links property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorLinks? Links
+        {
+            get { return BackingStore?.Get("links"); }
+            set { BackingStore?.Set("links", value); }
+        }
+
+        /// The meta property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta? Meta
+        {
+            get { return BackingStore?.Get("meta"); }
+            set { BackingStore?.Set("meta", value); }
+        }
+
+        /// The source property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorSource? Source
+        {
+            get { return BackingStore?.Get("source"); }
+            set { BackingStore?.Set("source", value); }
+        }
+
+        /// The status property
+        public string? Status
+        {
+            get { return BackingStore?.Get("status"); }
+            set { BackingStore?.Set("status", value); }
+        }
+
+        /// The title property
+        public string? Title
+        {
+            get { return BackingStore?.Get("title"); }
+            set { BackingStore?.Set("title", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public ErrorObject()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorObject CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorObject();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "code", n => { Code = n.GetStringValue(); } },
+                { "detail", n => { Detail = n.GetStringValue(); } },
+                { "id", n => { Id = n.GetStringValue(); } },
+                { "links", n => { Links = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorLinks.CreateFromDiscriminatorValue); } },
+                { "meta", n => { Meta = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
+                { "source", n => { Source = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorSource.CreateFromDiscriminatorValue); } },
+                { "status", n => { Status = n.GetStringValue(); } },
+                { "title", n => { Title = n.GetStringValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("code", Code);
+            writer.WriteStringValue("detail", Detail);
+            writer.WriteStringValue("id", Id);
+            writer.WriteObjectValue("links", Links);
+            writer.WriteObjectValue("meta", Meta);
+            writer.WriteObjectValue("source", Source);
+            writer.WriteStringValue("status", Status);
+            writer.WriteStringValue("title", Title);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorResponseDocument.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorResponseDocument.cs
new file mode 100644
index 000000000..87d5b69c0
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorResponseDocument.cs
@@ -0,0 +1,92 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using Microsoft.Kiota.Abstractions;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class ErrorResponseDocument : ApiException, IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The errors property
+        public List? Errors
+        {
+            get { return BackingStore?.Get?>("errors"); }
+            set { BackingStore?.Set("errors", value); }
+        }
+
+        /// The links property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorTopLevelLinks? Links
+        {
+            get { return BackingStore?.Get("links"); }
+            set { BackingStore?.Set("links", value); }
+        }
+
+        /// The primary error message.
+        public override string Message { get => base.Message; }
+
+        /// The meta property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta? Meta
+        {
+            get { return BackingStore?.Get("meta"); }
+            set { BackingStore?.Set("meta", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public ErrorResponseDocument()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorResponseDocument CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorResponseDocument();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "errors", n => { Errors = n.GetCollectionOfObjectValues(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorObject.CreateFromDiscriminatorValue)?.AsList(); } },
+                { "links", n => { Links = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorTopLevelLinks.CreateFromDiscriminatorValue); } },
+                { "meta", n => { Meta = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteCollectionOfObjectValues("errors", Errors);
+            writer.WriteObjectValue("links", Links);
+            writer.WriteObjectValue("meta", Meta);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorSource.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorSource.cs
new file mode 100644
index 000000000..fedf6dd1d
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorSource.cs
@@ -0,0 +1,88 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class ErrorSource : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The header property
+        public string? Header
+        {
+            get { return BackingStore?.Get("header"); }
+            set { BackingStore?.Set("header", value); }
+        }
+
+        /// The parameter property
+        public string? Parameter
+        {
+            get { return BackingStore?.Get("parameter"); }
+            set { BackingStore?.Set("parameter", value); }
+        }
+
+        /// The pointer property
+        public string? Pointer
+        {
+            get { return BackingStore?.Get("pointer"); }
+            set { BackingStore?.Set("pointer", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public ErrorSource()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorSource CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorSource();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "header", n => { Header = n.GetStringValue(); } },
+                { "parameter", n => { Parameter = n.GetStringValue(); } },
+                { "pointer", n => { Pointer = n.GetStringValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("header", Header);
+            writer.WriteStringValue("parameter", Parameter);
+            writer.WriteStringValue("pointer", Pointer);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorTopLevelLinks.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorTopLevelLinks.cs
new file mode 100644
index 000000000..9a1437922
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ErrorTopLevelLinks.cs
@@ -0,0 +1,79 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class ErrorTopLevelLinks : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The describedby property
+        public string? Describedby
+        {
+            get { return BackingStore?.Get("describedby"); }
+            set { BackingStore?.Set("describedby", value); }
+        }
+
+        /// The self property
+        public string? Self
+        {
+            get { return BackingStore?.Get("self"); }
+            set { BackingStore?.Set("self", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public ErrorTopLevelLinks()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorTopLevelLinks CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ErrorTopLevelLinks();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "describedby", n => { Describedby = n.GetStringValue(); } },
+                { "self", n => { Self = n.GetStringValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("describedby", Describedby);
+            writer.WriteStringValue("self", Self);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/HttpValidationProblemDetails.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/HttpValidationProblemDetails.cs
new file mode 100644
index 000000000..186f5be13
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/HttpValidationProblemDetails.cs
@@ -0,0 +1,128 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using Microsoft.Kiota.Abstractions;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class HttpValidationProblemDetails : ApiException, IAdditionalDataHolder, IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
+        public IDictionary AdditionalData
+        {
+            get { return BackingStore.Get>("AdditionalData") ?? new Dictionary(); }
+            set { BackingStore.Set("AdditionalData", value); }
+        }
+
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The detail property
+        public string? Detail
+        {
+            get { return BackingStore?.Get("detail"); }
+            set { BackingStore?.Set("detail", value); }
+        }
+
+        /// The errors property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.HttpValidationProblemDetails_errors? Errors
+        {
+            get { return BackingStore?.Get("errors"); }
+            set { BackingStore?.Set("errors", value); }
+        }
+
+        /// The instance property
+        public string? Instance
+        {
+            get { return BackingStore?.Get("instance"); }
+            set { BackingStore?.Set("instance", value); }
+        }
+
+        /// The primary error message.
+        public override string Message { get => base.Message; }
+
+        /// The status property
+        public int? Status
+        {
+            get { return BackingStore?.Get("status"); }
+            set { BackingStore?.Set("status", value); }
+        }
+
+        /// The title property
+        public string? Title
+        {
+            get { return BackingStore?.Get("title"); }
+            set { BackingStore?.Set("title", value); }
+        }
+
+        /// The type property
+        public string? Type
+        {
+            get { return BackingStore?.Get("type"); }
+            set { BackingStore?.Set("type", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public HttpValidationProblemDetails()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+            AdditionalData = new Dictionary();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.HttpValidationProblemDetails CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.HttpValidationProblemDetails();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "detail", n => { Detail = n.GetStringValue(); } },
+                { "errors", n => { Errors = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.HttpValidationProblemDetails_errors.CreateFromDiscriminatorValue); } },
+                { "instance", n => { Instance = n.GetStringValue(); } },
+                { "status", n => { Status = n.GetIntValue(); } },
+                { "title", n => { Title = n.GetStringValue(); } },
+                { "type", n => { Type = n.GetStringValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("detail", Detail);
+            writer.WriteObjectValue("errors", Errors);
+            writer.WriteStringValue("instance", Instance);
+            writer.WriteIntValue("status", Status);
+            writer.WriteStringValue("title", Title);
+            writer.WriteStringValue("type", Type);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/HttpValidationProblemDetails_errors.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/HttpValidationProblemDetails_errors.cs
new file mode 100644
index 000000000..93e17e8c2
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/HttpValidationProblemDetails_errors.cs
@@ -0,0 +1,70 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class HttpValidationProblemDetails_errors : IAdditionalDataHolder, IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
+        public IDictionary AdditionalData
+        {
+            get { return BackingStore.Get>("AdditionalData") ?? new Dictionary(); }
+            set { BackingStore.Set("AdditionalData", value); }
+        }
+
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public HttpValidationProblemDetails_errors()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+            AdditionalData = new Dictionary();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.HttpValidationProblemDetails_errors CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.HttpValidationProblemDetails_errors();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/Meta.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/Meta.cs
new file mode 100644
index 000000000..3ba5bc356
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/Meta.cs
@@ -0,0 +1,70 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class Meta : IAdditionalDataHolder, IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.
+        public IDictionary AdditionalData
+        {
+            get { return BackingStore.Get>("AdditionalData") ?? new Dictionary(); }
+            set { BackingStore.Set("AdditionalData", value); }
+        }
+
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public Meta()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+            AdditionalData = new Dictionary();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceCollectionTopLevelLinks.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceCollectionTopLevelLinks.cs
new file mode 100644
index 000000000..17e0cc38c
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceCollectionTopLevelLinks.cs
@@ -0,0 +1,115 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class ResourceCollectionTopLevelLinks : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The describedby property
+        public string? Describedby
+        {
+            get { return BackingStore?.Get("describedby"); }
+            set { BackingStore?.Set("describedby", value); }
+        }
+
+        /// The first property
+        public string? First
+        {
+            get { return BackingStore?.Get("first"); }
+            set { BackingStore?.Set("first", value); }
+        }
+
+        /// The last property
+        public string? Last
+        {
+            get { return BackingStore?.Get("last"); }
+            set { BackingStore?.Set("last", value); }
+        }
+
+        /// The next property
+        public string? Next
+        {
+            get { return BackingStore?.Get("next"); }
+            set { BackingStore?.Set("next", value); }
+        }
+
+        /// The prev property
+        public string? Prev
+        {
+            get { return BackingStore?.Get("prev"); }
+            set { BackingStore?.Set("prev", value); }
+        }
+
+        /// The self property
+        public string? Self
+        {
+            get { return BackingStore?.Get("self"); }
+            set { BackingStore?.Set("self", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public ResourceCollectionTopLevelLinks()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceCollectionTopLevelLinks CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceCollectionTopLevelLinks();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "describedby", n => { Describedby = n.GetStringValue(); } },
+                { "first", n => { First = n.GetStringValue(); } },
+                { "last", n => { Last = n.GetStringValue(); } },
+                { "next", n => { Next = n.GetStringValue(); } },
+                { "prev", n => { Prev = n.GetStringValue(); } },
+                { "self", n => { Self = n.GetStringValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("describedby", Describedby);
+            writer.WriteStringValue("first", First);
+            writer.WriteStringValue("last", Last);
+            writer.WriteStringValue("next", Next);
+            writer.WriteStringValue("prev", Prev);
+            writer.WriteStringValue("self", Self);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceInResponse.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceInResponse.cs
new file mode 100644
index 000000000..6482b3f02
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceInResponse.cs
@@ -0,0 +1,84 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class ResourceInResponse : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The meta property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta? Meta
+        {
+            get { return BackingStore?.Get("meta"); }
+            set { BackingStore?.Set("meta", value); }
+        }
+
+        /// The type property
+        public global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceType? Type
+        {
+            get { return BackingStore?.Get("type"); }
+            set { BackingStore?.Set("type", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public ResourceInResponse()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceInResponse CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            var mappingValue = parseNode.GetChildNode("type")?.GetStringValue();
+            return mappingValue switch
+            {
+                "cupOfCoffees" => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.DataInCupOfCoffeeResponse(),
+                _ => new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceInResponse(),
+            };
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "meta", n => { Meta = n.GetObjectValue(global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
+                { "type", n => { Type = n.GetEnumValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteObjectValue("meta", Meta);
+            writer.WriteEnumValue("type", Type);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceLinks.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceLinks.cs
new file mode 100644
index 000000000..901e72ad9
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceLinks.cs
@@ -0,0 +1,70 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+#pragma warning disable CS0618
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Store;
+using System.Collections.Generic;
+using System.IO;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public partial class ResourceLinks : IBackedModel, IParsable
+    #pragma warning restore CS1591
+    {
+        /// Stores model information.
+        public IBackingStore BackingStore { get; private set; }
+
+        /// The self property
+        public string? Self
+        {
+            get { return BackingStore?.Get("self"); }
+            set { BackingStore?.Set("self", value); }
+        }
+
+        /// 
+        /// Instantiates a new  and sets the default values.
+        /// 
+        public ResourceLinks()
+        {
+            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
+        }
+
+        /// 
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// 
+        /// A 
+        /// The parse node to use to read the discriminator value and create the object
+        public static global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceLinks CreateFromDiscriminatorValue(IParseNode parseNode)
+        {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new global::OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.ResourceLinks();
+        }
+
+        /// 
+        /// The deserialization information for the current model
+        /// 
+        /// A IDictionary<string, Action<IParseNode>>
+        public virtual IDictionary> GetFieldDeserializers()
+        {
+            return new Dictionary>
+            {
+                { "self", n => { Self = n.GetStringValue(); } },
+            };
+        }
+
+        /// 
+        /// Serializes information the current object
+        /// 
+        /// Serialization writer to use to serialize this model
+        public virtual void Serialize(ISerializationWriter writer)
+        {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("self", Self);
+        }
+    }
+}
+#pragma warning restore CS0618
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceType.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceType.cs
new file mode 100644
index 000000000..2db9c1959
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/GeneratedCode/Models/ResourceType.cs
@@ -0,0 +1,18 @@
+// 
+#nullable enable
+#pragma warning disable CS8625
+using System.Runtime.Serialization;
+using System;
+namespace OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models
+{
+    [global::System.CodeDom.Compiler.GeneratedCode("Kiota", "1.0.0")]
+    #pragma warning disable CS1591
+    public enum ResourceType
+    #pragma warning restore CS1591
+    {
+        [EnumMember(Value = "cupOfCoffees")]
+        #pragma warning disable CS1591
+        CupOfCoffees,
+        #pragma warning restore CS1591
+    }
+}
diff --git a/test/OpenApiKiotaEndToEndTests/MixedControllers/MixedControllerTests.cs b/test/OpenApiKiotaEndToEndTests/MixedControllers/MixedControllerTests.cs
new file mode 100644
index 000000000..6fac5b747
--- /dev/null
+++ b/test/OpenApiKiotaEndToEndTests/MixedControllers/MixedControllerTests.cs
@@ -0,0 +1,314 @@
+using System.Net;
+using FluentAssertions;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Kiota.Abstractions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Http.HttpClientLibrary;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode;
+using OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models;
+using OpenApiTests.MixedControllers;
+using TestBuildingBlocks;
+using Xunit;
+using Xunit.Abstractions;
+using ClientEmail = OpenApiKiotaEndToEndTests.MixedControllers.GeneratedCode.Models.Email;
+using ServerEmail = OpenApiTests.MixedControllers.Email;
+
+namespace OpenApiKiotaEndToEndTests.MixedControllers;
+
+public sealed class MixedControllerTests : IClassFixture>, IDisposable
+{
+    private readonly IntegrationTestContext _testContext;
+    private readonly TestableHttpClientRequestAdapterFactory _requestAdapterFactory;
+    private readonly MixedControllerFakers _fakers = new();
+
+    public MixedControllerTests(IntegrationTestContext testContext, ITestOutputHelper testOutputHelper)
+    {
+        _testContext = testContext;
+        _requestAdapterFactory = new TestableHttpClientRequestAdapterFactory(testOutputHelper);
+
+        testContext.UseController();
+        testContext.UseController();
+
+        testContext.ConfigureServices(services =>
+        {
+            services.AddSingleton();
+            services.AddSingleton();
+            services.TryAddEnumerable(ServiceDescriptor.Transient());
+        });
+
+        var fileStorage = _testContext.Factory.Services.GetRequiredService();
+        fileStorage.Files.Clear();
+
+        var emailsProvider = _testContext.Factory.Services.GetRequiredService();
+        emailsProvider.SentEmails.Clear();
+    }
+
+    [Fact]
+    public async Task Can_upload_file()
+    {
+        // Arrange
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        byte[] fileContents = "Hello upload"u8.ToArray();
+        using var stream = new MemoryStream();
+        stream.Write(fileContents);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        var requestBody = new MultipartBody();
+        requestBody.AddOrReplacePart("file", "text/plain", stream, "demo-upload.txt");
+
+        // Act
+        string? response = await apiClient.FileTransfers.PostAsync(requestBody);
+
+        // Assert
+        response.Should().Be($"Received file with a size of {fileContents.Length} bytes.");
+    }
+
+    [Fact]
+    public async Task Cannot_upload_empty_file()
+    {
+        // Arrange
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        using var stream = new MemoryStream();
+        var requestBody = new MultipartBody();
+        requestBody.AddOrReplacePart("file", "text/plain", stream, "demo-empty.txt");
+
+        // Act
+        Func action = async () => await apiClient.FileTransfers.PostAsync(requestBody);
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
+        exception.ResponseStatusCode.Should().Be((int)HttpStatusCode.BadRequest);
+    }
+
+    [Fact]
+    public async Task Finds_existing_file()
+    {
+        // Arrange
+        byte[] fileContents = "Hello find"u8.ToArray();
+
+        var storage = _testContext.Factory.Services.GetRequiredService();
+        storage.Files.TryAdd("demo-existing-file.txt", fileContents);
+
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        // Act
+        Func action = async () => await apiClient.FileTransfers.Find.GetAsync(request => request.QueryParameters.FileName = "demo-existing-file.txt");
+
+        // Assert
+        await action.Should().NotThrowAsync();
+    }
+
+    [Fact]
+    public async Task Does_not_find_missing_file()
+    {
+        // Arrange
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        // Act
+        Func action = async () => await apiClient.FileTransfers.Find.GetAsync(request => request.QueryParameters.FileName = "demo-missing-file.txt");
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
+        exception.ResponseStatusCode.Should().Be((int)HttpStatusCode.NotFound);
+    }
+
+    [Fact]
+    public async Task Can_download_file()
+    {
+        // Arrange
+        byte[] fileContents = "Hello download"u8.ToArray();
+
+        var storage = _testContext.Factory.Services.GetRequiredService();
+        storage.Files.TryAdd("demo-download.txt", fileContents);
+
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        // Act
+        await using Stream? response = await apiClient.FileTransfers.GetAsync(request => request.QueryParameters.FileName = "demo-download.txt");
+
+        // Assert
+        response.Should().NotBeNull();
+
+        using var streamReader = new StreamReader(response);
+        string downloadedContents = await streamReader.ReadToEndAsync();
+
+        downloadedContents.Should().Be("Hello download");
+    }
+
+    [Fact]
+    public async Task Cannot_download_missing_file()
+    {
+        // Arrange
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        // Act
+        Func action = async () => await apiClient.FileTransfers.GetAsync(request => request.QueryParameters.FileName = "demo-missing-file.txt");
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
+        exception.ResponseStatusCode.Should().Be((int)HttpStatusCode.NotFound);
+    }
+
+    [Fact]
+    public async Task Can_send_email()
+    {
+        // Arrange
+        var emailsProvider = _testContext.Factory.Services.GetRequiredService();
+
+        ServerEmail newEmail = _fakers.Email.GenerateOne();
+
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        var requestBody = new ClientEmail
+        {
+            Subject = newEmail.Subject,
+            Body = newEmail.Body,
+            From = newEmail.From,
+            To = newEmail.To
+        };
+
+        // Act
+        await apiClient.Emails.Send.PostAsync(requestBody);
+
+        // Assert
+        emailsProvider.SentEmails.Should().HaveCount(1);
+    }
+
+    [Fact]
+    public async Task Cannot_send_email_with_invalid_addresses()
+    {
+        // Arrange
+        ServerEmail newEmail = _fakers.Email.GenerateOne();
+        newEmail.From = "invalid-sender-address";
+        newEmail.To = "invalid-recipient-address";
+
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        var requestBody = new ClientEmail
+        {
+            Subject = newEmail.Subject,
+            Body = newEmail.Body,
+            From = newEmail.From,
+            To = newEmail.To
+        };
+
+        // Act
+        Func action = async () => await apiClient.Emails.Send.PostAsync(requestBody);
+
+        // Assert
+        HttpValidationProblemDetails exception = (await action.Should().ThrowExactlyAsync()).Which;
+
+        exception.Status.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.Type.Should().Be("https://tools.ietf.org/html/rfc9110#section-15.5.1");
+        exception.Title.Should().Be("One or more validation errors occurred.");
+        exception.Detail.Should().BeNull();
+        exception.Instance.Should().BeNull();
+        exception.Errors.Should().NotBeNull();
+
+        IDictionary errors = exception.Errors.AdditionalData.Should().HaveCount(2).And.Subject;
+
+        errors.Should().ContainKey("From").WhoseValue.Should().BeOfType().Subject.GetValue().ToArray().Should().ContainSingle().Which.Should()
+            .BeOfType().Subject.GetValue().Should().Be("The From field is not a valid e-mail address.");
+
+        errors.Should().ContainKey("To").WhoseValue.Should().BeOfType().Subject.GetValue().ToArray().Should().ContainSingle().Which.Should()
+            .BeOfType().Subject.GetValue().Should().Be("The To field is not a valid e-mail address.");
+    }
+
+    [Fact]
+    public async Task Can_get_sent_emails()
+    {
+        // Arrange
+        var timeProvider = _testContext.Factory.Services.GetRequiredService();
+        var emailsProvider = _testContext.Factory.Services.GetRequiredService();
+
+        DateTimeOffset utcNow = timeProvider.GetUtcNow();
+
+        ServerEmail existingEmail = _fakers.Email.GenerateOne();
+        existingEmail.SetSentAt(utcNow.AddHours(-1));
+        emailsProvider.SentEmails.TryAdd(utcNow, existingEmail);
+
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        DateTimeOffset sinceUtc = utcNow.AddHours(-2);
+
+        // Act
+        List? response = await apiClient.Emails.SentSince.GetAsync(request => request.QueryParameters.SinceUtc = sinceUtc);
+
+        // Assert
+        response.Should().HaveCount(1);
+        response.ElementAt(0).Subject.Should().Be(existingEmail.Subject);
+        response.ElementAt(0).Body.Should().Be(existingEmail.Body);
+        response.ElementAt(0).From.Should().Be(existingEmail.From);
+        response.ElementAt(0).To.Should().Be(existingEmail.To);
+        response.ElementAt(0).SentAtUtc.Should().Be(existingEmail.SentAtUtc);
+    }
+
+    [Fact]
+    public async Task Cannot_get_sent_emails_in_future()
+    {
+        // Arrange
+        var timeProvider = _testContext.Factory.Services.GetRequiredService();
+
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        DateTimeOffset sinceUtc = timeProvider.GetUtcNow().AddHours(1);
+
+        // Act
+        Func action = async () => await apiClient.Emails.SentSince.GetAsync(request => request.QueryParameters.SinceUtc = sinceUtc);
+
+        // Assert
+        HttpValidationProblemDetails exception = (await action.Should().ThrowExactlyAsync()).Which;
+
+        exception.Status.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.Type.Should().Be("https://tools.ietf.org/html/rfc9110#section-15.5.1");
+        exception.Title.Should().Be("One or more validation errors occurred.");
+        exception.Detail.Should().BeNull();
+        exception.Instance.Should().BeNull();
+        exception.Errors.Should().NotBeNull();
+
+        IDictionary? errors = exception.Errors.AdditionalData.Should().HaveCount(1).And.Subject;
+
+        errors.Should().ContainKey("sinceUtc").WhoseValue.Should().BeOfType().Subject.GetValue().ToArray().Should().ContainSingle().Which.Should()
+            .BeOfType().Subject.GetValue().Should().Be("The sinceUtc parameter must be in the past.");
+    }
+
+    [Fact]
+    public async Task Can_try_get_sent_emails_in_future()
+    {
+        // Arrange
+        var timeProvider = _testContext.Factory.Services.GetRequiredService();
+
+        using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
+        var apiClient = new MixedControllersClient(requestAdapter);
+
+        DateTimeOffset sinceUtc = timeProvider.GetUtcNow().AddHours(1);
+
+        // Act
+        Func action = async () => await apiClient.Emails.SentSince.HeadAsync(request => request.QueryParameters.SinceUtc = sinceUtc);
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
+
+        exception.ResponseStatusCode.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.ResponseHeaders.Should().BeEmpty();
+    }
+
+    public void Dispose()
+    {
+        _requestAdapterFactory.Dispose();
+    }
+}
diff --git a/test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj b/test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj
index ca0db6221..04e8e209d 100644
--- a/test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj
+++ b/test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj
@@ -51,6 +51,13 @@
       ./%(Name)/GeneratedCode
       $(JsonApiExtraArguments)
     
+    
+      MixedControllers
+      $(MSBuildProjectName).%(Name).GeneratedCode
+      %(Name)Client
+      ./%(Name)/GeneratedCode
+      $(JsonApiExtraArguments)
+    
     
       ModelStateValidation
       $(MSBuildProjectName).%(Name).GeneratedCode
diff --git a/test/OpenApiNSwagEndToEndTests/AtomicOperations/MediaTypeTests.cs b/test/OpenApiNSwagEndToEndTests/AtomicOperations/MediaTypeTests.cs
new file mode 100644
index 000000000..208f81b0d
--- /dev/null
+++ b/test/OpenApiNSwagEndToEndTests/AtomicOperations/MediaTypeTests.cs
@@ -0,0 +1,83 @@
+using System.Net;
+using FluentAssertions;
+using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCore.Serialization.Objects;
+using OpenApiTests;
+using OpenApiTests.AtomicOperations;
+using TestBuildingBlocks;
+using Xunit;
+
+namespace OpenApiNSwagEndToEndTests.AtomicOperations;
+
+public sealed class MediaTypeTests : IClassFixture, OperationsDbContext>>
+{
+    private readonly IntegrationTestContext, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers;
+
+    public MediaTypeTests(IntegrationTestContext, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController();
+
+        _fakers = new OperationsFakers(testContext.Factory.Services);
+    }
+
+    [Fact]
+    public async Task Can_create_resource_with_default_media_type()
+    {
+        // Arrange
+        Teacher newTeacher = _fakers.Teacher.GenerateOne();
+
+        var requestBody = new
+        {
+            atomic__operations = new[]
+            {
+                new
+                {
+                    op = "add",
+                    data = new
+                    {
+                        type = "teachers",
+                        attributes = new
+                        {
+                            name = newTeacher.Name,
+                            emailAddress = newTeacher.EmailAddress
+                        }
+                    }
+                }
+            }
+        };
+
+        const string route = "/operations";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync(route, requestBody);
+
+        // Assert
+        httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
+
+        httpResponse.Content.Headers.ContentType.Should().NotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be(JsonApiMediaType.AtomicOperations.ToString());
+
+        responseDocument.Results.Should().HaveCount(1);
+
+        responseDocument.Results[0].Data.SingleValue.RefShould().NotBeNull().And.Subject.With(resource =>
+        {
+            resource.Type.Should().Be("teachers");
+            resource.Attributes.Should().ContainKey("name").WhoseValue.Should().Be(newTeacher.Name);
+            resource.Attributes.Should().ContainKey("emailAddress").WhoseValue.Should().Be(newTeacher.EmailAddress);
+            resource.Relationships.Should().BeNull();
+        });
+
+        long newTeacherId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.Should().NotBeNull().And.Subject);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Teacher teacherInDatabase = await dbContext.Teachers.FirstWithIdAsync(newTeacherId);
+
+            teacherInDatabase.Name.Should().Be(newTeacher.Name);
+            teacherInDatabase.EmailAddress.Should().Be(newTeacher.EmailAddress);
+        });
+    }
+}
diff --git a/test/OpenApiNSwagEndToEndTests/MixedControllers/MixedControllerTests.cs b/test/OpenApiNSwagEndToEndTests/MixedControllers/MixedControllerTests.cs
new file mode 100644
index 000000000..ee98280ae
--- /dev/null
+++ b/test/OpenApiNSwagEndToEndTests/MixedControllers/MixedControllerTests.cs
@@ -0,0 +1,316 @@
+using System.Net;
+using FluentAssertions;
+using JsonApiDotNetCore.OpenApi.Client.NSwag;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using OpenApiNSwagEndToEndTests.MixedControllers.GeneratedCode;
+using OpenApiTests.MixedControllers;
+using TestBuildingBlocks;
+using Xunit;
+using Xunit.Abstractions;
+using ClientEmail = OpenApiNSwagEndToEndTests.MixedControllers.GeneratedCode.Email;
+using ServerEmail = OpenApiTests.MixedControllers.Email;
+
+namespace OpenApiNSwagEndToEndTests.MixedControllers;
+
+public sealed class MixedControllerTests : IClassFixture>, IDisposable
+{
+    private readonly IntegrationTestContext _testContext;
+    private readonly XUnitLogHttpMessageHandler _logHttpMessageHandler;
+    private readonly MixedControllerFakers _fakers = new();
+
+    public MixedControllerTests(IntegrationTestContext testContext, ITestOutputHelper testOutputHelper)
+    {
+        _testContext = testContext;
+        _logHttpMessageHandler = new XUnitLogHttpMessageHandler(testOutputHelper);
+
+        testContext.UseController();
+        testContext.UseController();
+
+        testContext.ConfigureServices(services =>
+        {
+            services.AddSingleton();
+            services.AddSingleton();
+            services.TryAddEnumerable(ServiceDescriptor.Transient());
+        });
+
+        var fileStorage = _testContext.Factory.Services.GetRequiredService();
+        fileStorage.Files.Clear();
+
+        var emailsProvider = _testContext.Factory.Services.GetRequiredService();
+        emailsProvider.SentEmails.Clear();
+    }
+
+    [Fact]
+    public async Task Can_upload_file()
+    {
+        // Arrange
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        byte[] fileContents = "Hello upload"u8.ToArray();
+        using var stream = new MemoryStream();
+        stream.Write(fileContents);
+        stream.Seek(0, SeekOrigin.Begin);
+        var fileParameter = new FileParameter(stream, "demo-upload.txt", "text/plain");
+
+        // Act
+        string response = await apiClient.UploadAsync(fileParameter);
+
+        // Assert
+        response.Should().Be($"Received file with a size of {fileContents.Length} bytes.");
+    }
+
+    [Fact]
+    public async Task Cannot_upload_empty_file()
+    {
+        // Arrange
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        using var stream = new MemoryStream();
+        var fileParameter = new FileParameter(stream, "demo-empty.txt", "text/plain");
+
+        // Act
+        Func action = async () => await apiClient.UploadAsync(fileParameter);
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
+
+        exception.StatusCode.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.Message.Should().Be("HTTP 400: Bad Request");
+        exception.Response.Should().Be("Empty files cannot be uploaded.");
+    }
+
+    [Fact]
+    public async Task Finds_existing_file()
+    {
+        // Arrange
+        byte[] fileContents = "Hello find"u8.ToArray();
+
+        var storage = _testContext.Factory.Services.GetRequiredService();
+        storage.Files.TryAdd("demo-existing-file.txt", fileContents);
+
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        // Act
+        Func action = async () => await apiClient.ExistsAsync("demo-existing-file.txt");
+
+        // Assert
+        await action.Should().NotThrowAsync();
+    }
+
+    [Fact]
+    public async Task Does_not_find_missing_file()
+    {
+        // Arrange
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        // Act
+        Func action = async () => await apiClient.ExistsAsync("demo-missing-file.txt");
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
+
+        exception.StatusCode.Should().Be((int)HttpStatusCode.NotFound);
+        exception.Message.Should().Be("HTTP 404: Not Found");
+        exception.Response.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_download_file()
+    {
+        // Arrange
+        byte[] fileContents = "Hello download"u8.ToArray();
+
+        var storage = _testContext.Factory.Services.GetRequiredService();
+        storage.Files.TryAdd("demo-download.txt", fileContents);
+
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        // Act
+        using FileResponse response = await apiClient.DownloadAsync("demo-download.txt");
+
+        // Assert
+        response.StatusCode.Should().Be((int)HttpStatusCode.OK);
+        response.Headers.Should().ContainKey("Content-Type").WhoseValue.Should().ContainSingle().Which.Should().Be("application/octet-stream");
+        response.Headers.Should().ContainKey("Content-Length").WhoseValue.Should().ContainSingle().Which.Should().Be(fileContents.Length.ToString());
+
+        using var streamReader = new StreamReader(response.Stream);
+        string downloadedContents = await streamReader.ReadToEndAsync();
+
+        downloadedContents.Should().Be("Hello download");
+    }
+
+    [Fact]
+    public async Task Cannot_download_missing_file()
+    {
+        // Arrange
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        // Act
+        Func action = async () => await apiClient.DownloadAsync("demo-missing-file.txt");
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
+
+        exception.StatusCode.Should().Be((int)HttpStatusCode.NotFound);
+        exception.Message.Should().Be("HTTP 404: Not Found");
+        exception.Response.Should().Be("The file 'demo-missing-file.txt' does not exist.");
+    }
+
+    [Fact]
+    public async Task Can_send_email()
+    {
+        // Arrange
+        var emailsProvider = _testContext.Factory.Services.GetRequiredService();
+
+        ServerEmail newEmail = _fakers.Email.GenerateOne();
+
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        var requestBody = new ClientEmail
+        {
+            Subject = newEmail.Subject,
+            Body = newEmail.Body,
+            From = newEmail.From,
+            To = newEmail.To
+        };
+
+        // Act
+        await apiClient.SendEmailAsync(requestBody);
+
+        // Assert
+        emailsProvider.SentEmails.Should().HaveCount(1);
+    }
+
+    [Fact]
+    public async Task Cannot_send_email_with_invalid_addresses()
+    {
+        // Arrange
+        ServerEmail newEmail = _fakers.Email.GenerateOne();
+        newEmail.From = "invalid-sender-address";
+        newEmail.To = "invalid-recipient-address";
+
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        var requestBody = new ClientEmail
+        {
+            Subject = newEmail.Subject,
+            Body = newEmail.Body,
+            From = newEmail.From,
+            To = newEmail.To
+        };
+
+        // Act
+        Func action = async () => await apiClient.SendEmailAsync(requestBody);
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync>()).Which;
+
+        exception.StatusCode.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.Message.Should().Be("HTTP 400: Bad Request");
+        exception.Result.Status.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.Result.Type.Should().Be("https://tools.ietf.org/html/rfc9110#section-15.5.1");
+        exception.Result.Title.Should().Be("One or more validation errors occurred.");
+        exception.Result.Detail.Should().BeNull();
+        exception.Result.Instance.Should().BeNull();
+
+        IDictionary> errors = exception.Result.Errors.Should().HaveCount(2).And.Subject;
+        errors.Should().ContainKey("From").WhoseValue.Should().ContainSingle().Which.Should().Be("The From field is not a valid e-mail address.");
+        errors.Should().ContainKey("To").WhoseValue.Should().ContainSingle().Which.Should().Be("The To field is not a valid e-mail address.");
+    }
+
+    [Fact]
+    public async Task Can_get_sent_emails()
+    {
+        // Arrange
+        var timeProvider = _testContext.Factory.Services.GetRequiredService();
+        var emailsProvider = _testContext.Factory.Services.GetRequiredService();
+
+        DateTimeOffset utcNow = timeProvider.GetUtcNow();
+
+        ServerEmail existingEmail = _fakers.Email.GenerateOne();
+        existingEmail.SetSentAt(utcNow.AddHours(-1));
+        emailsProvider.SentEmails.TryAdd(utcNow, existingEmail);
+
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        DateTimeOffset sinceUtc = utcNow.AddHours(-2);
+
+        // Act
+        ICollection response = await apiClient.GetSentSinceAsync(sinceUtc);
+
+        // Assert
+        response.Should().HaveCount(1);
+        response.ElementAt(0).Subject.Should().Be(existingEmail.Subject);
+        response.ElementAt(0).Body.Should().Be(existingEmail.Body);
+        response.ElementAt(0).From.Should().Be(existingEmail.From);
+        response.ElementAt(0).To.Should().Be(existingEmail.To);
+        response.ElementAt(0).SentAtUtc.Should().Be(existingEmail.SentAtUtc);
+    }
+
+    [Fact]
+    public async Task Cannot_get_sent_emails_in_future()
+    {
+        // Arrange
+        var timeProvider = _testContext.Factory.Services.GetRequiredService();
+
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        DateTimeOffset sinceUtc = timeProvider.GetUtcNow().AddHours(1);
+
+        // Act
+        Func action = async () => await apiClient.GetSentSinceAsync(sinceUtc);
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync>()).Which;
+
+        exception.StatusCode.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.Message.Should().Be("HTTP 400: Bad Request");
+        exception.Result.Status.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.Result.Type.Should().Be("https://tools.ietf.org/html/rfc9110#section-15.5.1");
+        exception.Result.Title.Should().Be("One or more validation errors occurred.");
+        exception.Result.Detail.Should().BeNull();
+        exception.Result.Instance.Should().BeNull();
+
+        IDictionary> errors = exception.Result.Errors.Should().HaveCount(1).And.Subject;
+        errors.Should().ContainKey("sinceUtc").WhoseValue.Should().ContainSingle().Which.Should().Be("The sinceUtc parameter must be in the past.");
+    }
+
+    [Fact]
+    public async Task Can_try_get_sent_emails_in_future()
+    {
+        // Arrange
+        var timeProvider = _testContext.Factory.Services.GetRequiredService();
+
+        using HttpClient httpClient = _testContext.Factory.CreateDefaultClient(_logHttpMessageHandler);
+        var apiClient = new MixedControllersClient(httpClient);
+
+        DateTimeOffset sinceUtc = timeProvider.GetUtcNow().AddHours(1);
+
+        // Act
+        Func action = async () => await apiClient.TryGetSentSinceAsync(sinceUtc);
+
+        // Assert
+        ApiException exception = (await action.Should().ThrowExactlyAsync()).Which;
+
+        exception.StatusCode.Should().Be((int)HttpStatusCode.BadRequest);
+        exception.Message.Should().Be("HTTP 400: Bad Request");
+        exception.Response.Should().BeNull();
+    }
+
+    public void Dispose()
+    {
+        _logHttpMessageHandler.Dispose();
+    }
+}
diff --git a/test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj b/test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj
index 2fc34289f..74bde91b8 100644
--- a/test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj
+++ b/test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj
@@ -65,6 +65,12 @@
       %(Name)Client
       %(ClassName).cs
     
+    
+      MixedControllers
+      $(MSBuildProjectName).%(Name).GeneratedCode
+      %(Name)Client
+      %(ClassName).cs
+    
     
       AtomicOperations
       $(MSBuildProjectName).%(Name).GeneratedCode
diff --git a/test/OpenApiNSwagEndToEndTests/RestrictedControllers/MediaTypeTests.cs b/test/OpenApiNSwagEndToEndTests/RestrictedControllers/MediaTypeTests.cs
new file mode 100644
index 000000000..211c49846
--- /dev/null
+++ b/test/OpenApiNSwagEndToEndTests/RestrictedControllers/MediaTypeTests.cs
@@ -0,0 +1,115 @@
+using System.Net;
+using FluentAssertions;
+using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCore.Serialization.Objects;
+using Microsoft.EntityFrameworkCore;
+using OpenApiTests;
+using OpenApiTests.RestrictedControllers;
+using TestBuildingBlocks;
+using Xunit;
+
+namespace OpenApiNSwagEndToEndTests.RestrictedControllers;
+
+public sealed class MediaTypeTests : IClassFixture, RestrictionDbContext>>
+{
+    private readonly IntegrationTestContext, RestrictionDbContext> _testContext;
+    private readonly RestrictionFakers _fakers = new();
+
+    public MediaTypeTests(IntegrationTestContext, RestrictionDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController();
+    }
+
+    [Fact]
+    public async Task Can_create_resource_with_default_media_type()
+    {
+        // Arrange
+        DataStream existingVideoStream = _fakers.DataStream.GenerateOne();
+        DataStream existingAudioStream = _fakers.DataStream.GenerateOne();
+        WriteOnlyChannel newChannel = _fakers.WriteOnlyChannel.GenerateOne();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.DataStreams.AddRange(existingVideoStream, existingAudioStream);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "writeOnlyChannels",
+                attributes = new
+                {
+                    name = newChannel.Name,
+                    isAdultOnly = newChannel.IsAdultOnly
+                },
+                relationships = new
+                {
+                    videoStream = new
+                    {
+                        data = new
+                        {
+                            type = "dataStreams",
+                            id = existingVideoStream.StringId
+                        }
+                    },
+                    audioStreams = new
+                    {
+                        data = new[]
+                        {
+                            new
+                            {
+                                type = "dataStreams",
+                                id = existingAudioStream.StringId
+                            }
+                        }
+                    }
+                }
+            }
+        };
+
+        const string route = "/writeOnlyChannels";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync(route, requestBody);
+
+        // Assert
+        httpResponse.ShouldHaveStatusCode(HttpStatusCode.Created);
+
+        httpResponse.Content.Headers.ContentType.Should().NotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be(JsonApiMediaType.Default.ToString());
+
+        responseDocument.Data.SingleValue.Should().NotBeNull();
+        responseDocument.Data.SingleValue.Attributes.Should().NotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.Should().NotBeEmpty();
+
+        long newChannelId = long.Parse(responseDocument.Data.SingleValue.Id.Should().NotBeNull().And.Subject);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
+
+            WriteOnlyChannel channelInDatabase = await dbContext.WriteOnlyChannels
+                .Include(channel => channel.VideoStream)
+                .Include(channel => channel.AudioStreams)
+                .FirstWithIdAsync(newChannelId);
+
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
+
+            channelInDatabase.Name.Should().Be(newChannel.Name);
+            channelInDatabase.IsCommercial.Should().BeNull();
+            channelInDatabase.IsAdultOnly.Should().Be(newChannel.IsAdultOnly);
+
+            channelInDatabase.VideoStream.Should().NotBeNull();
+            channelInDatabase.VideoStream.Id.Should().Be(existingVideoStream.Id);
+
+            channelInDatabase.AudioStreams.Should().HaveCount(1);
+            channelInDatabase.AudioStreams.ElementAt(0).Id.Should().Be(existingAudioStream.Id);
+        });
+    }
+}
diff --git a/test/OpenApiTests/Documentation/DocumentationStartup.cs b/test/OpenApiTests/Documentation/DocumentationStartup.cs
index 318343f24..2e6aaa78c 100644
--- a/test/OpenApiTests/Documentation/DocumentationStartup.cs
+++ b/test/OpenApiTests/Documentation/DocumentationStartup.cs
@@ -11,15 +11,17 @@ namespace OpenApiTests.Documentation;
 public sealed class DocumentationStartup : OpenApiStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.ClientIdGeneration = ClientIdGenerationMode.Allowed;
     }
 
-    protected override void SetupSwaggerGenAction(SwaggerGenOptions options)
+    protected override void ConfigureSwaggerGenOptions(SwaggerGenOptions options)
     {
+        base.ConfigureSwaggerGenOptions(options);
+
         options.SwaggerDoc("v1", new OpenApiInfo
         {
             Version = "v1",
@@ -36,7 +38,5 @@ protected override void SetupSwaggerGenAction(SwaggerGenOptions options)
                 Url = new Uri("https://licenses.nuget.org/MIT")
             }
         });
-
-        base.SetupSwaggerGenAction(options);
     }
 }
diff --git a/test/OpenApiTests/LegacyOpenApi/LegacyStartup.cs b/test/OpenApiTests/LegacyOpenApi/LegacyStartup.cs
index 0888be0e1..4498a579c 100644
--- a/test/OpenApiTests/LegacyOpenApi/LegacyStartup.cs
+++ b/test/OpenApiTests/LegacyOpenApi/LegacyStartup.cs
@@ -11,9 +11,9 @@ namespace OpenApiTests.LegacyOpenApi;
 public sealed class LegacyStartup : OpenApiStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.Namespace = "api";
         options.DefaultAttrCapabilities = AttrCapabilities.AllowView;
diff --git a/test/OpenApiTests/MixedControllers/CoffeeDbContext.cs b/test/OpenApiTests/MixedControllers/CoffeeDbContext.cs
new file mode 100644
index 000000000..e4ee84cc8
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/CoffeeDbContext.cs
@@ -0,0 +1,12 @@
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
+using TestBuildingBlocks;
+
+namespace OpenApiTests.MixedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class CoffeeDbContext(DbContextOptions options)
+    : TestableDbContext(options)
+{
+    public DbSet CupsOfCoffee => Set();
+}
diff --git a/test/OpenApiTests/MixedControllers/CoffeeSummary.cs b/test/OpenApiTests/MixedControllers/CoffeeSummary.cs
new file mode 100644
index 000000000..92e56afdf
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/CoffeeSummary.cs
@@ -0,0 +1,26 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace OpenApiTests.MixedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "OpenApiTests.MixedControllers", GenerateControllerEndpoints = JsonApiEndpoints.None)]
+public sealed class CoffeeSummary : Identifiable
+{
+    [Attr]
+    public int TotalCount { get; set; }
+
+    [Attr]
+    public int BlackCount { get; set; }
+
+    [Attr]
+    public int OnlySugarCount { get; set; }
+
+    [Attr]
+    public int OnlyMilkCount { get; set; }
+
+    [Attr]
+    public int SugarWithMilkCount { get; set; }
+}
diff --git a/test/OpenApiTests/MixedControllers/CoffeeSummaryController.cs b/test/OpenApiTests/MixedControllers/CoffeeSummaryController.cs
new file mode 100644
index 000000000..84f552800
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/CoffeeSummaryController.cs
@@ -0,0 +1,85 @@
+using System.Net;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Errors;
+using JsonApiDotNetCore.Serialization.Objects;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace OpenApiTests.MixedControllers;
+
+public sealed class CoffeeSummaryController : BaseJsonApiController
+{
+    private readonly CoffeeDbContext _dbContext;
+
+    public CoffeeSummaryController(CoffeeDbContext dbContext, IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory)
+        : base(options, resourceGraph, loggerFactory, null, null)
+    {
+        ArgumentNullException.ThrowIfNull(dbContext);
+
+        _dbContext = dbContext;
+    }
+
+    [HttpGet("summary", Name = "get-coffee-summary")]
+    [HttpHead("summary", Name = "head-coffee-summary")]
+    [EndpointDescription("Summarizes all cups of coffee, indicating their ingredients.")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task GetSummaryAsync(CancellationToken cancellationToken)
+    {
+        var summary = new CoffeeSummary
+        {
+            Id = 1
+        };
+
+        foreach (CupOfCoffee cupOfCoffee in await _dbContext.CupsOfCoffee.ToArrayAsync(cancellationToken))
+        {
+            bool hasSugar = cupOfCoffee.HasSugar.GetValueOrDefault();
+            bool hasMilk = cupOfCoffee.HasMilk.GetValueOrDefault();
+
+            switch (hasSugar, hasMilk)
+            {
+                case (false, false):
+                {
+                    summary.BlackCount++;
+                    break;
+                }
+                case (false, true):
+                {
+                    summary.OnlyMilkCount++;
+                    break;
+                }
+                case (true, false):
+                {
+                    summary.OnlySugarCount++;
+                    break;
+                }
+                case (true, true):
+                {
+                    summary.SugarWithMilkCount++;
+                    break;
+                }
+            }
+
+            summary.TotalCount++;
+        }
+
+        return summary;
+    }
+
+    [HttpDelete("only-milk", Name = "delete-only-milk")]
+    [EndpointDescription("Deletes all cups of coffee with milk, but no sugar.")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task DeleteOnlyMilkAsync(CancellationToken cancellationToken)
+    {
+        int numDeleted = await _dbContext.CupsOfCoffee.Where(cupOfCoffee => cupOfCoffee.HasMilk == true && cupOfCoffee.HasSugar != true)
+            .ExecuteDeleteAsync(cancellationToken);
+
+        if (numDeleted == 0)
+        {
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.NotFound));
+        }
+    }
+}
diff --git a/test/OpenApiTests/MixedControllers/CupOfCoffee.cs b/test/OpenApiTests/MixedControllers/CupOfCoffee.cs
new file mode 100644
index 000000000..ec16388f6
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/CupOfCoffee.cs
@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace OpenApiTests.MixedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "OpenApiTests.MixedControllers", GenerateControllerEndpoints = JsonApiEndpoints.GetCollection | JsonApiEndpoints.Delete)]
+public sealed class CupOfCoffee : Identifiable
+{
+    [Attr]
+    [Required]
+    public bool? HasSugar { get; set; }
+
+    [Attr]
+    [Required]
+    public bool? HasMilk { get; set; }
+}
diff --git a/test/OpenApiTests/MixedControllers/Email.cs b/test/OpenApiTests/MixedControllers/Email.cs
new file mode 100644
index 000000000..5de104114
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/Email.cs
@@ -0,0 +1,41 @@
+using System.ComponentModel.DataAnnotations;
+using JetBrains.Annotations;
+
+namespace OpenApiTests.MixedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed record Email
+{
+    /// 
+    /// The email subject.
+    /// 
+    [MaxLength(255)]
+    public required string Subject { get; set; }
+
+    /// 
+    /// The email body.
+    /// 
+    public required string Body { get; set; }
+
+    /// 
+    /// The email address of the sender.
+    /// 
+    [EmailAddress]
+    public required string From { get; set; }
+
+    /// 
+    /// The email address of the recipient.
+    /// 
+    [EmailAddress]
+    public required string To { get; set; }
+
+    /// 
+    /// The date/time (in UTC) at which this email was sent.
+    /// 
+    public DateTimeOffset SentAtUtc { get; private set; }
+
+    public void SetSentAt(DateTimeOffset utcValue)
+    {
+        SentAtUtc = utcValue;
+    }
+}
diff --git a/test/OpenApiTests/MixedControllers/FileTransferController.cs b/test/OpenApiTests/MixedControllers/FileTransferController.cs
new file mode 100644
index 000000000..42d974836
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/FileTransferController.cs
@@ -0,0 +1,68 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace OpenApiTests.MixedControllers;
+
+[Route("fileTransfers")]
+[Tags("fileTransfers")]
+public sealed class FileTransferController : ControllerBase
+{
+    private const string BinaryContentType = "application/octet-stream";
+
+    private readonly InMemoryFileStorage _inMemoryFileStorage;
+
+    public FileTransferController(InMemoryFileStorage inMemoryFileStorage)
+    {
+        ArgumentNullException.ThrowIfNull(inMemoryFileStorage);
+
+        _inMemoryFileStorage = inMemoryFileStorage;
+    }
+
+    [HttpPost(Name = "upload")]
+    [EndpointDescription("Uploads a file. Returns HTTP 400 if the file is empty.")]
+    [ProducesResponseType(StatusCodes.Status200OK, "text/plain")]
+    [ProducesResponseType(typeof(void), StatusCodes.Status400BadRequest)]
+    public async Task UploadAsync(IFormFile? file)
+    {
+        if (file?.Length > 0)
+        {
+            byte[] fileContents;
+
+            using (var stream = new MemoryStream())
+            {
+                await file.CopyToAsync(stream);
+                fileContents = stream.ToArray();
+            }
+
+            _inMemoryFileStorage.Files.AddOrUpdate(file.FileName, _ => fileContents, (_, _) => fileContents);
+            return Ok($"Received file with a size of {file.Length} bytes.");
+        }
+
+        return BadRequest("Empty files cannot be uploaded.");
+    }
+
+    [HttpGet("find", Name = "exists")]
+    [HttpHead("find", Name = "tryExists")]
+    [EndpointDescription("Returns whether the specified file is available for download.")]
+    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(void), StatusCodes.Status404NotFound)]
+    public IActionResult Exists(string fileName)
+    {
+        return _inMemoryFileStorage.Files.ContainsKey(fileName) ? Ok() : NotFound();
+    }
+
+    [HttpGet(Name = "download")]
+    [HttpHead(Name = "tryDownload")]
+    [EndpointDescription("Downloads the file with the specified name. Returns HTTP 404 if not found.")]
+    [ProducesResponseType(StatusCodes.Status200OK, BinaryContentType)]
+    [ProducesResponseType(typeof(void), StatusCodes.Status404NotFound)]
+    public IActionResult Download(string fileName)
+    {
+        if (_inMemoryFileStorage.Files.TryGetValue(fileName, out byte[]? fileContents))
+        {
+            return File(fileContents, BinaryContentType);
+        }
+
+        return NotFound($"The file '{fileName}' does not exist.");
+    }
+}
diff --git a/test/OpenApiTests/MixedControllers/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/MixedControllers/GeneratedSwagger/swagger.g.json
new file mode 100644
index 000000000..7b8fc1483
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/GeneratedSwagger/swagger.g.json
@@ -0,0 +1,847 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "OpenApiTests",
+    "version": "1.0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost"
+    }
+  ],
+  "paths": {
+    "/cupOfCoffees": {
+      "get": {
+        "tags": [
+          "cupOfCoffees"
+        ],
+        "summary": "Retrieves a collection of cupOfCoffees.",
+        "operationId": "getCupOfCoffeeCollection",
+        "parameters": [
+          {
+            "name": "query",
+            "in": "query",
+            "description": "For syntax, see the documentation for the [`include`](https://www.jsonapi.net/usage/reading/including-relationships.html)/[`filter`](https://www.jsonapi.net/usage/reading/filtering.html)/[`sort`](https://www.jsonapi.net/usage/reading/sorting.html)/[`page`](https://www.jsonapi.net/usage/reading/pagination.html)/[`fields`](https://www.jsonapi.net/usage/reading/sparse-fieldset-selection.html) query string parameters.",
+            "schema": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string",
+                "nullable": true
+              },
+              "example": ""
+            }
+          },
+          {
+            "name": "If-None-Match",
+            "in": "header",
+            "description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully returns the found cupOfCoffees, or an empty array if none were found.",
+            "headers": {
+              "ETag": {
+                "description": "A fingerprint of the HTTP response, which can be used in an If-None-Match header to only fetch changes.",
+                "required": true,
+                "schema": {
+                  "type": "string"
+                }
+              }
+            },
+            "content": {
+              "application/vnd.api+json; ext=openapi": {
+                "schema": {
+                  "$ref": "#/components/schemas/cupOfCoffeeCollectionResponseDocument"
+                }
+              }
+            }
+          },
+          "304": {
+            "description": "The fingerprint of the HTTP response matches one of the ETags from the incoming If-None-Match header.",
+            "headers": {
+              "ETag": {
+                "description": "A fingerprint of the HTTP response, which can be used in an If-None-Match header to only fetch changes.",
+                "required": true,
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The query string is invalid.",
+            "content": {
+              "application/vnd.api+json; ext=openapi": {
+                "schema": {
+                  "$ref": "#/components/schemas/errorResponseDocument"
+                }
+              }
+            }
+          }
+        }
+      },
+      "head": {
+        "tags": [
+          "cupOfCoffees"
+        ],
+        "summary": "Retrieves a collection of cupOfCoffees without returning them.",
+        "description": "Compare the returned ETag HTTP header with an earlier one to determine if the response has changed since it was fetched.",
+        "operationId": "headCupOfCoffeeCollection",
+        "parameters": [
+          {
+            "name": "query",
+            "in": "query",
+            "description": "For syntax, see the documentation for the [`include`](https://www.jsonapi.net/usage/reading/including-relationships.html)/[`filter`](https://www.jsonapi.net/usage/reading/filtering.html)/[`sort`](https://www.jsonapi.net/usage/reading/sorting.html)/[`page`](https://www.jsonapi.net/usage/reading/pagination.html)/[`fields`](https://www.jsonapi.net/usage/reading/sparse-fieldset-selection.html) query string parameters.",
+            "schema": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string",
+                "nullable": true
+              },
+              "example": ""
+            }
+          },
+          {
+            "name": "If-None-Match",
+            "in": "header",
+            "description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The operation completed successfully.",
+            "headers": {
+              "ETag": {
+                "description": "A fingerprint of the HTTP response, which can be used in an If-None-Match header to only fetch changes.",
+                "required": true,
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "Content-Length": {
+                "description": "Size of the HTTP response body, in bytes.",
+                "required": true,
+                "schema": {
+                  "type": "integer",
+                  "format": "int64"
+                }
+              }
+            }
+          },
+          "304": {
+            "description": "The fingerprint of the HTTP response matches one of the ETags from the incoming If-None-Match header.",
+            "headers": {
+              "ETag": {
+                "description": "A fingerprint of the HTTP response, which can be used in an If-None-Match header to only fetch changes.",
+                "required": true,
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The query string is invalid."
+          }
+        }
+      }
+    },
+    "/cupOfCoffees/{id}": {
+      "delete": {
+        "tags": [
+          "cupOfCoffees"
+        ],
+        "summary": "Deletes an existing cupOfCoffee by its identifier.",
+        "operationId": "deleteCupOfCoffee",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "The identifier of the cupOfCoffee to delete.",
+            "required": true,
+            "schema": {
+              "minLength": 1,
+              "type": "string",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "The cupOfCoffee was successfully deleted."
+          },
+          "404": {
+            "description": "The cupOfCoffee does not exist.",
+            "content": {
+              "application/vnd.api+json; ext=openapi": {
+                "schema": {
+                  "$ref": "#/components/schemas/errorResponseDocument"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/emails/send": {
+      "post": {
+        "tags": [
+          "emails"
+        ],
+        "description": "Sends an email to the specified recipient.",
+        "operationId": "sendEmail",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/email"
+                  }
+                ],
+                "description": "The email to send."
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/problem+json": {
+                "schema": {
+                  "$ref": "#/components/schemas/httpValidationProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/emails/sent-since": {
+      "get": {
+        "tags": [
+          "emails"
+        ],
+        "description": "Gets all emails sent since the specified date/time.",
+        "operationId": "getSentSince",
+        "parameters": [
+          {
+            "name": "sinceUtc",
+            "in": "query",
+            "description": "The date/time (in UTC) since which the email was sent.",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "description": "The date/time (in UTC) since which the email was sent.",
+              "format": "date-time"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/email"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/problem+json": {
+                "schema": {
+                  "$ref": "#/components/schemas/httpValidationProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "head": {
+        "tags": [
+          "emails"
+        ],
+        "description": "Gets all emails sent since the specified date/time.",
+        "operationId": "tryGetSentSince",
+        "parameters": [
+          {
+            "name": "sinceUtc",
+            "in": "query",
+            "description": "The date/time (in UTC) since which the email was sent.",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "description": "The date/time (in UTC) since which the email was sent.",
+              "format": "date-time"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request"
+          }
+        }
+      }
+    },
+    "/fileTransfers": {
+      "post": {
+        "tags": [
+          "fileTransfers"
+        ],
+        "description": "Uploads a file. Returns HTTP 400 if the file is empty.",
+        "operationId": "upload",
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "file": {
+                    "type": "string",
+                    "format": "binary"
+                  }
+                }
+              },
+              "encoding": {
+                "file": {
+                  "style": "form"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "fileTransfers"
+        ],
+        "description": "Downloads the file with the specified name. Returns HTTP 404 if not found.",
+        "operationId": "download",
+        "parameters": [
+          {
+            "name": "fileName",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/octet-stream": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found"
+          }
+        }
+      },
+      "head": {
+        "tags": [
+          "fileTransfers"
+        ],
+        "description": "Downloads the file with the specified name. Returns HTTP 404 if not found.",
+        "operationId": "tryDownload",
+        "parameters": [
+          {
+            "name": "fileName",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Not Found"
+          }
+        }
+      }
+    },
+    "/fileTransfers/find": {
+      "get": {
+        "tags": [
+          "fileTransfers"
+        ],
+        "description": "Returns whether the specified file is available for download.",
+        "operationId": "exists",
+        "parameters": [
+          {
+            "name": "fileName",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Not Found"
+          }
+        }
+      },
+      "head": {
+        "tags": [
+          "fileTransfers"
+        ],
+        "description": "Returns whether the specified file is available for download.",
+        "operationId": "tryExists",
+        "parameters": [
+          {
+            "name": "fileName",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Not Found"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "attributesInCupOfCoffeeResponse": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/attributesInResponse"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "hasSugar": {
+                "type": "boolean"
+              },
+              "hasMilk": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": false
+          }
+        ],
+        "additionalProperties": false
+      },
+      "attributesInResponse": {
+        "required": [
+          "openapi:discriminator"
+        ],
+        "type": "object",
+        "properties": {
+          "openapi:discriminator": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/resourceType"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false,
+        "discriminator": {
+          "propertyName": "openapi:discriminator",
+          "mapping": {
+            "cupOfCoffees": "#/components/schemas/attributesInCupOfCoffeeResponse"
+          }
+        },
+        "x-abstract": true
+      },
+      "cupOfCoffeeCollectionResponseDocument": {
+        "required": [
+          "data",
+          "links"
+        ],
+        "type": "object",
+        "properties": {
+          "links": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/resourceCollectionTopLevelLinks"
+              }
+            ]
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/dataInCupOfCoffeeResponse"
+            }
+          },
+          "included": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/resourceInResponse"
+            }
+          },
+          "meta": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/meta"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false
+      },
+      "dataInCupOfCoffeeResponse": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/resourceInResponse"
+          },
+          {
+            "required": [
+              "id"
+            ],
+            "type": "object",
+            "properties": {
+              "id": {
+                "minLength": 1,
+                "type": "string",
+                "format": "int64"
+              },
+              "attributes": {
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/attributesInCupOfCoffeeResponse"
+                  }
+                ]
+              },
+              "links": {
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/resourceLinks"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        ],
+        "additionalProperties": false
+      },
+      "email": {
+        "required": [
+          "body",
+          "from",
+          "subject",
+          "to"
+        ],
+        "type": "object",
+        "properties": {
+          "subject": {
+            "maxLength": 255,
+            "type": "string",
+            "description": "The email subject."
+          },
+          "body": {
+            "type": "string",
+            "description": "The email body."
+          },
+          "from": {
+            "type": "string",
+            "description": "The email address of the sender.",
+            "format": "email"
+          },
+          "to": {
+            "type": "string",
+            "description": "The email address of the recipient.",
+            "format": "email"
+          },
+          "sentAtUtc": {
+            "type": "string",
+            "description": "The date/time (in UTC) at which this email was sent.",
+            "format": "date-time",
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "errorLinks": {
+        "type": "object",
+        "properties": {
+          "about": {
+            "type": "string",
+            "nullable": true
+          },
+          "type": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "errorObject": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "nullable": true
+          },
+          "links": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/errorLinks"
+              }
+            ],
+            "nullable": true
+          },
+          "status": {
+            "type": "string"
+          },
+          "code": {
+            "type": "string",
+            "nullable": true
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "detail": {
+            "type": "string",
+            "nullable": true
+          },
+          "source": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/errorSource"
+              }
+            ],
+            "nullable": true
+          },
+          "meta": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/meta"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false
+      },
+      "errorResponseDocument": {
+        "required": [
+          "errors",
+          "links"
+        ],
+        "type": "object",
+        "properties": {
+          "links": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/errorTopLevelLinks"
+              }
+            ]
+          },
+          "errors": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/errorObject"
+            }
+          },
+          "meta": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/meta"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false
+      },
+      "errorSource": {
+        "type": "object",
+        "properties": {
+          "pointer": {
+            "type": "string",
+            "nullable": true
+          },
+          "parameter": {
+            "type": "string",
+            "nullable": true
+          },
+          "header": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "errorTopLevelLinks": {
+        "type": "object",
+        "properties": {
+          "self": {
+            "type": "string"
+          },
+          "describedby": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false
+      },
+      "httpValidationProblemDetails": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "nullable": true
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "status": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "detail": {
+            "type": "string",
+            "nullable": true
+          },
+          "instance": {
+            "type": "string",
+            "nullable": true
+          },
+          "errors": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": { }
+      },
+      "meta": {
+        "type": "object",
+        "additionalProperties": {
+          "nullable": true
+        }
+      },
+      "resourceCollectionTopLevelLinks": {
+        "type": "object",
+        "properties": {
+          "self": {
+            "type": "string"
+          },
+          "describedby": {
+            "type": "string"
+          },
+          "first": {
+            "type": "string"
+          },
+          "last": {
+            "type": "string"
+          },
+          "prev": {
+            "type": "string"
+          },
+          "next": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false
+      },
+      "resourceInResponse": {
+        "required": [
+          "type"
+        ],
+        "type": "object",
+        "properties": {
+          "type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/resourceType"
+              }
+            ]
+          },
+          "meta": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/meta"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false,
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "cupOfCoffees": "#/components/schemas/dataInCupOfCoffeeResponse"
+          }
+        },
+        "x-abstract": true
+      },
+      "resourceLinks": {
+        "type": "object",
+        "properties": {
+          "self": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false
+      },
+      "resourceType": {
+        "enum": [
+          "cupOfCoffees"
+        ],
+        "type": "string"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/OpenApiTests/MixedControllers/InMemoryFileStorage.cs b/test/OpenApiTests/MixedControllers/InMemoryFileStorage.cs
new file mode 100644
index 000000000..d0c6a59e7
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/InMemoryFileStorage.cs
@@ -0,0 +1,8 @@
+using System.Collections.Concurrent;
+
+namespace OpenApiTests.MixedControllers;
+
+public sealed class InMemoryFileStorage
+{
+    public ConcurrentDictionary Files { get; } = new();
+}
diff --git a/test/OpenApiTests/MixedControllers/InMemoryOutgoingEmailsProvider.cs b/test/OpenApiTests/MixedControllers/InMemoryOutgoingEmailsProvider.cs
new file mode 100644
index 000000000..6a04b6c76
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/InMemoryOutgoingEmailsProvider.cs
@@ -0,0 +1,8 @@
+using System.Collections.Concurrent;
+
+namespace OpenApiTests.MixedControllers;
+
+public sealed class InMemoryOutgoingEmailsProvider
+{
+    public ConcurrentDictionary SentEmails { get; } = new();
+}
diff --git a/test/OpenApiTests/MixedControllers/LoggingTests.cs b/test/OpenApiTests/MixedControllers/LoggingTests.cs
new file mode 100644
index 000000000..6fd445253
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/LoggingTests.cs
@@ -0,0 +1,51 @@
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using TestBuildingBlocks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace OpenApiTests.MixedControllers;
+
+public sealed class LoggingTests : IClassFixture>
+{
+    private readonly OpenApiTestContext _testContext;
+
+    public LoggingTests(OpenApiTestContext testContext, ITestOutputHelper testOutputHelper)
+    {
+        _testContext = testContext;
+
+        testContext.UseController();
+
+        testContext.SetTestOutputHelper(testOutputHelper);
+
+        testContext.ConfigureServices(services => services.AddLogging(builder =>
+        {
+            var loggerProvider = new CapturingLoggerProvider(LogLevel.Warning);
+            builder.AddProvider(loggerProvider);
+            builder.SetMinimumLevel(LogLevel.Warning);
+
+            builder.Services.AddSingleton(loggerProvider);
+        }));
+    }
+
+    [Fact]
+    public async Task Logs_warning_for_unsupported_custom_actions_in_JsonApi_controllers()
+    {
+        // Arrange
+        var loggerProvider = _testContext.Factory.Services.GetRequiredService();
+
+        // Act
+        await _testContext.GetSwaggerDocumentAsync();
+
+        // Assert
+        IReadOnlyList logLines = loggerProvider.GetLines();
+
+        logLines.Should().BeEquivalentTo(new[]
+        {
+            $"[WARNING] Hiding unsupported custom JSON:API action method [GET] {typeof(CoffeeSummaryController)}.GetSummaryAsync (OpenApiTests) in OpenAPI.",
+            $"[WARNING] Hiding unsupported custom JSON:API action method [HEAD] {typeof(CoffeeSummaryController)}.GetSummaryAsync (OpenApiTests) in OpenAPI.",
+            $"[WARNING] Hiding unsupported custom JSON:API action method [DELETE] {typeof(CoffeeSummaryController)}.DeleteOnlyMilkAsync (OpenApiTests) in OpenAPI."
+        }, options => options.WithStrictOrdering());
+    }
+}
diff --git a/test/OpenApiTests/MixedControllers/MinimalApiStartupFilter.cs b/test/OpenApiTests/MixedControllers/MinimalApiStartupFilter.cs
new file mode 100644
index 000000000..5efa6e20c
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/MinimalApiStartupFilter.cs
@@ -0,0 +1,117 @@
+using System.ComponentModel;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Mvc;
+using MiniValidation;
+
+#pragma warning disable format
+
+namespace OpenApiTests.MixedControllers;
+
+public sealed class MinimalApiStartupFilter : IStartupFilter
+{
+    private readonly InMemoryOutgoingEmailsProvider _emailsProvider;
+
+    public MinimalApiStartupFilter(InMemoryOutgoingEmailsProvider emailsProvider)
+    {
+        ArgumentNullException.ThrowIfNull(emailsProvider);
+
+        _emailsProvider = emailsProvider;
+    }
+
+    public Action Configure(Action next)
+    {
+        return app =>
+        {
+            app.UseRouting();
+
+            app.UseEndpoints(builder =>
+            {
+                builder.MapPost("/emails/send", HandleSendAsync)
+                    // @formatter:wrap_chained_method_calls chop_always
+                    .WithTags("emails")
+                    .WithName("sendEmail")
+                    .WithDescription("Sends an email to the specified recipient.")
+                    // @formatter:wrap_chained_method_calls restore
+                    ;
+
+                builder.MapGet("/emails/sent-since", HandleSentSinceAsync)
+                    // @formatter:wrap_chained_method_calls chop_always
+                    .WithTags("emails")
+                    .WithName("getSentSince")
+                    .WithDescription("Gets all emails sent since the specified date/time.")
+                    // @formatter:wrap_chained_method_calls restore
+                    ;
+
+                builder.MapMethods("/emails/sent-since", ["HEAD"], TryHandleSentSinceAsync)
+                    // @formatter:wrap_chained_method_calls chop_always
+                    .WithTags("emails")
+                    .WithName("tryGetSentSince")
+                    .WithDescription("Gets all emails sent since the specified date/time.")
+                    // @formatter:wrap_chained_method_calls restore
+                    ;
+            });
+
+            next.Invoke(app);
+        };
+    }
+
+    private async Task> HandleSendAsync(
+        // Handles POST request.
+        [FromBody] [Description("The email to send.")]
+        Email email, TimeProvider timeProvider, CancellationToken cancellationToken)
+    {
+        if (!MiniValidator.TryValidate(email, out IDictionary errors))
+        {
+            return TypedResults.ValidationProblem(errors);
+        }
+
+        await Task.Yield();
+        cancellationToken.ThrowIfCancellationRequested();
+
+        DateTimeOffset utcNow = timeProvider.GetUtcNow();
+        email.SetSentAt(utcNow);
+        _emailsProvider.SentEmails.AddOrUpdate(utcNow, _ => email, (_, _) => email);
+
+        return TypedResults.Ok();
+    }
+
+    private async Task>, ValidationProblem>> HandleSentSinceAsync(
+        // Handles GET request.
+        [FromQuery] [Description("The date/time (in UTC) since which the email was sent.")]
+        DateTimeOffset sinceUtc, TimeProvider timeProvider, CancellationToken cancellationToken)
+    {
+        if (sinceUtc > timeProvider.GetUtcNow())
+        {
+            return TypedResults.ValidationProblem(new Dictionary
+            {
+                ["sinceUtc"] = ["The sinceUtc parameter must be in the past."]
+            });
+        }
+
+        await Task.Yield();
+        cancellationToken.ThrowIfCancellationRequested();
+
+        List emails = _emailsProvider.SentEmails.Values.Where(email => email.SentAtUtc >= sinceUtc).ToList();
+
+        return TypedResults.Ok(emails);
+    }
+
+    private async Task> TryHandleSentSinceAsync(
+        // Handles HEAD request.
+        [FromQuery] [Description("The date/time (in UTC) since which the email was sent.")]
+        DateTimeOffset sinceUtc, TimeProvider timeProvider, CancellationToken cancellationToken)
+    {
+        if (sinceUtc > timeProvider.GetUtcNow())
+        {
+            return TypedResults.BadRequest();
+        }
+
+        await Task.Yield();
+        cancellationToken.ThrowIfCancellationRequested();
+
+        return TypedResults.Ok();
+    }
+}
diff --git a/test/OpenApiTests/MixedControllers/MixedControllerFakers.cs b/test/OpenApiTests/MixedControllers/MixedControllerFakers.cs
new file mode 100644
index 000000000..08168422b
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/MixedControllerFakers.cs
@@ -0,0 +1,27 @@
+using Bogus;
+using JetBrains.Annotations;
+using TestBuildingBlocks;
+
+// @formatter:wrap_chained_method_calls chop_if_long
+// @formatter:wrap_before_first_method_call true
+
+namespace OpenApiTests.MixedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class MixedControllerFakers
+{
+    private readonly Lazy> _lazyCupOfCoffeeFaker = new(() => new Faker()
+        .MakeDeterministic()
+        .RuleFor(cupOfCoffee => cupOfCoffee.HasSugar, faker => faker.Random.Bool())
+        .RuleFor(cupOfCoffee => cupOfCoffee.HasMilk, faker => faker.Random.Bool()));
+
+    private readonly Lazy> _lazyEmailFaker = new(() => new Faker()
+        .MakeDeterministic()
+        .RuleFor(email => email.Subject, faker => faker.Lorem.Sentence())
+        .RuleFor(email => email.Body, faker => faker.Lorem.Paragraphs())
+        .RuleFor(email => email.From, faker => faker.Internet.Email())
+        .RuleFor(email => email.To, faker => faker.Internet.Email()));
+
+    public Faker CupOfCoffee => _lazyCupOfCoffeeFaker.Value;
+    public Faker Email => _lazyEmailFaker.Value;
+}
diff --git a/test/OpenApiTests/MixedControllers/MixedControllerStartup.cs b/test/OpenApiTests/MixedControllers/MixedControllerStartup.cs
new file mode 100644
index 000000000..b0aab9f08
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/MixedControllerStartup.cs
@@ -0,0 +1,14 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace OpenApiTests.MixedControllers;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class MixedControllerStartup : OpenApiStartup
+{
+    protected override void AddJsonApi(IServiceCollection services)
+    {
+        services.AddJsonApi(ConfigureJsonApiOptions, resources: builder => builder.Add());
+    }
+}
diff --git a/test/OpenApiTests/MixedControllers/MixedControllerTests.cs b/test/OpenApiTests/MixedControllers/MixedControllerTests.cs
new file mode 100644
index 000000000..c15552b38
--- /dev/null
+++ b/test/OpenApiTests/MixedControllers/MixedControllerTests.cs
@@ -0,0 +1,230 @@
+using System.Text.Json;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using TestBuildingBlocks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace OpenApiTests.MixedControllers;
+
+public sealed class MixedControllerTests : IClassFixture>
+{
+    private readonly OpenApiTestContext _testContext;
+
+    public MixedControllerTests(OpenApiTestContext testContext, ITestOutputHelper testOutputHelper)
+    {
+        _testContext = testContext;
+
+        testContext.UseController();
+        testContext.UseController();
+        testContext.UseController();
+
+        testContext.SetTestOutputHelper(testOutputHelper);
+        testContext.SwaggerDocumentOutputDirectory = $"{GetType().Namespace!.Replace('.', '/')}/GeneratedSwagger";
+
+        testContext.ConfigureServices(services =>
+        {
+            services.AddSingleton();
+            services.AddSingleton();
+            services.TryAddEnumerable(ServiceDescriptor.Transient());
+        });
+    }
+
+    [Fact]
+    public async Task Default_JsonApi_endpoints_are_exposed()
+    {
+        // Act
+        JsonElement document = await _testContext.GetSwaggerDocumentAsync();
+
+        // Assert
+        document.Should().ContainPath("paths./cupOfCoffees.get");
+        document.Should().ContainPath("paths./cupOfCoffees.head");
+        document.Should().ContainPath("paths./cupOfCoffees/{id}.delete");
+    }
+
+    [Fact]
+    public async Task Upload_endpoint_is_exposed()
+    {
+        // Act
+        JsonElement document = await _testContext.GetSwaggerDocumentAsync();
+
+        // Assert
+        document.Should().ContainPath("paths./fileTransfers.post").Should().BeJson("""
+            {
+              "tags": [
+                "fileTransfers"
+              ],
+              "description": "Uploads a file. Returns HTTP 400 if the file is empty.",
+              "operationId": "upload",
+              "requestBody": {
+                "content": {
+                  "multipart/form-data": {
+                    "schema": {
+                      "type": "object",
+                      "properties": {
+                        "file": {
+                          "type": "string",
+                          "format": "binary"
+                        }
+                      }
+                    },
+                    "encoding": {
+                      "file": {
+                        "style": "form"
+                      }
+                    }
+                  }
+                }
+              },
+              "responses": {
+                "200": {
+                  "description": "OK",
+                  "content": {
+                    "text/plain": {
+                      "schema": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                },
+                "400": {
+                  "description": "Bad Request"
+                }
+              }
+            }
+            """);
+    }
+
+    [Fact]
+    public async Task Exists_endpoint_is_exposed()
+    {
+        // Act
+        JsonElement document = await _testContext.GetSwaggerDocumentAsync();
+
+        // Assert
+        document.Should().ContainPath("paths./fileTransfers/find.get").Should().BeJson("""
+            {
+              "tags": [
+                "fileTransfers"
+              ],
+              "description": "Returns whether the specified file is available for download.",
+              "operationId": "exists",
+              "parameters": [
+                {
+                  "name": "fileName",
+                  "in": "query",
+                  "schema": {
+                    "type": "string"
+                  }
+                }
+              ],
+              "responses": {
+                "200": {
+                  "description": "OK"
+                },
+                "404": {
+                  "description": "Not Found"
+                }
+              }
+            }
+            """);
+
+        document.Should().ContainPath("paths./fileTransfers/find.head").Should().BeJson("""
+            {
+              "tags": [
+                "fileTransfers"
+              ],
+              "description": "Returns whether the specified file is available for download.",
+              "operationId": "tryExists",
+              "parameters": [
+                {
+                  "name": "fileName",
+                  "in": "query",
+                  "schema": {
+                    "type": "string"
+                  }
+                }
+              ],
+              "responses": {
+                "200": {
+                  "description": "OK"
+                },
+                "404": {
+                  "description": "Not Found"
+                }
+              }
+            }
+            """);
+    }
+
+    [Fact]
+    public async Task Download_endpoint_is_exposed()
+    {
+        // Act
+        JsonElement document = await _testContext.GetSwaggerDocumentAsync();
+
+        // Assert
+        document.Should().ContainPath("paths./fileTransfers.get").Should().BeJson("""
+            {
+              "tags": [
+                "fileTransfers"
+              ],
+              "description": "Downloads the file with the specified name. Returns HTTP 404 if not found.",
+              "operationId": "download",
+              "parameters": [
+                {
+                  "name": "fileName",
+                  "in": "query",
+                  "schema": {
+                    "type": "string"
+                  }
+                }
+              ],
+              "responses": {
+                "200": {
+                  "description": "OK",
+                  "content": {
+                    "application/octet-stream": {
+                      "schema": {
+                        "type": "string",
+                        "format": "binary"
+                      }
+                    }
+                  }
+                },
+                "404": {
+                  "description": "Not Found"
+                }
+              }
+            }
+            """);
+
+        document.Should().ContainPath("paths./fileTransfers.head").Should().BeJson("""
+            {
+              "tags": [
+                "fileTransfers"
+              ],
+              "description": "Downloads the file with the specified name. Returns HTTP 404 if not found.",
+              "operationId": "tryDownload",
+              "parameters": [
+                {
+                  "name": "fileName",
+                  "in": "query",
+                  "schema": {
+                    "type": "string"
+                  }
+                }
+              ],
+              "responses": {
+                "200": {
+                  "description": "OK"
+                },
+                "404": {
+                  "description": "Not Found"
+                }
+              }
+            }
+            """);
+    }
+}
diff --git a/test/OpenApiTests/NamingConventions/CamelCase/CamelCaseNamingConventionStartup.cs b/test/OpenApiTests/NamingConventions/CamelCase/CamelCaseNamingConventionStartup.cs
index cf910b3a5..180404dc4 100644
--- a/test/OpenApiTests/NamingConventions/CamelCase/CamelCaseNamingConventionStartup.cs
+++ b/test/OpenApiTests/NamingConventions/CamelCase/CamelCaseNamingConventionStartup.cs
@@ -10,9 +10,9 @@ namespace OpenApiTests.NamingConventions.CamelCase;
 public sealed class CamelCaseNamingConventionStartup : OpenApiStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.IncludeJsonApiVersion = true;
         options.SerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
diff --git a/test/OpenApiTests/NamingConventions/KebabCase/KebabCaseNamingConventionStartup.cs b/test/OpenApiTests/NamingConventions/KebabCase/KebabCaseNamingConventionStartup.cs
index cacd63981..325096521 100644
--- a/test/OpenApiTests/NamingConventions/KebabCase/KebabCaseNamingConventionStartup.cs
+++ b/test/OpenApiTests/NamingConventions/KebabCase/KebabCaseNamingConventionStartup.cs
@@ -9,9 +9,9 @@ namespace OpenApiTests.NamingConventions.KebabCase;
 public sealed class KebabCaseNamingConventionStartup : OpenApiStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.IncludeJsonApiVersion = true;
         options.SerializerOptions.PropertyNamingPolicy = JsonKebabCaseNamingPolicy.Instance;
diff --git a/test/OpenApiTests/NamingConventions/PascalCase/PascalCaseNamingConventionStartup.cs b/test/OpenApiTests/NamingConventions/PascalCase/PascalCaseNamingConventionStartup.cs
index 8a367641f..32cff7750 100644
--- a/test/OpenApiTests/NamingConventions/PascalCase/PascalCaseNamingConventionStartup.cs
+++ b/test/OpenApiTests/NamingConventions/PascalCase/PascalCaseNamingConventionStartup.cs
@@ -9,9 +9,9 @@ namespace OpenApiTests.NamingConventions.PascalCase;
 public sealed class PascalCaseNamingConventionStartup : OpenApiStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.IncludeJsonApiVersion = true;
         options.SerializerOptions.PropertyNamingPolicy = null;
diff --git a/test/OpenApiTests/OpenApiStartup.cs b/test/OpenApiTests/OpenApiStartup.cs
index e8ee0fdb2..0e4d1b3f5 100644
--- a/test/OpenApiTests/OpenApiStartup.cs
+++ b/test/OpenApiTests/OpenApiStartup.cs
@@ -14,18 +14,18 @@ public class OpenApiStartup : TestableStartup
     public override void ConfigureServices(IServiceCollection services)
     {
         base.ConfigureServices(services);
-        services.AddOpenApiForJsonApi(SetupSwaggerGenAction);
+        services.AddOpenApiForJsonApi(ConfigureSwaggerGenOptions);
     }
 
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.UseRelativeLinks = true;
         options.IncludeTotalResourceCount = true;
     }
 
-    protected virtual void SetupSwaggerGenAction(SwaggerGenOptions options)
+    protected virtual void ConfigureSwaggerGenOptions(SwaggerGenOptions options)
     {
         string documentationPath = Path.ChangeExtension(Assembly.GetExecutingAssembly().Location, ".xml");
         options.IncludeXmlComments(documentationPath);
diff --git a/test/OpenApiTests/OpenApiTests.csproj b/test/OpenApiTests/OpenApiTests.csproj
index ed2a75b5f..8d9336f54 100644
--- a/test/OpenApiTests/OpenApiTests.csproj
+++ b/test/OpenApiTests/OpenApiTests.csproj
@@ -24,6 +24,7 @@
     
     
     
+


diff --git a/test/OpenApiTests/ResourceFieldValidation/MsvOffStartup.cs b/test/OpenApiTests/ResourceFieldValidation/MsvOffStartup.cs
index 838803f9c..2ee464fc4 100644
--- a/test/OpenApiTests/ResourceFieldValidation/MsvOffStartup.cs
+++ b/test/OpenApiTests/ResourceFieldValidation/MsvOffStartup.cs
@@ -8,9 +8,9 @@ namespace OpenApiTests.ResourceFieldValidation;
 public sealed class MsvOffStartup : OpenApiStartup
     where TDbContext : TestableDbContext
 {
-    protected override void SetJsonApiOptions(JsonApiOptions options)
+    protected override void ConfigureJsonApiOptions(JsonApiOptions options)
     {
-        base.SetJsonApiOptions(options);
+        base.ConfigureJsonApiOptions(options);
 
         options.ValidateModelState = false;
     }
diff --git a/test/TestBuildingBlocks/TestableStartup.cs b/test/TestBuildingBlocks/TestableStartup.cs
index e5dc7075e..7a4f75047 100644
--- a/test/TestBuildingBlocks/TestableStartup.cs
+++ b/test/TestBuildingBlocks/TestableStartup.cs
@@ -9,12 +9,16 @@ public class TestableStartup
 {
     public virtual void ConfigureServices(IServiceCollection services)
     {
-        IMvcCoreBuilder mvcBuilder = services.AddMvcCore(options => options.MaxModelValidationErrors = 3);
+        AddJsonApi(services);
+    }
 
-        services.AddJsonApi(SetJsonApiOptions, mvcBuilder: mvcBuilder);
+    protected virtual void AddJsonApi(IServiceCollection services)
+    {
+        IMvcCoreBuilder mvcBuilder = services.AddMvcCore(options => options.MaxModelValidationErrors = 3);
+        services.AddJsonApi(ConfigureJsonApiOptions, mvcBuilder: mvcBuilder);
     }
 
-    protected virtual void SetJsonApiOptions(JsonApiOptions options)
+    protected virtual void ConfigureJsonApiOptions(JsonApiOptions options)
     {
         options.IncludeExceptionStackTraceInErrors = true;
         options.IncludeRequestBodyInErrors = true;

From 58cc1cbb9e4ed7593f506e2fa94cb764f69b9584 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Fri, 1 Aug 2025 11:37:14 +0200
Subject: [PATCH 23/30] Cleanup formatting

---
 CODE_OF_CONDUCT.md | 2 +-
 codecov.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 41dd9ebee..555b80f87 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -105,7 +105,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within
diff --git a/codecov.yml b/codecov.yml
index 32a518442..f97041dbf 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -10,4 +10,4 @@ coverage:
         informational: true
 
 github_checks:
-    annotations: false
+  annotations: false

From f4980c334bc112ad4c96b2305bf03c490fc4bfed Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Fri, 1 Aug 2025 16:04:54 +0200
Subject: [PATCH 24/30] OpenAPI tweaks and fixes (#1748)

* Improve test coverage

* Remove the need for a workaround for "dotnet swagger" (swashbuckle.aspnetcore.cli global tool)

* Fix thread safety when OpenAPI document is downloaded in parallel
---
 .../ConfigureMvcOptions.cs                    |  24 +--
 ...onApiActionDescriptorCollectionProvider.cs |  22 ++-
 .../JsonApiEndpointMetadataProvider.cs        |  16 +-
 .../JsonApiRequestFormatMetadataProvider.cs   |   3 +
 .../SchemaGenerationTracer.cs                 |  17 ++-
 .../ServiceCollectionExtensions.cs            |   2 +-
 .../ApplicationBuilderExtensions.cs           |  14 --
 .../Configuration/ConfigureMvcOptions.cs      |  38 +++++
 .../IJsonApiApplicationBuilder.cs             |   8 -
 .../JsonApiApplicationBuilder.cs              |  16 +-
 .../MixedControllers/MixedControllerTests.cs  | 141 +++++++++++++++++-
 test/OpenApiTests/OpenApiTestContext.cs       |   2 +-
 .../ResourceInheritance/ConcurrencyTests.cs   |  40 +++++
 13 files changed, 263 insertions(+), 80 deletions(-)
 create mode 100644 src/JsonApiDotNetCore/Configuration/ConfigureMvcOptions.cs
 delete mode 100644 src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs
 create mode 100644 test/OpenApiTests/ResourceInheritance/ConcurrencyTests.cs

diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs
index 73e612fa2..7800e7573 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureMvcOptions.cs
@@ -1,5 +1,4 @@
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Middleware;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
@@ -7,39 +6,24 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal sealed class ConfigureMvcOptions : IConfigureOptions
 {
-    private readonly IJsonApiRoutingConvention _jsonApiRoutingConvention;
     private readonly JsonApiRequestFormatMetadataProvider _jsonApiRequestFormatMetadataProvider;
-    private readonly IJsonApiOptions _jsonApiOptions;
+    private readonly JsonApiOptions _jsonApiOptions;
 
-    public ConfigureMvcOptions(IJsonApiRoutingConvention jsonApiRoutingConvention, JsonApiRequestFormatMetadataProvider jsonApiRequestFormatMetadataProvider,
-        IJsonApiOptions jsonApiOptions)
+    public ConfigureMvcOptions(JsonApiRequestFormatMetadataProvider jsonApiRequestFormatMetadataProvider, IJsonApiOptions jsonApiOptions)
     {
-        ArgumentNullException.ThrowIfNull(jsonApiRoutingConvention);
         ArgumentNullException.ThrowIfNull(jsonApiRequestFormatMetadataProvider);
         ArgumentNullException.ThrowIfNull(jsonApiOptions);
 
-        _jsonApiRoutingConvention = jsonApiRoutingConvention;
         _jsonApiRequestFormatMetadataProvider = jsonApiRequestFormatMetadataProvider;
-        _jsonApiOptions = jsonApiOptions;
+        _jsonApiOptions = (JsonApiOptions)jsonApiOptions;
     }
 
     public void Configure(MvcOptions options)
     {
         ArgumentNullException.ThrowIfNull(options);
 
-        AddSwashbuckleCliCompatibility(options);
-
         options.InputFormatters.Add(_jsonApiRequestFormatMetadataProvider);
 
-        ((JsonApiOptions)_jsonApiOptions).IncludeExtensions(OpenApiMediaTypeExtension.OpenApi, OpenApiMediaTypeExtension.RelaxedOpenApi);
-    }
-
-    private void AddSwashbuckleCliCompatibility(MvcOptions options)
-    {
-        if (!options.Conventions.Any(convention => convention is IJsonApiRoutingConvention))
-        {
-            // See https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/1957 for why this is needed.
-            options.Conventions.Insert(0, _jsonApiRoutingConvention);
-        }
+        _jsonApiOptions.IncludeExtensions(OpenApiMediaTypeExtension.OpenApi, OpenApiMediaTypeExtension.RelaxedOpenApi);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs
index 72d0dcfab..5d05490e8 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiActionDescriptorCollectionProvider.cs
@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using System.Net;
 using System.Reflection;
 using JsonApiDotNetCore.Configuration;
@@ -36,8 +37,10 @@ internal sealed partial class JsonApiActionDescriptorCollectionProvider : IActio
     private readonly JsonApiEndpointMetadataProvider _jsonApiEndpointMetadataProvider;
     private readonly IJsonApiOptions _options;
     private readonly ILogger _logger;
+    private readonly ConcurrentDictionary> _versionedActionDescriptorCache = new();
 
-    public ActionDescriptorCollection ActionDescriptors => GetActionDescriptors();
+    public ActionDescriptorCollection ActionDescriptors =>
+        _versionedActionDescriptorCache.GetOrAdd(_defaultProvider.ActionDescriptors.Version, LazyGetActionDescriptors).Value;
 
     public JsonApiActionDescriptorCollectionProvider(IActionDescriptorCollectionProvider defaultProvider, IControllerResourceMapping controllerResourceMapping,
         JsonApiEndpointMetadataProvider jsonApiEndpointMetadataProvider, IJsonApiOptions options, ILogger logger)
@@ -55,7 +58,13 @@ public JsonApiActionDescriptorCollectionProvider(IActionDescriptorCollectionProv
         _logger = logger;
     }
 
-    private ActionDescriptorCollection GetActionDescriptors()
+    private Lazy LazyGetActionDescriptors(int version)
+    {
+        // https://andrewlock.net/making-getoradd-on-concurrentdictionary-thread-safe-using-lazy/
+        return new Lazy(() => GetActionDescriptors(version), LazyThreadSafetyMode.ExecutionAndPublication);
+    }
+
+    private ActionDescriptorCollection GetActionDescriptors(int version)
     {
         List descriptors = [];
 
@@ -106,8 +115,7 @@ private ActionDescriptorCollection GetActionDescriptors()
             descriptors.Add(descriptor);
         }
 
-        int descriptorVersion = _defaultProvider.ActionDescriptors.Version;
-        return new ActionDescriptorCollection(descriptors.AsReadOnly(), descriptorVersion);
+        return new ActionDescriptorCollection(descriptors.AsReadOnly(), version);
     }
 
     internal static bool IsVisibleEndpoint(ActionDescriptor descriptor)
@@ -221,9 +229,9 @@ private ActionDescriptor[] SetEndpointMetadata(ActionDescriptor descriptor, Buil
     {
         Dictionary descriptorsByRelationship = [];
 
-        JsonApiEndpointMetadata? endpointMetadata = _jsonApiEndpointMetadataProvider.Get(descriptor);
+        JsonApiEndpointMetadata endpointMetadata = _jsonApiEndpointMetadataProvider.Get(descriptor);
 
-        switch (endpointMetadata?.RequestMetadata)
+        switch (endpointMetadata.RequestMetadata)
         {
             case AtomicOperationsRequestMetadata atomicOperationsRequestMetadata:
             {
@@ -259,7 +267,7 @@ private ActionDescriptor[] SetEndpointMetadata(ActionDescriptor descriptor, Buil
             }
         }
 
-        switch (endpointMetadata?.ResponseMetadata)
+        switch (endpointMetadata.ResponseMetadata)
         {
             case AtomicOperationsResponseMetadata atomicOperationsResponseMetadata:
             {
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
index dc4d7cdd9..7de84f034 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
@@ -26,17 +26,19 @@ public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerReso
         _nonPrimaryDocumentTypeFactory = nonPrimaryDocumentTypeFactory;
     }
 
-    public JsonApiEndpointMetadata? Get(ActionDescriptor descriptor)
+    public JsonApiEndpointMetadata Get(ActionDescriptor descriptor)
     {
         ArgumentNullException.ThrowIfNull(descriptor);
 
         var actionMethod = OpenApiActionMethod.Create(descriptor);
+        JsonApiEndpointMetadata? metadata = null;
 
         switch (actionMethod)
         {
             case AtomicOperationsActionMethod:
             {
-                return new JsonApiEndpointMetadata(AtomicOperationsRequestMetadata.Instance, AtomicOperationsResponseMetadata.Instance);
+                metadata = new JsonApiEndpointMetadata(AtomicOperationsRequestMetadata.Instance, AtomicOperationsResponseMetadata.Instance);
+                break;
             }
             case JsonApiActionMethod jsonApiActionMethod:
             {
@@ -45,13 +47,13 @@ public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerReso
 
                 IJsonApiRequestMetadata? requestMetadata = GetRequestMetadata(jsonApiActionMethod.Endpoint, primaryResourceType);
                 IJsonApiResponseMetadata? responseMetadata = GetResponseMetadata(jsonApiActionMethod.Endpoint, primaryResourceType);
-                return new JsonApiEndpointMetadata(requestMetadata, responseMetadata);
-            }
-            default:
-            {
-                return null;
+                metadata = new JsonApiEndpointMetadata(requestMetadata, responseMetadata);
+                break;
             }
         }
+
+        ConsistencyGuard.ThrowIf(metadata == null);
+        return metadata;
     }
 
     private IJsonApiRequestMetadata? GetRequestMetadata(JsonApiEndpoints endpoint, ResourceType primaryResourceType)
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
index e73c0d120..9c0c1bb66 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiRequestFormatMetadataProvider.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Formatters;
 
@@ -10,12 +11,14 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 internal sealed class JsonApiRequestFormatMetadataProvider : IInputFormatter, IApiRequestFormatMetadataProvider
 {
     /// 
+    [ExcludeFromCodeCoverage]
     public bool CanRead(InputFormatterContext context)
     {
         return false;
     }
 
     /// 
+    [ExcludeFromCodeCoverage]
     public Task ReadAsync(InputFormatterContext context)
     {
         throw new UnreachableException();
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerationTracer.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerationTracer.cs
index 6dbd6bb2f..199eb0ac8 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerationTracer.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerationTracer.cs
@@ -1,3 +1,4 @@
+using System.Runtime.CompilerServices;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.Logging;
@@ -87,7 +88,7 @@ private static string GetSchemaTypeName(Type type)
 
     private sealed partial class SchemaGenerationTraceScope : ISchemaGenerationTraceScope
     {
-        private static readonly AsyncLocal RecursionDepthAsyncLocal = new();
+        private static readonly AsyncLocal> RecursionDepthAsyncLocal = new();
 
         private readonly ILogger _logger;
         private readonly string _schemaTypeName;
@@ -101,8 +102,10 @@ public SchemaGenerationTraceScope(ILogger logger, string schemaTypeName)
             _logger = logger;
             _schemaTypeName = schemaTypeName;
 
-            RecursionDepthAsyncLocal.Value++;
-            LogStarted(RecursionDepthAsyncLocal.Value, _schemaTypeName);
+            RecursionDepthAsyncLocal.Value ??= new StrongBox(0);
+            int depth = Interlocked.Increment(ref RecursionDepthAsyncLocal.Value.Value);
+
+            LogStarted(depth, _schemaTypeName);
         }
 
         public void TraceSucceeded(string schemaId)
@@ -112,16 +115,18 @@ public void TraceSucceeded(string schemaId)
 
         public void Dispose()
         {
+            int depth = RecursionDepthAsyncLocal.Value!.Value;
+
             if (_schemaId != null)
             {
-                LogSucceeded(RecursionDepthAsyncLocal.Value, _schemaTypeName, _schemaId);
+                LogSucceeded(depth, _schemaTypeName, _schemaId);
             }
             else
             {
-                LogFailed(RecursionDepthAsyncLocal.Value, _schemaTypeName);
+                LogFailed(depth, _schemaTypeName);
             }
 
-            RecursionDepthAsyncLocal.Value--;
+            Interlocked.Decrement(ref RecursionDepthAsyncLocal.Value.Value);
         }
 
         [LoggerMessage(Level = LogLevel.Trace, SkipEnabledCheck = true, Message = "({Depth:D2}) Started for {SchemaTypeName}.")]
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
index 10d4ec50c..791a69cd4 100644
--- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/ServiceCollectionExtensions.cs
@@ -62,7 +62,7 @@ private static void AddCustomApiExplorer(IServiceCollection services)
 
         AddApiExplorer(services);
 
-        services.AddSingleton, ConfigureMvcOptions>();
+        services.TryAddEnumerable(ServiceDescriptor.Singleton, ConfigureMvcOptions>());
     }
 
     private static void AddApiExplorer(IServiceCollection services)
diff --git a/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs b/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs
index fb69fa5ae..b8df0227c 100644
--- a/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs
+++ b/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs
@@ -33,20 +33,6 @@ public static void UseJsonApi(this IApplicationBuilder builder)
             inverseNavigationResolver.Resolve();
         }
 
-        var jsonApiApplicationBuilder = builder.ApplicationServices.GetRequiredService();
-
-        jsonApiApplicationBuilder.ConfigureMvcOptions = options =>
-        {
-            var inputFormatter = builder.ApplicationServices.GetRequiredService();
-            options.InputFormatters.Insert(0, inputFormatter);
-
-            var outputFormatter = builder.ApplicationServices.GetRequiredService();
-            options.OutputFormatters.Insert(0, outputFormatter);
-
-            var routingConvention = builder.ApplicationServices.GetRequiredService();
-            options.Conventions.Insert(0, routingConvention);
-        };
-
         builder.UseMiddleware();
     }
 
diff --git a/src/JsonApiDotNetCore/Configuration/ConfigureMvcOptions.cs b/src/JsonApiDotNetCore/Configuration/ConfigureMvcOptions.cs
new file mode 100644
index 000000000..4710f0113
--- /dev/null
+++ b/src/JsonApiDotNetCore/Configuration/ConfigureMvcOptions.cs
@@ -0,0 +1,38 @@
+using JsonApiDotNetCore.Middleware;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+
+namespace JsonApiDotNetCore.Configuration;
+
+internal sealed class ConfigureMvcOptions : IConfigureOptions
+{
+    private readonly IJsonApiInputFormatter _inputFormatter;
+    private readonly IJsonApiOutputFormatter _outputFormatter;
+    private readonly IJsonApiRoutingConvention _routingConvention;
+
+    public ConfigureMvcOptions(IJsonApiInputFormatter inputFormatter, IJsonApiOutputFormatter outputFormatter, IJsonApiRoutingConvention routingConvention)
+    {
+        ArgumentNullException.ThrowIfNull(inputFormatter);
+        ArgumentNullException.ThrowIfNull(outputFormatter);
+        ArgumentNullException.ThrowIfNull(routingConvention);
+
+        _inputFormatter = inputFormatter;
+        _outputFormatter = outputFormatter;
+        _routingConvention = routingConvention;
+    }
+
+    public void Configure(MvcOptions options)
+    {
+        ArgumentNullException.ThrowIfNull(options);
+
+        options.EnableEndpointRouting = true;
+
+        options.InputFormatters.Insert(0, _inputFormatter);
+        options.OutputFormatters.Insert(0, _outputFormatter);
+        options.Conventions.Insert(0, _routingConvention);
+
+        options.Filters.AddService();
+        options.Filters.AddService();
+        options.Filters.AddService();
+    }
+}
diff --git a/src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs
deleted file mode 100644
index 459e5be29..000000000
--- a/src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace JsonApiDotNetCore.Configuration;
-
-internal interface IJsonApiApplicationBuilder
-{
-    public Action? ConfigureMvcOptions { set; }
-}
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
index 65646b769..dd844be36 100644
--- a/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
+++ b/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
@@ -18,6 +18,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace JsonApiDotNetCore.Configuration;
 
@@ -25,15 +26,13 @@ namespace JsonApiDotNetCore.Configuration;
 /// A utility class that builds a JSON:API application. It registers all required services and allows the user to override parts of the startup
 /// configuration.
 /// 
-internal sealed class JsonApiApplicationBuilder : IJsonApiApplicationBuilder
+internal sealed class JsonApiApplicationBuilder
 {
     private readonly IServiceCollection _services;
     private readonly IMvcCoreBuilder _mvcBuilder;
     private readonly JsonApiOptions _options = new();
     private readonly ResourceDescriptorAssemblyCache _assemblyCache = new();
 
-    public Action? ConfigureMvcOptions { get; set; }
-
     public JsonApiApplicationBuilder(IServiceCollection services, IMvcCoreBuilder mvcBuilder)
     {
         ArgumentNullException.ThrowIfNull(services);
@@ -105,15 +104,6 @@ public void ConfigureResourceGraph(ICollection dbContextTypes, Action
     public void ConfigureMvc()
     {
-        _mvcBuilder.AddMvcOptions(options =>
-        {
-            options.EnableEndpointRouting = true;
-            options.Filters.AddService();
-            options.Filters.AddService();
-            options.Filters.AddService();
-            ConfigureMvcOptions?.Invoke(options);
-        });
-
         if (_options.ValidateModelState)
         {
             _mvcBuilder.AddDataAnnotations();
@@ -175,7 +165,6 @@ public void ConfigureServiceContainer(ICollection dbContextTypes)
     private void AddMiddlewareLayer()
     {
         _services.TryAddSingleton(_options);
-        _services.TryAddSingleton(this);
         _services.TryAddSingleton();
         _services.TryAddScoped();
         _services.TryAddScoped();
@@ -183,6 +172,7 @@ private void AddMiddlewareLayer()
         _services.TryAddSingleton();
         _services.TryAddSingleton();
         _services.TryAddSingleton();
+        _services.TryAddEnumerable(ServiceDescriptor.Singleton, ConfigureMvcOptions>());
         _services.TryAddSingleton(provider => provider.GetRequiredService());
         _services.TryAddSingleton();
         _services.TryAddSingleton();
diff --git a/test/OpenApiTests/MixedControllers/MixedControllerTests.cs b/test/OpenApiTests/MixedControllers/MixedControllerTests.cs
index c15552b38..bd064968f 100644
--- a/test/OpenApiTests/MixedControllers/MixedControllerTests.cs
+++ b/test/OpenApiTests/MixedControllers/MixedControllerTests.cs
@@ -44,7 +44,7 @@ public async Task Default_JsonApi_endpoints_are_exposed()
     }
 
     [Fact]
-    public async Task Upload_endpoint_is_exposed()
+    public async Task Upload_file_endpoint_is_exposed()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -97,7 +97,7 @@ public async Task Upload_endpoint_is_exposed()
     }
 
     [Fact]
-    public async Task Exists_endpoint_is_exposed()
+    public async Task File_exists_endpoint_is_exposed()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -159,7 +159,7 @@ public async Task Exists_endpoint_is_exposed()
     }
 
     [Fact]
-    public async Task Download_endpoint_is_exposed()
+    public async Task Download_file_endpoint_is_exposed()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -227,4 +227,139 @@ public async Task Download_endpoint_is_exposed()
             }
             """);
     }
+
+    [Fact]
+    public async Task Send_email_endpoint_is_exposed()
+    {
+        // Act
+        JsonElement document = await _testContext.GetSwaggerDocumentAsync();
+
+        // Assert
+        document.Should().ContainPath("paths./emails/send.post").Should().BeJson("""
+            {
+              "tags": [
+                "emails"
+              ],
+              "description": "Sends an email to the specified recipient.",
+              "operationId": "sendEmail",
+              "requestBody": {
+                "content": {
+                  "application/json": {
+                    "schema": {
+                      "allOf": [
+                        {
+                          "$ref": "#/components/schemas/email"
+                        }
+                      ],
+                      "description": "The email to send."
+                    }
+                  }
+                },
+                "required": true
+              },
+              "responses": {
+                "200": {
+                  "description": "OK"
+                },
+                "400": {
+                  "description": "Bad Request",
+                  "content": {
+                    "application/problem+json": {
+                      "schema": {
+                        "$ref": "#/components/schemas/httpValidationProblemDetails"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            """);
+    }
+
+    [Fact]
+    public async Task Emails_sent_since_endpoint_is_exposed()
+    {
+        // Act
+        JsonElement document = await _testContext.GetSwaggerDocumentAsync();
+
+        // Assert
+        document.Should().ContainPath("paths./emails/sent-since.get").Should().BeJson("""
+            {
+              "tags": [
+                "emails"
+              ],
+              "description": "Gets all emails sent since the specified date/time.",
+              "operationId": "getSentSince",
+              "parameters": [
+                {
+                  "name": "sinceUtc",
+                  "in": "query",
+                  "description": "The date/time (in UTC) since which the email was sent.",
+                  "required": true,
+                  "schema": {
+                    "type": "string",
+                    "description": "The date/time (in UTC) since which the email was sent.",
+                    "format": "date-time"
+                  }
+                }
+              ],
+              "responses": {
+                "200": {
+                  "description": "OK",
+                  "content": {
+                    "application/json": {
+                      "schema": {
+                        "type": "array",
+                        "items": {
+                          "$ref": "#/components/schemas/email"
+                        }
+                      }
+                    }
+                  }
+                },
+                "400": {
+                  "description": "Bad Request",
+                  "content": {
+                    "application/problem+json": {
+                      "schema": {
+                        "$ref": "#/components/schemas/httpValidationProblemDetails"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            """);
+
+        document.Should().ContainPath("paths./emails/sent-since.head").Should().BeJson("""
+            {
+              "tags": [
+                "emails"
+              ],
+              "description": "Gets all emails sent since the specified date/time.",
+              "operationId": "tryGetSentSince",
+              "parameters": [
+                {
+                  "name": "sinceUtc",
+                  "in": "query",
+                  "description": "The date/time (in UTC) since which the email was sent.",
+                  "required": true,
+                  "schema": {
+                    "type": "string",
+                    "description": "The date/time (in UTC) since which the email was sent.",
+                    "format": "date-time"
+                  }
+                }
+              ],
+              "responses": {
+                "200": {
+                  "description": "OK"
+                },
+                "400": {
+                  "description": "Bad Request"
+                }
+              }
+            }
+            """);
+    }
 }
diff --git a/test/OpenApiTests/OpenApiTestContext.cs b/test/OpenApiTests/OpenApiTestContext.cs
index 7743ab753..5151e9a73 100644
--- a/test/OpenApiTests/OpenApiTestContext.cs
+++ b/test/OpenApiTests/OpenApiTestContext.cs
@@ -28,7 +28,7 @@ internal async Task GetSwaggerDocumentAsync()
         return await _lazySwaggerDocument.Value;
     }
 
-    private async Task CreateSwaggerDocumentAsync()
+    internal async Task CreateSwaggerDocumentAsync()
     {
         string content = await GetAsync("/swagger/v1/swagger.json");
 
diff --git a/test/OpenApiTests/ResourceInheritance/ConcurrencyTests.cs b/test/OpenApiTests/ResourceInheritance/ConcurrencyTests.cs
new file mode 100644
index 000000000..b7a7ce8e2
--- /dev/null
+++ b/test/OpenApiTests/ResourceInheritance/ConcurrencyTests.cs
@@ -0,0 +1,40 @@
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace OpenApiTests.ResourceInheritance;
+
+public sealed class ConcurrencyTests : ResourceInheritanceTests
+{
+    private readonly OpenApiTestContext, ResourceInheritanceDbContext> _testContext;
+
+    public ConcurrencyTests(OpenApiTestContext, ResourceInheritanceDbContext> testContext,
+        ITestOutputHelper testOutputHelper)
+        : base(testContext, testOutputHelper, true, false)
+    {
+        _testContext = testContext;
+
+        testContext.ConfigureServices(services => services.AddLogging(loggingBuilder => loggingBuilder.ClearProviders()));
+    }
+
+    [Fact]
+    public async Task Can_download_OpenAPI_documents_in_parallel()
+    {
+        // Arrange
+        const int count = 15;
+        var downloadTasks = new Task[count];
+
+        for (int index = 0; index < count; index++)
+        {
+            downloadTasks[index] = _testContext.CreateSwaggerDocumentAsync();
+        }
+
+        // Act
+        Func action = async () => await Task.WhenAll(downloadTasks);
+
+        // Assert
+        await action.Should().NotThrowAsync();
+    }
+}

From cd8ae40081a52074202102b64cfcbaef122a6fe1 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Sat, 2 Aug 2025 11:59:41 +0200
Subject: [PATCH 25/30] Enable to force-disable pagination per relationship
 (#1750)

* Add assertion method to clarify intent

* Remove redundant nullability suppressions

* Enable to enforce disabling pagination per relationship
---
 docs/build-dev.ps1                            |   1 +
 docs/usage/options.md                         |   3 +
 docs/usage/reading/pagination.md              |   3 +
 docs/usage/resources/relationships.md         |  11 +
 .../Resources/Annotations/HasManyAttribute.cs |  12 +
 .../HasManyAttribute.netstandard.cs           |   3 +
 .../Configuration/IJsonApiOptions.cs          |   3 +-
 .../Expressions/QueryExpressionRewriter.cs    |   2 +-
 .../Queries/Expressions/SortExpression.cs     |  16 +-
 .../Queries/QueryLayerComposer.cs             |  21 +-
 test/AnnotationTests/Models/TreeNode.cs       |   3 +-
 .../Relationships/FetchRelationshipTests.cs   |   4 +-
 .../ReadWrite/Resources/FetchResourceTests.cs |   6 +-
 .../AtomicOperations/OperationsDbContext.cs   |   2 +-
 .../CompositeKeys/CompositeDbContext.cs       |   2 +-
 .../ModelState/ModelStateDbContext.cs         |   2 +-
 .../Meta/TopLevelCountTests.cs                |   4 +-
 .../QueryStrings/Appointment.cs               |   5 +-
 .../DisablePaginationOnRelationshipTests.cs   | 238 ++++++++++++++++++
 .../QueryStrings/QueryStringDbContext.cs      |   6 +-
 .../IntegrationTests/QueryStrings/Reminder.cs |   3 +
 .../ReadWrite/ReadWriteDbContext.cs           |   2 +-
 .../Reading/ResourceDefinitionReadTests.cs    |   4 +-
 .../Serialization/SerializationDbContext.cs   |   2 +-
 .../ZeroKeys/ZeroKeyDbContext.cs              |   2 +-
 .../LegacyOpenApi/ResponseTests.cs            |  10 +-
 .../FluentMetaExtensions.cs                   |  11 +
 27 files changed, 351 insertions(+), 30 deletions(-)
 create mode 100644 test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/DisablePaginationOnRelationshipTests.cs

diff --git a/docs/build-dev.ps1 b/docs/build-dev.ps1
index 348233253..0a2f5eec2 100644
--- a/docs/build-dev.ps1
+++ b/docs/build-dev.ps1
@@ -18,6 +18,7 @@ function EnsureHttpServerIsInstalled {
         throw "Unable to find npm in your PATH. please install Node.js first."
     }
 
+    # If this command fails with ENOENT after installing Node.js on Windows, manually create the directory %APPDATA%\npm.
     npm list --depth 1 --global httpserver >$null
 
     if ($LastExitCode -eq 1) {
diff --git a/docs/usage/options.md b/docs/usage/options.md
index 7e89ff009..c78e9584e 100644
--- a/docs/usage/options.md
+++ b/docs/usage/options.md
@@ -59,6 +59,9 @@ options.IncludeTotalResourceCount = true;
 To retrieve the total number of resources on secondary and relationship endpoints, the reverse of the relationship must to be available. For example, in `GET /customers/1/orders`, both the relationships `[HasMany] Customer.Orders` and `[HasOne] Order.Customer` must be defined.
 If `IncludeTotalResourceCount` is set to `false` (or the inverse relationship is unavailable on a non-primary endpoint), best-effort pagination links are returned instead. This means no `last` link and the `next` link only occurs when the current page is full.
 
+> [!TIP]
+> Since v5.8, pagination can be [turned off per relationship](~/usage/resources/relationships.md#disable-pagination).
+
 ## Relative Links
 
 All links are absolute by default. However, you can configure relative links:
diff --git a/docs/usage/reading/pagination.md b/docs/usage/reading/pagination.md
index e53ae1c3a..dd02662c6 100644
--- a/docs/usage/reading/pagination.md
+++ b/docs/usage/reading/pagination.md
@@ -25,3 +25,6 @@ GET /api/blogs/1/articles?include=revisions&page[size]=10,revisions:5&page[numbe
 ## Configuring Default Behavior
 
 You can configure the global default behavior as described [here](~/usage/options.md#pagination).
+
+> [!TIP]
+> Since v5.8, pagination can be [turned off per relationship](~/usage/resources/relationships.md#disable-pagination).
diff --git a/docs/usage/resources/relationships.md b/docs/usage/resources/relationships.md
index f318b2ddc..b8c563e94 100644
--- a/docs/usage/resources/relationships.md
+++ b/docs/usage/resources/relationships.md
@@ -213,6 +213,17 @@ public class Person : Identifiable
 
 The left side of this relationship is of type `Person` (public name: "persons") and the right side is of type `TodoItem` (public name: "todoItems").
 
+### Disable pagination
+
+_since v5.8_
+
+Pagination can be turned off per to-many relationship by setting `DisablePagination` to `true`.
+When doing so, it overrules the global pagination settings in options, and any pagination used in the query string
+for the relationship.
+
+This feature exists for cases where the number of *related* resources is typically small.
+For example, while the number of products is usually high, the number of products *in a shopping basket* is not.
+
 ## HasManyThrough
 
 _removed since v5.0_
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.cs
index a906f4a66..7eb521aad 100644
--- a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.cs
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.cs
@@ -50,6 +50,18 @@ public HasManyCapabilities Capabilities
         set => _capabilities = value;
     }
 
+    /// 
+    /// When set to true, overrules the default page size, the page size from a resource definition, and the
+    /// 
+    /// page[size]
+    /// 
+    /// query string parameter by forcibly turning off pagination on the related resources for this relationship.
+    /// 
+    /// 
+    /// Caution: only use this when the number of related resources (along with their nested includes) is known to always be small.
+    /// 
+    public bool DisablePagination { get; set; }
+
     public HasManyAttribute()
     {
         _lazyIsManyToMany = new Lazy(EvaluateIsManyToMany, LazyThreadSafetyMode.PublicationOnly);
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.netstandard.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.netstandard.cs
index cf83f0ce1..9defe8d1d 100644
--- a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.netstandard.cs
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.netstandard.cs
@@ -11,4 +11,7 @@ public sealed class HasManyAttribute : RelationshipAttribute
 {
     /// 
     public HasManyCapabilities Capabilities { get; set; }
+
+    /// 
+    public bool DisablePagination { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs
index 7141125e4..b8ec3ab43 100644
--- a/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs
+++ b/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs
@@ -105,7 +105,8 @@ public interface IJsonApiOptions
     bool IncludeTotalResourceCount { get; }
 
     /// 
-    /// The page size (10 by default) that is used when not specified in query string. Set to null to not use pagination by default.
+    /// The page size (10 by default) that is used when not specified in query string. Set to null to not use pagination by default. This setting can
+    /// be overruled per relationship by setting  to true.
     /// 
     PageSize? DefaultPageSize { get; }
 
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs b/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs
index 173c77503..48613d6f6 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs
@@ -124,7 +124,7 @@ public override QueryExpression VisitIsType(IsTypeExpression expression, TArgume
 
         if (newElements.Count != 0)
         {
-            var newExpression = new SortExpression(newElements);
+            var newExpression = new SortExpression(newElements, expression.IsAutoGenerated);
             return newExpression.Equals(expression) ? expression : newExpression;
         }
 
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs
index 9c63e4601..d51ab6dff 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs
@@ -13,16 +13,27 @@ namespace JsonApiDotNetCore.Queries.Expressions;
 [PublicAPI]
 public class SortExpression : QueryExpression
 {
+    /// 
+    /// Indicates whether this expression was generated by JsonApiDotNetCore to ensure a deterministic order.
+    /// 
+    internal bool IsAutoGenerated { get; }
+
     /// 
     /// One or more elements to sort on.
     /// 
     public IImmutableList Elements { get; }
 
     public SortExpression(IImmutableList elements)
+        : this(elements, false)
+    {
+    }
+
+    internal SortExpression(IImmutableList elements, bool isAutoGenerated)
     {
         ArgumentGuard.NotNullNorEmpty(elements);
 
         Elements = elements;
+        IsAutoGenerated = isAutoGenerated;
     }
 
     public override TResult Accept(QueryExpressionVisitor visitor, TArgument argument)
@@ -37,7 +48,7 @@ public override string ToString()
 
     public override string ToFullString()
     {
-        return string.Join(",", Elements.Select(child => child.ToFullString()));
+        return $"{string.Join(",", Elements.Select(child => child.ToFullString()))}{(IsAutoGenerated ? " (auto-generated)" : "")}";
     }
 
     public override bool Equals(object? obj)
@@ -54,12 +65,13 @@ public override bool Equals(object? obj)
 
         var other = (SortExpression)obj;
 
-        return Elements.SequenceEqual(other.Elements);
+        return IsAutoGenerated == other.IsAutoGenerated && Elements.SequenceEqual(other.Elements);
     }
 
     public override int GetHashCode()
     {
         var hashCode = new HashCode();
+        hashCode.Add(IsAutoGenerated);
 
         foreach (SortElementExpression element in Elements)
         {
diff --git a/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs b/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs
index 7954aa0e7..020040e92 100644
--- a/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs
+++ b/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs
@@ -243,12 +243,13 @@ private IImmutableSet ProcessIncludeSet(IImmutableSet<
 
                 ResourceType resourceType = includeElement.Relationship.RightType;
                 bool isToManyRelationship = includeElement.Relationship is HasManyAttribute;
+                bool allowPagination = includeElement.Relationship is HasManyAttribute { DisablePagination: false };
 
                 var subLayer = new QueryLayer(resourceType)
                 {
                     Filter = isToManyRelationship ? GetFilter(expressionsInCurrentScope, resourceType) : null,
                     Sort = isToManyRelationship ? GetSort(expressionsInCurrentScope, resourceType) : null,
-                    Pagination = isToManyRelationship ? GetPagination(expressionsInCurrentScope, resourceType) : null,
+                    Pagination = allowPagination ? GetPagination(expressionsInCurrentScope, resourceType) : null,
                     Selection = GetSelectionForSparseAttributeSet(resourceType)
                 };
 
@@ -384,12 +385,26 @@ public QueryLayer WrapLayerForSecondaryEndpoint(QueryLayer secondaryLayer,
         FilterExpression? primaryFilter = GetFilter(Array.Empty(), primaryResourceType);
         AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResourceType);
 
-        return new QueryLayer(primaryResourceType)
+        var primaryLayer = new QueryLayer(primaryResourceType)
         {
             Include = RewriteIncludeForSecondaryEndpoint(innerInclude, relationship),
             Filter = CreateFilterByIds([primaryId], primaryIdAttribute, primaryFilter),
             Selection = primarySelection
         };
+
+        if (relationship is HasManyAttribute { DisablePagination: true } && secondaryLayer.Pagination != null)
+        {
+            // Undo pagination/sort. At the time secondaryLayer was being built, we were not yet aware that it needed to be turned off.
+            secondaryLayer.Pagination = null;
+            _paginationContext.PageSize = null;
+
+            if (secondaryLayer.Sort is { IsAutoGenerated: true })
+            {
+                secondaryLayer.Sort = null;
+            }
+        }
+
+        return primaryLayer;
     }
 
     private IncludeExpression RewriteIncludeForSecondaryEndpoint(IncludeExpression? relativeInclude, RelationshipAttribute secondaryRelationship)
@@ -554,7 +569,7 @@ private SortExpression CreateSortById(ResourceType resourceType)
     {
         AttrAttribute idAttribute = GetIdAttribute(resourceType);
         var idAscendingSort = new SortElementExpression(new ResourceFieldChainExpression(idAttribute), true);
-        return new SortExpression(ImmutableArray.Create(idAscendingSort));
+        return new SortExpression(ImmutableArray.Create(idAscendingSort), true);
     }
 
     protected virtual PaginationExpression GetPagination(IReadOnlyCollection expressionsInScope, ResourceType resourceType)
diff --git a/test/AnnotationTests/Models/TreeNode.cs b/test/AnnotationTests/Models/TreeNode.cs
index 269758fef..6afdb3599 100644
--- a/test/AnnotationTests/Models/TreeNode.cs
+++ b/test/AnnotationTests/Models/TreeNode.cs
@@ -17,6 +17,7 @@ public sealed class TreeNode : Identifiable
     [HasOne(PublicName = "orders", Capabilities = HasOneCapabilities.AllowView | HasOneCapabilities.AllowInclude, Links = LinkTypes.All)]
     public TreeNode? Parent { get; set; }
 
-    [HasMany(PublicName = "orders", Capabilities = HasManyCapabilities.AllowView | HasManyCapabilities.AllowFilter, Links = LinkTypes.All)]
+    [HasMany(PublicName = "orders", Capabilities = HasManyCapabilities.AllowView | HasManyCapabilities.AllowFilter, Links = LinkTypes.All,
+        DisablePagination = true)]
     public ISet Children { get; set; } = new HashSet();
 }
diff --git a/test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs b/test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs
index 9783672e6..961f4e9f9 100644
--- a/test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs
+++ b/test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs
@@ -50,7 +50,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         responseDocument.Data.SingleValue.Type.Should().Be("people");
         responseDocument.Data.SingleValue.Id.Should().Be(todoItem.Owner.StringId);
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
 
         store.SqlCommands.Should().HaveCount(1);
 
@@ -95,7 +95,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         responseDocument.Data.Value.Should().BeNull();
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
 
         store.SqlCommands.Should().HaveCount(1);
 
diff --git a/test/DapperTests/IntegrationTests/ReadWrite/Resources/FetchResourceTests.cs b/test/DapperTests/IntegrationTests/ReadWrite/Resources/FetchResourceTests.cs
index 52bb378b2..40a3345a9 100644
--- a/test/DapperTests/IntegrationTests/ReadWrite/Resources/FetchResourceTests.cs
+++ b/test/DapperTests/IntegrationTests/ReadWrite/Resources/FetchResourceTests.cs
@@ -128,7 +128,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         responseDocument.Data.SingleValue.Attributes.Should().ContainKey("modifiedAt").WhoseValue.Should().Be(todoItem.LastModifiedAt);
         responseDocument.Data.SingleValue.Relationships.Should().OnlyContainKeys("owner", "assignee", "tags");
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
 
         store.SqlCommands.Should().HaveCount(1);
 
@@ -285,7 +285,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         responseDocument.Data.SingleValue.Attributes.Should().ContainKey("displayName").WhoseValue.Should().Be(todoItem.Owner.DisplayName);
         responseDocument.Data.SingleValue.Relationships.Should().OnlyContainKeys("account", "ownedTodoItems", "assignedTodoItems");
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
 
         store.SqlCommands.Should().HaveCount(1);
 
@@ -329,7 +329,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         responseDocument.Data.SingleValue.Should().BeNull();
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
 
         store.SqlCommands.Should().HaveCount(1);
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs
index e13a92294..5619615c0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs
@@ -21,7 +21,7 @@ protected override void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity()
             .HasOne(musicTrack => musicTrack.Lyric)
-            .WithOne(lyric => lyric.Track!)
+            .WithOne(lyric => lyric.Track)
             .HasForeignKey("LyricId");
 
         builder.Entity()
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs
index c4f8e0f26..6095238d3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs
@@ -30,7 +30,7 @@ protected override void OnModelCreating(ModelBuilder builder)
 
         builder.Entity()
             .HasMany(dealership => dealership.Inventory)
-            .WithOne(car => car.Dealership!);
+            .WithOne(car => car.Dealership);
 
         builder.Entity()
             .HasMany(car => car.PreviousDealerships)
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs
index 9a480988c..c3adeca21 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs
@@ -24,7 +24,7 @@ protected override void OnModelCreating(ModelBuilder builder)
 
         builder.Entity()
             .HasMany(systemDirectory => systemDirectory.Subdirectories)
-            .WithOne(systemDirectory => systemDirectory.Parent!);
+            .WithOne(systemDirectory => systemDirectory.Parent);
 
         builder.Entity()
             .HasOne(systemDirectory => systemDirectory.Self)
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
index aa4eb0659..f07911d32 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -122,7 +122,7 @@ public async Task Hides_resource_count_in_create_resource_response()
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.Created);
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
     }
 
     [Fact]
@@ -160,6 +160,6 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
index 36a93f9ee..41a05b13f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
@@ -20,6 +20,9 @@ public sealed class Appointment : Identifiable
     [Attr]
     public DateTimeOffset EndTime { get; set; }
 
-    [HasMany]
+    [HasOne]
+    public Calendar? Calendar { get; set; }
+
+    [HasMany(DisablePagination = true)]
     public IList Reminders { get; set; } = new List();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/DisablePaginationOnRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/DisablePaginationOnRelationshipTests.cs
new file mode 100644
index 000000000..219d1a58e
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/DisablePaginationOnRelationshipTests.cs
@@ -0,0 +1,238 @@
+using System.Net;
+using FluentAssertions;
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Queries.Expressions;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Serialization.Objects;
+using Microsoft.Extensions.DependencyInjection;
+using TestBuildingBlocks;
+using Xunit;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Includes;
+
+public sealed class DisablePaginationOnRelationshipTests : IClassFixture, QueryStringDbContext>>
+{
+    private readonly IntegrationTestContext, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
+
+    public DisablePaginationOnRelationshipTests(IntegrationTestContext, QueryStringDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController();
+        testContext.UseController();
+
+        testContext.ConfigureServices(services =>
+        {
+            services.AddResourceDefinition();
+            services.AddSingleton();
+        });
+
+        var paginationToggle = testContext.Factory.Services.GetRequiredService();
+        paginationToggle.IsEnabled = false;
+        paginationToggle.IsCalled = false;
+
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService();
+        options.DefaultPageSize = new PageSize(5);
+        options.UseRelativeLinks = true;
+        options.IncludeTotalResourceCount = true;
+    }
+
+    [Fact]
+    public async Task Can_include_in_primary_resources()
+    {
+        // Arrange
+        Appointment appointment = _fakers.Appointment.GenerateOne();
+        appointment.Reminders = _fakers.Reminder.GenerateList(7);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync();
+            dbContext.Appointments.Add(appointment);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "appointments?include=reminders";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync(route);
+
+        // Assert
+        httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.Should().HaveCount(1);
+        responseDocument.Data.ManyValue[0].Type.Should().Be("appointments");
+        responseDocument.Data.ManyValue[0].Id.Should().Be(appointment.StringId);
+
+        responseDocument.Data.ManyValue[0].Relationships.Should().ContainKey("reminders").WhoseValue.With(value =>
+        {
+            value.Should().NotBeNull();
+            value.Data.ManyValue.Should().HaveCount(7);
+
+            value.Links.Should().NotBeNull();
+            value.Links.Self.Should().Be($"/appointments/{appointment.StringId}/relationships/reminders");
+            value.Links.Related.Should().Be($"/appointments/{appointment.StringId}/reminders");
+        });
+
+        responseDocument.Included.Should().HaveCount(7);
+        responseDocument.Included.Should().AllSatisfy(resource => resource.Type.Should().Be("reminders"));
+
+        responseDocument.Meta.Should().ContainTotal(1);
+    }
+
+    [Fact]
+    public async Task Can_get_all_secondary_resources()
+    {
+        // Arrange
+        Appointment appointment = _fakers.Appointment.GenerateOne();
+        appointment.Reminders = _fakers.Reminder.GenerateList(7);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Appointments.Add(appointment);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"appointments/{appointment.StringId}/reminders";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync(route);
+
+        // Assert
+        httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.Should().HaveCount(7);
+        responseDocument.Data.ManyValue.Should().AllSatisfy(resource => resource.Type.Should().Be("reminders"));
+
+        responseDocument.Links.Should().NotBeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+
+        responseDocument.Meta.Should().ContainTotal(7);
+    }
+
+    [Fact]
+    public async Task Can_get_ToMany_relationship()
+    {
+        // Arrange
+        Appointment appointment = _fakers.Appointment.GenerateOne();
+        appointment.Reminders = _fakers.Reminder.GenerateList(7);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Appointments.Add(appointment);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"appointments/{appointment.StringId}/relationships/reminders";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync(route);
+
+        // Assert
+        httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.Should().HaveCount(7);
+        responseDocument.Data.ManyValue.Should().AllSatisfy(resource => resource.Type.Should().Be("reminders"));
+
+        responseDocument.Links.Should().NotBeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+
+        responseDocument.Meta.Should().ContainTotal(7);
+    }
+
+    [Fact]
+    public async Task Ignores_pagination_from_query_string()
+    {
+        // Arrange
+        Calendar calendar = _fakers.Calendar.GenerateOne();
+        calendar.Appointments = _fakers.Appointment.GenerateSet(3);
+        calendar.Appointments.ElementAt(0).Reminders = _fakers.Reminder.GenerateList(7);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Calendars.Add(calendar);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"calendars/{calendar.StringId}/appointments?include=reminders&page[size]=2,reminders:4";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync(route);
+
+        // Assert
+        httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.Should().HaveCount(2);
+        responseDocument.Data.ManyValue.Should().AllSatisfy(resource => resource.Type.Should().Be("appointments"));
+
+        ResourceObject firstAppointment = responseDocument.Data.ManyValue.Single(resource => resource.Id == calendar.Appointments.ElementAt(0).StringId);
+
+        firstAppointment.Relationships.Should().ContainKey("reminders").WhoseValue.With(value =>
+        {
+            value.Should().NotBeNull();
+            value.Data.ManyValue.Should().HaveCount(7);
+        });
+
+        responseDocument.Included.Should().HaveCount(7);
+        responseDocument.Included.Should().AllSatisfy(resource => resource.Type.Should().Be("reminders"));
+
+        responseDocument.Meta.Should().ContainTotal(3);
+    }
+
+    [Fact]
+    public async Task Ignores_pagination_from_resource_definition()
+    {
+        // Arrange
+        var paginationToggle = _testContext.Factory.Services.GetRequiredService();
+        paginationToggle.IsEnabled = true;
+
+        Appointment appointment = _fakers.Appointment.GenerateOne();
+        appointment.Reminders = _fakers.Reminder.GenerateList(7);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Appointments.Add(appointment);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"appointments/{appointment.StringId}/reminders";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync(route);
+
+        // Assert
+        httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.Should().HaveCount(7);
+        responseDocument.Data.ManyValue.Should().AllSatisfy(resource => resource.Type.Should().Be("reminders"));
+
+        responseDocument.Meta.Should().ContainTotal(7);
+
+        paginationToggle.IsCalled.Should().BeTrue();
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class ReminderDefinition(PaginationToggle paginationToggle, IResourceGraph resourceGraph)
+        : JsonApiResourceDefinition(resourceGraph)
+    {
+        private readonly PaginationToggle _paginationToggle = paginationToggle;
+
+        public override PaginationExpression? OnApplyPagination(PaginationExpression? existingPagination)
+        {
+            _paginationToggle.IsCalled = true;
+            return _paginationToggle.IsEnabled ? new PaginationExpression(PageNumber.ValueOne, new PageSize(4)) : existingPagination;
+        }
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class PaginationToggle
+    {
+        public bool IsEnabled { get; set; }
+        public bool IsCalled { get; set; }
+    }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs
index 0a7102c3d..4ea8f13b5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs
@@ -28,13 +28,17 @@ protected override void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity()
             .HasMany(webAccount => webAccount.Posts)
-            .WithOne(blogPost => blogPost.Author!);
+            .WithOne(blogPost => blogPost.Author);
 
         builder.Entity()
             .HasOne(man => man.Wife)
             .WithOne(woman => woman.Husband)
             .HasForeignKey();
 
+        builder.Entity()
+            .HasMany(calendar => calendar.Appointments)
+            .WithOne(appointment => appointment.Calendar);
+
         base.OnModelCreating(builder);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Reminder.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Reminder.cs
index 6143df11b..34759f50d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Reminder.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Reminder.cs
@@ -10,4 +10,7 @@ public sealed class Reminder : Identifiable
 {
     [Attr]
     public DateTime RemindsAt { get; set; }
+
+    [HasOne]
+    public Appointment? Appointment { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs
index b76f01844..c1296f1c9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs
@@ -29,7 +29,7 @@ protected override void OnModelCreating(ModelBuilder builder)
 
         builder.Entity()
             .HasOne(workItemGroup => workItemGroup.Color)
-            .WithOne(color => color.Group!)
+            .WithOne(color => color.Group)
             .HasForeignKey("GroupId");
 
         builder.Entity()
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
index c22619a82..c6cc458ce 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
@@ -438,7 +438,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         responseDocument.Data.ManyValue.Should().HaveCount(1);
         responseDocument.Data.ManyValue[0].Id.Should().Be(star.Planets.ElementAt(0).StringId);
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
 
         hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
@@ -534,7 +534,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         responseDocument.Data.ManyValue.Should().HaveCount(1);
         responseDocument.Data.ManyValue[0].Id.Should().Be(star.Planets.ElementAt(0).StringId);
 
-        responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().NotContainTotal();
 
         hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs
index cbbf8142c..9282998c6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs
@@ -17,7 +17,7 @@ protected override void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity()
             .HasMany(scholarship => scholarship.Participants)
-            .WithOne(student => student.Scholarship!);
+            .WithOne(student => student.Scholarship);
 
         base.OnModelCreating(builder);
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs
index 836a4637d..a3fb6045e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs
@@ -18,7 +18,7 @@ protected override void OnModelCreating(ModelBuilder builder)
     {
         builder.Entity()
             .HasMany(game => game.Maps)
-            .WithOne(map => map.Game!);
+            .WithOne(map => map.Game);
 
         builder.Entity()
             .HasOne(player => player.ActiveGame)
diff --git a/test/OpenApiNSwagClientTests/LegacyOpenApi/ResponseTests.cs b/test/OpenApiNSwagClientTests/LegacyOpenApi/ResponseTests.cs
index 0da98c30a..c8c88f6d4 100644
--- a/test/OpenApiNSwagClientTests/LegacyOpenApi/ResponseTests.cs
+++ b/test/OpenApiNSwagClientTests/LegacyOpenApi/ResponseTests.cs
@@ -102,7 +102,7 @@ public async Task Getting_resource_collection_translates_response()
         // Assert
         response.Jsonapi.Should().BeNull();
         response.Meta.Should().HaveCount(1);
-        response.Meta["total-resources"].Should().Be(documentMetaValue);
+        response.Meta.Should().ContainKey("total-resources").WhoseValue.Should().Be(documentMetaValue);
         response.Links.Self.Should().Be(topLevelLink);
         response.Links.First.Should().Be(topLevelLink);
         response.Links.Last.Should().Be(topLevelLink);
@@ -112,7 +112,7 @@ public async Task Getting_resource_collection_translates_response()
         flight.Id.Should().Be(flightId);
         flight.Links.Self.Should().Be(flightResourceLink);
         flight.Meta.Should().HaveCount(1);
-        flight.Meta["docs"].Should().Be(flightMetaValue);
+        flight.Meta.Should().ContainKey("docs").WhoseValue.Should().Be(flightMetaValue);
 
         flight.Attributes.FinalDestination.Should().Be(flightDestination);
         flight.Attributes.StopOverDestination.Should().BeNull();
@@ -128,19 +128,19 @@ public async Task Getting_resource_collection_translates_response()
         flight.Relationships.Purser.Links.Self.Should().Be($"{flightResourceLink}/relationships/purser");
         flight.Relationships.Purser.Links.Related.Should().Be($"{flightResourceLink}/purser");
         flight.Relationships.Purser.Meta.Should().HaveCount(1);
-        flight.Relationships.Purser.Meta["docs"].Should().Be(purserMetaValue);
+        flight.Relationships.Purser.Meta.Should().ContainKey("docs").WhoseValue.Should().Be(purserMetaValue);
 
         flight.Relationships.CabinCrewMembers.Data.Should().BeNull();
         flight.Relationships.CabinCrewMembers.Links.Self.Should().Be($"{flightResourceLink}/relationships/cabin-crew-members");
         flight.Relationships.CabinCrewMembers.Links.Related.Should().Be($"{flightResourceLink}/cabin-crew-members");
         flight.Relationships.CabinCrewMembers.Meta.Should().HaveCount(1);
-        flight.Relationships.CabinCrewMembers.Meta["docs"].Should().Be(cabinCrewMembersMetaValue);
+        flight.Relationships.CabinCrewMembers.Meta.Should().ContainKey("docs").WhoseValue.Should().Be(cabinCrewMembersMetaValue);
 
         flight.Relationships.Passengers.Data.Should().BeNull();
         flight.Relationships.Passengers.Links.Self.Should().Be($"{flightResourceLink}/relationships/passengers");
         flight.Relationships.Passengers.Links.Related.Should().Be($"{flightResourceLink}/passengers");
         flight.Relationships.Passengers.Meta.Should().HaveCount(1);
-        flight.Relationships.Passengers.Meta["docs"].Should().Be(passengersMetaValue);
+        flight.Relationships.Passengers.Meta.Should().ContainKey("docs").WhoseValue.Should().Be(passengersMetaValue);
     }
 
     [Fact]
diff --git a/test/TestBuildingBlocks/FluentMetaExtensions.cs b/test/TestBuildingBlocks/FluentMetaExtensions.cs
index ff81bb47f..72a5a8bb2 100644
--- a/test/TestBuildingBlocks/FluentMetaExtensions.cs
+++ b/test/TestBuildingBlocks/FluentMetaExtensions.cs
@@ -19,6 +19,17 @@ public static void ContainTotal(this GenericDictionaryAssertions
+    /// Asserts that a "meta" dictionary does not contain a single element named "total" when not null.
+    /// 
+    [CustomAssertion]
+#pragma warning disable AV1553 // Do not use optional parameters with default value null for strings, collections or tasks
+    public static void NotContainTotal(this GenericDictionaryAssertions, string, object?> source, string? keyName = null)
+#pragma warning restore AV1553 // Do not use optional parameters with default value null for strings, collections or tasks
+    {
+        source.Subject?.Should().NotContainKey(keyName ?? "total");
+    }
+
     /// 
     /// Asserts that a "meta" dictionary contains a single element named "requestBody" that isn't empty.
     /// 

From 7601fe4f3b712b22800aedf6702e290b1957c82b Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Sat, 2 Aug 2025 14:59:59 +0200
Subject: [PATCH 26/30] Add unit tests to cover primitive methods on
 QueryExpression types (#1751)

---
 .../Queries/Expressions/LogicalExpression.cs  |   4 +-
 .../Expressions/NullConstantExpression.cs     |  12 +-
 .../UnitTests/Queries/QueryExpressionTests.cs | 367 ++++++++++++++++++
 3 files changed, 369 insertions(+), 14 deletions(-)
 create mode 100644 test/JsonApiDotNetCoreTests/UnitTests/Queries/QueryExpressionTests.cs

diff --git a/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs
index 416303b06..47af9f8b7 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs
@@ -52,9 +52,7 @@ public LogicalExpression(LogicalOperator @operator, IImmutableList terms = filters.WhereNotNull().ToImmutableArray();
+        ImmutableArray terms = [.. filters.WhereNotNull()];
 
         return terms.Length > 1 ? new LogicalExpression(@operator, terms) : terms.FirstOrDefault();
     }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs
index 9685b6625..9a0e9c7dd 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs
@@ -35,17 +35,7 @@ public override string ToFullString()
 
     public override bool Equals(object? obj)
     {
-        if (ReferenceEquals(this, obj))
-        {
-            return true;
-        }
-
-        if (obj is null || GetType() != obj.GetType())
-        {
-            return false;
-        }
-
-        return true;
+        return ReferenceEquals(this, obj);
     }
 
     public override int GetHashCode()
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Queries/QueryExpressionTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Queries/QueryExpressionTests.cs
new file mode 100644
index 000000000..ad2d4a8d8
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Queries/QueryExpressionTests.cs
@@ -0,0 +1,367 @@
+using System.Collections.Immutable;
+using FluentAssertions;
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Queries.Expressions;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace JsonApiDotNetCoreTests.UnitTests.Queries;
+
+public sealed class QueryExpressionTests
+{
+    public static IEnumerable ExpressionTestData =>
+        new QueryExpression[][]
+        {
+            [
+                TestExpressionFactory.Instance.Any(),
+                TestExpressionFactory.Instance.Any()
+            ],
+            [
+                TestExpressionFactory.Instance.Comparison(),
+                TestExpressionFactory.Instance.Comparison()
+            ],
+            [
+                TestExpressionFactory.Instance.Count(),
+                TestExpressionFactory.Instance.Count()
+            ],
+            [
+                TestExpressionFactory.Instance.Has(),
+                TestExpressionFactory.Instance.Has()
+            ],
+            [
+                TestExpressionFactory.Instance.IncludeElement(),
+                TestExpressionFactory.Instance.IncludeElement()
+            ],
+            [
+                TestExpressionFactory.Instance.Include(),
+                TestExpressionFactory.Instance.Include()
+            ],
+            [
+                TestExpressionFactory.Instance.IsType(),
+                TestExpressionFactory.Instance.IsType()
+            ],
+            [
+                TestExpressionFactory.Instance.LiteralConstant(),
+                TestExpressionFactory.Instance.LiteralConstant()
+            ],
+            [
+                TestExpressionFactory.Instance.Logical(),
+                TestExpressionFactory.Instance.Logical()
+            ],
+            [
+                TestExpressionFactory.Instance.MatchText(),
+                TestExpressionFactory.Instance.MatchText()
+            ],
+            [
+                TestExpressionFactory.Instance.Not(),
+                TestExpressionFactory.Instance.Not()
+            ],
+            [
+                TestExpressionFactory.Instance.NullConstant(),
+                TestExpressionFactory.Instance.NullConstant()
+            ],
+            [
+                TestExpressionFactory.Instance.PaginationElementQueryStringValue(),
+                TestExpressionFactory.Instance.PaginationElementQueryStringValue()
+            ],
+            [
+                TestExpressionFactory.Instance.Pagination(),
+                TestExpressionFactory.Instance.Pagination()
+            ],
+            [
+                TestExpressionFactory.Instance.PaginationQueryStringValue(),
+                TestExpressionFactory.Instance.PaginationQueryStringValue()
+            ],
+            [
+                TestExpressionFactory.Instance.QueryableHandler(),
+                TestExpressionFactory.Instance.QueryableHandler()
+            ],
+            [
+                TestExpressionFactory.Instance.QueryStringParameterScope(),
+                TestExpressionFactory.Instance.QueryStringParameterScope()
+            ],
+            [
+                TestExpressionFactory.Instance.ResourceFieldChainForText(),
+                TestExpressionFactory.Instance.ResourceFieldChainForText()
+            ],
+            [
+                TestExpressionFactory.Instance.ResourceFieldChainForParent(),
+                TestExpressionFactory.Instance.ResourceFieldChainForParent()
+            ],
+            [
+                TestExpressionFactory.Instance.ResourceFieldChainForChildren(),
+                TestExpressionFactory.Instance.ResourceFieldChainForChildren()
+            ],
+            [
+                TestExpressionFactory.Instance.SortElement(),
+                TestExpressionFactory.Instance.SortElement()
+            ],
+            [
+                TestExpressionFactory.Instance.Sort(),
+                TestExpressionFactory.Instance.Sort()
+            ],
+            [
+                TestExpressionFactory.Instance.SparseFieldSet(),
+                TestExpressionFactory.Instance.SparseFieldSet()
+            ],
+            [
+                TestExpressionFactory.Instance.SparseFieldTable(),
+                TestExpressionFactory.Instance.SparseFieldTable()
+            ]
+        };
+
+    [Theory]
+    [MemberData(nameof(ExpressionTestData))]
+    public void Expressions_are_equal(QueryExpression left, QueryExpression right)
+    {
+        // Assert
+        left.Equals(right).Should().BeTrue();
+        right.Equals(left).Should().BeTrue();
+
+        // ReSharper disable once EqualExpressionComparison
+        left.Equals(left).Should().BeTrue();
+    }
+
+    [Theory]
+    [MemberData(nameof(ExpressionTestData))]
+    public void Expressions_are_not_equal_to_null(QueryExpression left, QueryExpression right)
+    {
+        // Assert
+        left.Equals(null).Should().BeFalse();
+        right.Equals(null).Should().BeFalse();
+    }
+
+    [Theory]
+    [MemberData(nameof(ExpressionTestData))]
+    public void Expressions_have_same_hash_code(QueryExpression left, QueryExpression right)
+    {
+        // Assert
+        left.GetHashCode().Should().Be(right.GetHashCode());
+    }
+
+    [Theory]
+    [MemberData(nameof(ExpressionTestData))]
+    public void Expressions_convert_to_same_string(QueryExpression left, QueryExpression right)
+    {
+        // Assert
+        left.ToString().Should().Be(right.ToString());
+    }
+
+    [Theory]
+    [MemberData(nameof(ExpressionTestData))]
+    public void Expressions_convert_to_same_full_string(QueryExpression left, QueryExpression right)
+    {
+        // Assert
+        left.ToFullString().Should().Be(right.ToFullString());
+    }
+
+    [Theory]
+    [MemberData(nameof(ExpressionTestData))]
+    public void Expressions_have_same_return_type(QueryExpression left, QueryExpression right)
+    {
+        if (left is FunctionExpression leftFunction && right is FunctionExpression rightFunction)
+        {
+            // Assert
+            leftFunction.ReturnType.Should().Be(rightFunction.ReturnType);
+        }
+    }
+
+    [Theory]
+    [MemberData(nameof(ExpressionTestData))]
+    public void Expressions_can_accept_visitor(QueryExpression left, QueryExpression right)
+    {
+        // Assert
+        left.Accept(EmptyQueryExpressionVisitor.Instance, null).Should().BeNull();
+        right.Accept(EmptyQueryExpressionVisitor.Instance, null).Should().BeNull();
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private class BaseTestResource : Identifiable
+    {
+        [Attr]
+        public string? Text { get; set; }
+
+        [HasOne]
+        public BaseTestResource? Parent { get; set; }
+
+        [HasMany]
+        public ISet Children { get; set; } = new HashSet();
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class DerivedTestResource : BaseTestResource;
+
+    private sealed class TestExpressionFactory
+    {
+        private readonly ResourceType _baseTestResourceType;
+        private readonly ResourceType _derivedTestResourceType;
+        private readonly AttrAttribute _textAttribute;
+        private readonly RelationshipAttribute _parentRelationship;
+        private readonly RelationshipAttribute _childrenRelationship;
+        public static TestExpressionFactory Instance { get; } = new();
+
+        private TestExpressionFactory()
+        {
+            var options = new JsonApiOptions();
+
+            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+            builder.Add();
+            builder.Add();
+            IResourceGraph resourceGraph = builder.Build();
+
+            _baseTestResourceType = resourceGraph.GetResourceType();
+            _derivedTestResourceType = resourceGraph.GetResourceType();
+            _textAttribute = _baseTestResourceType.GetAttributeByPropertyName(nameof(BaseTestResource.Text));
+            _parentRelationship = _baseTestResourceType.GetRelationshipByPropertyName(nameof(BaseTestResource.Parent));
+            _childrenRelationship = _baseTestResourceType.GetRelationshipByPropertyName(nameof(BaseTestResource.Children));
+        }
+
+        public AnyExpression Any()
+        {
+            return new AnyExpression(ResourceFieldChainForText(), [LiteralConstant()]);
+        }
+
+        public ComparisonExpression Comparison()
+        {
+            return new ComparisonExpression(ComparisonOperator.Equals, ResourceFieldChainForText(), LiteralConstant());
+        }
+
+        public CountExpression Count()
+        {
+            return new CountExpression(ResourceFieldChainForChildren());
+        }
+
+        public HasExpression Has()
+        {
+            return new HasExpression(ResourceFieldChainForChildren(), Comparison());
+        }
+
+        public IncludeElementExpression IncludeElement()
+        {
+            return new IncludeElementExpression(_parentRelationship, [new IncludeElementExpression(_childrenRelationship)]);
+        }
+
+        public IncludeExpression Include()
+        {
+            return new IncludeExpression([IncludeElement()]);
+        }
+
+        public IsTypeExpression IsType()
+        {
+            return new IsTypeExpression(ResourceFieldChainForParent(), _derivedTestResourceType, Has());
+        }
+
+        public LiteralConstantExpression LiteralConstant()
+        {
+            return new LiteralConstantExpression("example");
+        }
+
+        public LogicalExpression Logical()
+        {
+            return new LogicalExpression(LogicalOperator.Or, Comparison(), MatchText());
+        }
+
+        public MatchTextExpression MatchText()
+        {
+            return new MatchTextExpression(ResourceFieldChainForText(), LiteralConstant(), TextMatchKind.Contains);
+        }
+
+        public NotExpression Not()
+        {
+            return new NotExpression(Comparison());
+        }
+
+        public NullConstantExpression NullConstant()
+        {
+            return NullConstantExpression.Instance;
+        }
+
+        public PaginationElementQueryStringValueExpression PaginationElementQueryStringValue()
+        {
+            return new PaginationElementQueryStringValueExpression(ResourceFieldChainForChildren(), 5, 8);
+        }
+
+        public PaginationExpression Pagination()
+        {
+            return new PaginationExpression(new PageNumber(2), new PageSize(5));
+        }
+
+        public PaginationQueryStringValueExpression PaginationQueryStringValue()
+        {
+            return new PaginationQueryStringValueExpression([PaginationElementQueryStringValue()]);
+        }
+
+        public QueryableHandlerExpression QueryableHandler()
+        {
+#pragma warning disable CS8974 // Converting method group to non-delegate type
+            object handler = TestQueryableHandler;
+#pragma warning restore CS8974 // Converting method group to non-delegate type
+            return new QueryableHandlerExpression(handler, "disableCache");
+        }
+
+        public QueryStringParameterScopeExpression QueryStringParameterScope()
+        {
+            return new QueryStringParameterScopeExpression(LiteralConstant(), ResourceFieldChainForChildren());
+        }
+
+        public ResourceFieldChainExpression ResourceFieldChainForText()
+        {
+            return new ResourceFieldChainExpression(_textAttribute);
+        }
+
+        public ResourceFieldChainExpression ResourceFieldChainForParent()
+        {
+            return new ResourceFieldChainExpression([_parentRelationship]);
+        }
+
+        public ResourceFieldChainExpression ResourceFieldChainForChildren()
+        {
+            return new ResourceFieldChainExpression([_childrenRelationship]);
+        }
+
+        public SortElementExpression SortElement()
+        {
+            return new SortElementExpression(Count(), false);
+        }
+
+        public SortExpression Sort()
+        {
+            return new SortExpression([SortElement()]);
+        }
+
+        public SparseFieldSetExpression SparseFieldSet()
+        {
+            return new SparseFieldSetExpression([
+                _textAttribute,
+                _childrenRelationship
+            ]);
+        }
+
+        public SparseFieldTableExpression SparseFieldTable()
+        {
+            return new SparseFieldTableExpression(new Dictionary
+            {
+                [_baseTestResourceType] = SparseFieldSet(),
+                [_derivedTestResourceType] = SparseFieldSet()
+            }.ToImmutableDictionary());
+        }
+
+        private static IQueryable TestQueryableHandler(IQueryable source, StringValues parameterValue)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    private sealed class EmptyQueryExpressionVisitor : QueryExpressionVisitor
+    {
+        public static EmptyQueryExpressionVisitor Instance { get; } = new();
+
+        private EmptyQueryExpressionVisitor()
+        {
+        }
+    }
+}

From e80d7da98b75b57e2eb4d0aa5a2d6d82d1b5a0ba Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:09:41 +0200
Subject: [PATCH 27/30] Package updates (#1753)

* Package updates

* Upload InspectCode output to artefacts
---
 .config/dotnet-tools.json                                  | 4 ++--
 .github/workflows/build.yml                                | 5 +++++
 Directory.Build.props                                      | 2 +-
 package-versions.props                                     | 7 ++++---
 .../JsonApiDotNetCore.Annotations.csproj                   | 2 ++
 .../JsonApiEndpointsCopy.cs                                | 3 +++
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index b665b78a1..73a68f926 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2025.1.4",
+      "version": "2025.1.5",
       "commands": [
         "jb"
       ],
@@ -17,7 +17,7 @@
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.4.7",
+      "version": "5.4.11",
       "commands": [
         "reportgenerator"
       ],
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c7db60d2..e3391b620 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -169,6 +169,11 @@ jobs:
         $inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
         Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         dotnet jb inspectcode JsonApiDotNetCore.sln --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --format="xml" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
+    - name: Upload output to artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: InspectCode-${{ matrix.os }}
+        path: ${{ env.INSPECT_CODE_OUTPUT_PATH }}
     - name: Verify outcome
       shell: pwsh
       run: |
diff --git a/Directory.Build.props b/Directory.Build.props
index 1ef255f56..952094cac 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -54,7 +54,7 @@
   
 
   
-    
+    
     
     
   
diff --git a/package-versions.props b/package-versions.props
index 4344ce16e..e77a2ae86 100644
--- a/package-versions.props
+++ b/package-versions.props
@@ -4,8 +4,9 @@
     4.1.0
     0.4.1
     2.14.1
-    9.0.1
     13.0.3
+    9.0.3
+    4.3.1
 
     
     0.15.*
@@ -21,10 +22,10 @@
     9.0.*
     9.0.*
     0.9.*
-    14.4.*
+    14.5.*
     13.0.*
     4.1.*
-    2.4.*
+    2.6.*
     9.*-*
     9.0.*
     17.14.*
diff --git a/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj b/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj
index ed36e0797..d61547608 100644
--- a/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj
+++ b/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj
@@ -46,5 +46,7 @@
 
   
     
+    
   
 
diff --git a/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs b/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs
index 911be3f35..56e924317 100644
--- a/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs
+++ b/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs
@@ -1,6 +1,9 @@
+using JetBrains.Annotations;
+
 namespace JsonApiDotNetCore.SourceGenerators;
 
 // IMPORTANT: A copy of this type exists in the JsonApiDotNetCore project. Keep these in sync when making changes.
+[PublicAPI]
 [Flags]
 public enum JsonApiEndpointsCopy
 {

From 143e6b1ca522b7ed5fddaecd6469b1e4925ac38a Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Wed, 6 Aug 2025 14:42:31 +0200
Subject: [PATCH 28/30] Prepare for next release: 5.8.0

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 952094cac..d43e6d032 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,7 +9,7 @@
     Recommended
     $(MSBuildThisFileDirectory)CodingGuidelines.ruleset
     $(MSBuildThisFileDirectory)tests.runsettings
-    5.7.2
+    5.8.0
     pre
     3
     direct

From e9cb48386c5d7be8173ea072a48d873cfdf95aa2 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Wed, 6 Aug 2025 15:55:14 +0200
Subject: [PATCH 29/30] Increment version to 5.8.1/preview4 (used for
 pre-release builds from ci)

---
 Directory.Build.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index d43e6d032..2282cd9cb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,9 +9,9 @@
     Recommended
     $(MSBuildThisFileDirectory)CodingGuidelines.ruleset
     $(MSBuildThisFileDirectory)tests.runsettings
-    5.8.0
+    5.8.1
     pre
-    3
+    4
     direct
   
 

From 72ae8c2a55ed75764319278b137088c76d56250a Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Thu, 7 Aug 2025 00:44:12 +0200
Subject: [PATCH 30/30] Fix roundtrip of Parse/ToString for include query
 string parameters (#1754)

---
 .../Queries/Expressions/IncludeExpression.cs  |  2 +-
 .../IncludeParseTests.cs                      | 38 +++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs
index 235e811ff..b1d5bd00f 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs
@@ -52,7 +52,7 @@ public override string ToFullString()
     private string InnerToString(bool toFullString)
     {
         IReadOnlyCollection chains = IncludeChainConverter.GetRelationshipChains(this);
-        return string.Join(",", chains.Select(field => toFullString ? field.ToFullString() : field.ToString()).OrderBy(name => name));
+        return string.Join(",", chains.Select(field => toFullString ? field.ToFullString() : field.ToString()).Distinct().OrderBy(name => name));
     }
 
     public override bool Equals(object? obj)
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs
index 49a1027fb..dafd39e03 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs
@@ -85,21 +85,26 @@ public void Reader_Read_Fails(string parameterName, string parameterValue, strin
     }
 
     [Theory]
-    [InlineData("includes", "", "")]
-    [InlineData("includes", "owner", "owner")]
-    [InlineData("includes", "posts", "posts")]
-    [InlineData("includes", "owner.posts", "owner.posts")]
-    [InlineData("includes", "posts.author", "posts.author")]
-    [InlineData("includes", "posts.comments", "posts.comments")]
-    [InlineData("includes", "posts,posts.comments", "posts.comments")]
-    [InlineData("includes", "posts,posts.labels,posts.comments", "posts.comments,posts.labels")]
-    [InlineData("includes", "owner.person.children.husband", "owner.person.children.husband,owner.person.children.husband")]
-    [InlineData("includes", "owner.person.wife,owner.person.husband", "owner.person.husband,owner.person.wife")]
-    [InlineData("includes", "owner.person.father.children.wife", "owner.person.father.children.wife,owner.person.father.children.wife")]
-    [InlineData("includes", "owner.person.friends", "owner.person.friends,owner.person.friends")]
-    [InlineData("includes", "owner.person.friends.friends",
-        "owner.person.friends.friends,owner.person.friends.friends,owner.person.friends.friends,owner.person.friends.friends")]
-    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string valueExpected)
+    [InlineData("includes", "", "", "")]
+    [InlineData("includes", "owner", "owner", "blogs:owner")]
+    [InlineData("includes", "posts", "posts", "blogs:posts")]
+    [InlineData("includes", "owner.posts", "owner.posts", "blogs:owner.webAccounts:posts")]
+    [InlineData("includes", "posts.author", "posts.author", "blogs:posts.blogPosts:author")]
+    [InlineData("includes", "posts.comments", "posts.comments", "blogs:posts.blogPosts:comments")]
+    [InlineData("includes", "posts,posts.comments", "posts.comments", "blogs:posts.blogPosts:comments")]
+    [InlineData("includes", "posts,posts.labels,posts.comments", "posts.comments,posts.labels", "blogs:posts.blogPosts:comments,blogs:posts.blogPosts:labels")]
+    [InlineData("includes", "owner.person.children.husband", "owner.person.children.husband",
+        "blogs:owner.webAccounts:person.men:children.women:husband,blogs:owner.webAccounts:person.women:children.women:husband")]
+    [InlineData("includes", "owner.person.wife,owner.person.husband", "owner.person.husband,owner.person.wife",
+        "blogs:owner.webAccounts:person.men:wife,blogs:owner.webAccounts:person.women:husband")]
+    [InlineData("includes", "owner.person.father.children.wife", "owner.person.father.children.wife",
+        "blogs:owner.webAccounts:person.men:father.men:children.men:wife,blogs:owner.webAccounts:person.women:father.men:children.men:wife")]
+    [InlineData("includes", "owner.person.friends", "owner.person.friends",
+        "blogs:owner.webAccounts:person.men:friends,blogs:owner.webAccounts:person.women:friends")]
+    [InlineData("includes", "owner.person.friends.friends", "owner.person.friends.friends",
+        "blogs:owner.webAccounts:person.men:friends.men:friends,blogs:owner.webAccounts:person.men:friends.women:friends," +
+        "blogs:owner.webAccounts:person.women:friends.men:friends,blogs:owner.webAccounts:person.women:friends.women:friends")]
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string stringExpected, string fullStringExpected)
     {
         // Act
         _reader.Read(parameterName, parameterValue);
@@ -111,6 +116,7 @@ public void Reader_Read_Succeeds(string parameterName, string parameterValue, st
         scope.Should().BeNull();
 
         QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
-        value.ToString().Should().Be(valueExpected);
+        value.ToString().Should().Be(stringExpected);
+        value.ToFullString().Should().Be(fullStringExpected);
     }
 }




pFad - Phonifier reborn



Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.



Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy

Includes support for the Atomic Operations extension.

Sponsors

Sponsors

Sponsors

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.