Spring Data Rest Custom Controller ignored by OpenAPI

Question

I'm usign Spring Data Rest and springdoc-openapi-ui.

<dependency>
   <groupId>org.springframework.boot</groupId>
   <artifactId>spring-boot-starter-data-rest</artifactId>
</dependency>

<dependency>
   <groupId>org.springdoc</groupId>
   <artifactId>springdoc-openapi-ui</artifactId>
   <version>1.6.11</version>
</dependency>
<dependency>
   <groupId>org.springdoc</groupId>
   <artifactId>springdoc-openapi-data-rest</artifactId>
   <version>1.6.11</version>
</dependency>

All my repository methods marked with

@RepositoryRestResource(...)

are shown in the Swagger UI, but my custom Controller anotated with @BasePathAwareController is ignored.

I've seen few raised issues regarding this one, but no solution. Annotating the controller with @RestController fixes the problem, but seems that will register twice the dispatcher servlet, which is not good.