From 20e41f83c47e2e4e7824199235f747316fd14d74 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Fri, 5 May 2023 11:38:17 +0200
Subject: [PATCH 1/2] remove the "R" return type generic

---
 .../core/http/core-http-server/src/versioning/types.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/core/http/core-http-server/src/versioning/types.ts b/packages/core/http/core-http-server/src/versioning/types.ts
index 4a63d23e10b965..16b865de04ed73 100644
--- a/packages/core/http/core-http-server/src/versioning/types.ts
+++ b/packages/core/http/core-http-server/src/versioning/types.ts
@@ -185,7 +185,7 @@ interface FullValidationConfig<P, Q, B> {
  * of an endpoint etc.
  * @experimental
  */
-export interface AddVersionOpts<P, Q, B, R> {
+export interface AddVersionOpts<P, Q, B> {
   /**
    * Version to assign to this route
    * @experimental
@@ -213,10 +213,8 @@ export interface VersionedRoute<
    * @returns A versioned route, allows for fluent chaining of version declarations
    * @experimental
    */
-  addVersion<P = unknown, Q = unknown, B = unknown, R = any>(
-    options: AddVersionOpts<P, Q, B, R>,
-    handler: (
-      ...params: Parameters<RequestHandler<P, Q, B, Ctx>>
-    ) => MaybePromise<IKibanaResponse<R>>
+  addVersion<P = unknown, Q = unknown, B = unknown>(
+    options: AddVersionOpts<P, Q, B>,
+    handler: (...params: Parameters<RequestHandler<P, Q, B, Ctx>>) => MaybePromise<IKibanaResponse>
   ): VersionedRoute<Method, Ctx>;
 }

From b54059fc329bc67d2ec18fcd3e06003b211f3573 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Fri, 5 May 2023 11:57:29 +0200
Subject: [PATCH 2/2] fix usages of generics

---
 .../src/versioned_router/core_versioned_route.ts                | 2 +-
 .../src/versioned_router/types.ts                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.ts b/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.ts
index e053444d72551a..abf18d0ef7f97e 100644
--- a/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.ts
+++ b/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.ts
@@ -28,7 +28,7 @@ import { injectResponseHeaders } from './inject_response_headers';
 
 import { resolvers } from './handler_resolvers';
 
-type Options = AddVersionOpts<unknown, unknown, unknown, unknown>;
+type Options = AddVersionOpts<unknown, unknown, unknown>;
 
 // This validation is a pass-through so that we can apply our version-specific validation later
 export const passThroughValidation = {
diff --git a/packages/core/http/core-http-router-server-internal/src/versioned_router/types.ts b/packages/core/http/core-http-router-server-internal/src/versioned_router/types.ts
index 6aa818d2e663ad..be0471c93848cf 100644
--- a/packages/core/http/core-http-router-server-internal/src/versioned_router/types.ts
+++ b/packages/core/http/core-http-router-server-internal/src/versioned_router/types.ts
@@ -26,7 +26,7 @@ export interface VersionedRouterRoute {
   /** @experimental */
   handlers: Array<{
     fn: RequestHandler;
-    options: AddVersionOpts<unknown, unknown, unknown, unknown>;
+    options: AddVersionOpts<unknown, unknown, unknown>;
   }>;
 }