From f632165a04f71a032a0f87483f2e0e9d45e5b7a5 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 12 Jan 2024 13:21:39 -0500
Subject: [PATCH] - removes strings for operations names

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
---
 .../abstractions/src/apiClientProxifier.ts    | 47 +++++++++++++++----
 .../item/inferenceClassification/index.ts     |  8 ++--
 .../overrides/count/index.ts                  |  6 +--
 .../overrides/index.ts                        |  8 ++--
 .../overrides/item/index.ts                   | 10 ++--
 .../users/item/mailFolders/count/index.ts     |  6 +--
 .../users/item/mailFolders/index.ts           |  8 ++--
 .../item/childFolders/count/index.ts          |  6 +--
 .../mailFolders/item/childFolders/index.ts    |  8 ++--
 .../item/childFolders/item/index.ts           | 10 ++--
 .../item/messageRules/count/index.ts          |  6 +--
 .../childFolders/item/messageRules/index.ts   |  8 ++--
 .../item/messageRules/item/index.ts           | 10 ++--
 .../childFolders/item/messages/count/index.ts |  6 +--
 .../item/childFolders/item/messages/index.ts  |  8 ++--
 .../messages/item/attachments/count/index.ts  |  6 +--
 .../item/messages/item/attachments/index.ts   |  8 ++--
 .../messages/item/attachments/item/index.ts   |  8 ++--
 .../messages/item/extensions/count/index.ts   |  6 +--
 .../item/messages/item/extensions/index.ts    |  8 ++--
 .../messages/item/extensions/item/index.ts    | 10 ++--
 .../childFolders/item/messages/item/index.ts  | 10 ++--
 .../item/messages/item/value/index.ts         |  8 ++--
 .../users/item/mailFolders/item/index.ts      | 10 ++--
 .../item/messageRules/count/index.ts          |  6 +--
 .../mailFolders/item/messageRules/index.ts    |  8 ++--
 .../item/messageRules/item/index.ts           | 10 ++--
 .../mailFolders/item/messages/count/index.ts  |  6 +--
 .../item/mailFolders/item/messages/index.ts   |  8 ++--
 .../messages/item/attachments/count/index.ts  |  6 +--
 .../item/messages/item/attachments/index.ts   |  8 ++--
 .../messages/item/attachments/item/index.ts   |  8 ++--
 .../messages/item/extensions/count/index.ts   |  6 +--
 .../item/messages/item/extensions/index.ts    |  8 ++--
 .../messages/item/extensions/item/index.ts    | 10 ++--
 .../mailFolders/item/messages/item/index.ts   | 10 ++--
 .../item/messages/item/value/index.ts         |  8 ++--
 .../users/item/messages/count/index.ts        |  6 +--
 .../users/item/messages/index.ts              |  8 ++--
 .../messages/item/attachments/count/index.ts  |  6 +--
 .../item/messages/item/attachments/index.ts   |  8 ++--
 .../messages/item/attachments/item/index.ts   |  8 ++--
 .../messages/item/extensions/count/index.ts   |  6 +--
 .../item/messages/item/extensions/index.ts    |  8 ++--
 .../messages/item/extensions/item/index.ts    | 10 ++--
 .../users/item/messages/item/index.ts         | 10 ++--
 .../users/item/messages/item/value/index.ts   |  8 ++--
 47 files changed, 220 insertions(+), 189 deletions(-)

diff --git a/packages/abstractions/src/apiClientProxifier.ts b/packages/abstractions/src/apiClientProxifier.ts
index 25de5426f..25e90bcd3 100644
--- a/packages/abstractions/src/apiClientProxifier.ts
+++ b/packages/abstractions/src/apiClientProxifier.ts
@@ -15,12 +15,34 @@ import type {
   Parsable,
   ParsableFactory,
 } from "./serialization";
-
-function getRequestMetadata(key: string): string {
-  if (key.startsWith("to")) {
-    return key.substring(2).replace("RequestInformation", "").toLowerCase();
+function sanitizeMethodName(methodName: string): string {
+  if (methodName.startsWith("to")) {
+    return methodName
+      .substring(2)
+      .replace("RequestInformation", "")
+      .toLowerCase();
+  }
+  return methodName;
+}
+function getRequestMethod(key: string): keyof RequestsMetadata {
+  switch (sanitizeMethodName(key)) {
+    case "delete":
+      return "delete";
+    case "get":
+      return "get";
+    case "head":
+      return "head";
+    case "options":
+      return "options";
+    case "patch":
+      return "patch";
+    case "post":
+      return "post";
+    case "put":
+      return "put";
+    default:
+      throw new Error(`couldn't find request method for ${key}`);
   }
-  return key;
 }
 
 function toRequestInformation<QueryParametersType extends object>(
@@ -161,7 +183,7 @@ export function apiClientProxifier<T extends object>(
   pathParameters: Record<string, unknown>,
   urlTemplate: string,
   navigationMetadata?: Record<string, NavigationMetadata>,
-  requestsMetadata?: Record<string, RequestMetadata>,
+  requestsMetadata?: RequestsMetadata,
 ): T {
   if (!requestAdapter) throw new Error("requestAdapter cannot be undefined");
   if (!pathParameters) throw new Error("pathParameters cannot be undefined");
@@ -182,7 +204,7 @@ export function apiClientProxifier<T extends object>(
         };
       }
       if (requestsMetadata) {
-        const metadata = requestsMetadata[getRequestMetadata(name)];
+        const metadata = requestsMetadata[getRequestMethod(name)];
         if (metadata) {
           switch (name) {
             case "get":
@@ -390,10 +412,19 @@ export interface RequestMetadata {
   requestInformationContentSetMethod?: keyof RequestInformationSetContent;
   queryParametersMapper?: Record<string, string>;
 }
+export interface RequestsMetadata {
+  delete?: RequestMetadata;
+  get?: RequestMetadata;
+  head?: RequestMetadata;
+  options?: RequestMetadata;
+  patch?: RequestMetadata;
+  post?: RequestMetadata;
+  put?: RequestMetadata;
+}
 
 export interface NavigationMetadata {
   uriTemplate: string;
-  requestsMetadata?: Record<string, RequestMetadata>;
+  requestsMetadata?: RequestsMetadata;
   navigationMetadata?: Record<string, NavigationMetadata>;
   pathParametersMappings?: string[];
 }
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/index.ts
index a5c822052..4bbabc793 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/index.ts
@@ -4,7 +4,7 @@
 import { createInferenceClassificationFromDiscriminatorValue, serializeInferenceClassification, type InferenceClassification } from '../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../models/oDataErrors/';
 import { OverridesRequestBuilderNavigationMetadata, OverridesRequestBuilderRequestsMetadata, OverridesRequestBuilderUriTemplate, type OverridesRequestBuilder } from './overrides/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification
@@ -69,8 +69,8 @@ export const InferenceClassificationRequestBuilderNavigationMetadata: Record<Exc
 /**
  * Metadata for all the requests in the request builder.
  */
-export const InferenceClassificationRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const InferenceClassificationRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -80,7 +80,7 @@ export const InferenceClassificationRequestBuilderRequestsMetadata: Record<strin
         responseBodyFactory:  createInferenceClassificationFromDiscriminatorValue,
         queryParametersMapper: InferenceClassificationRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts
index ef46c4e35..df24a3a79 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
index 0c37fb545..9301e62e5 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/index.ts
@@ -5,7 +5,7 @@ import { createInferenceClassificationOverrideCollectionResponseFromDiscriminato
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { InferenceClassificationOverrideItemRequestBuilderRequestsMetadata, InferenceClassificationOverrideItemRequestBuilderUriTemplate, type InferenceClassificationOverrideItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides
@@ -107,8 +107,8 @@ export const OverridesRequestBuilderNavigationMetadata: Record<Exclude<keyof Ove
 /**
  * Metadata for all the requests in the request builder.
  */
-export const OverridesRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const OverridesRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -118,7 +118,7 @@ export const OverridesRequestBuilderRequestsMetadata: Record<string, RequestMeta
         responseBodyFactory:  createInferenceClassificationOverrideCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: OverridesRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts
index b7579fac3..f1f7c2092 100644
--- a/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts
+++ b/packages/test/generatedCode/users/item/inferenceClassification/overrides/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createInferenceClassificationOverrideFromDiscriminatorValue, serializeInferenceClassificationOverride, type InferenceClassificationOverride } from '../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/inferenceClassification/overrides/{inferenceClassificationOverride-id}
@@ -68,8 +68,8 @@ const InferenceClassificationOverrideItemRequestBuilderGetQueryParametersMapper:
 /**
  * Metadata for all the requests in the request builder.
  */
-export const InferenceClassificationOverrideItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const InferenceClassificationOverrideItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -78,7 +78,7 @@ export const InferenceClassificationOverrideItemRequestBuilderRequestsMetadata:
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -88,7 +88,7 @@ export const InferenceClassificationOverrideItemRequestBuilderRequestsMetadata:
         responseBodyFactory:  createInferenceClassificationOverrideFromDiscriminatorValue,
         queryParametersMapper: InferenceClassificationOverrideItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/count/index.ts
index ef1bb3424..b86efd91d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/index.ts b/packages/test/generatedCode/users/item/mailFolders/index.ts
index a88bf560c..8a6f2599d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/index.ts
@@ -5,7 +5,7 @@ import { createMailFolderCollectionResponseFromDiscriminatorValue, createMailFol
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { MailFolderItemRequestBuilderNavigationMetadata, MailFolderItemRequestBuilderRequestsMetadata, MailFolderItemRequestBuilderUriTemplate, type MailFolderItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders
@@ -117,8 +117,8 @@ export const MailFoldersRequestBuilderNavigationMetadata: Record<Exclude<keyof M
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MailFoldersRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const MailFoldersRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -128,7 +128,7 @@ export const MailFoldersRequestBuilderRequestsMetadata: Record<string, RequestMe
         responseBodyFactory:  createMailFolderCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MailFoldersRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/index.ts
index 4284294f0..9a7b443e2 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts
index 1535325c5..3f0608c7a 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/index.ts
@@ -5,7 +5,7 @@ import { createMailFolderCollectionResponseFromDiscriminatorValue, createMailFol
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { MailFolderItemRequestBuilderNavigationMetadata, MailFolderItemRequestBuilderRequestsMetadata, MailFolderItemRequestBuilderUriTemplate, type MailFolderItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders
@@ -117,8 +117,8 @@ export const ChildFoldersRequestBuilderNavigationMetadata: Record<Exclude<keyof
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ChildFoldersRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const ChildFoldersRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -128,7 +128,7 @@ export const ChildFoldersRequestBuilderRequestsMetadata: Record<string, RequestM
         responseBodyFactory:  createMailFolderCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: ChildFoldersRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/index.ts
index 3c30d0c63..82987f57d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/index.ts
@@ -5,7 +5,7 @@ import { createMailFolderFromDiscriminatorValue, serializeMailFolder, type MailF
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
 import { MessageRulesRequestBuilderNavigationMetadata, MessageRulesRequestBuilderRequestsMetadata, MessageRulesRequestBuilderUriTemplate, type MessageRulesRequestBuilder } from './messageRules/';
 import { MessagesRequestBuilderNavigationMetadata, MessagesRequestBuilderRequestsMetadata, MessagesRequestBuilderUriTemplate, type MessagesRequestBuilder } from './messages/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}
@@ -100,8 +100,8 @@ export const MailFolderItemRequestBuilderNavigationMetadata: Record<Exclude<keyo
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MailFolderItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const MailFolderItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -110,7 +110,7 @@ export const MailFolderItemRequestBuilderRequestsMetadata: Record<string, Reques
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -120,7 +120,7 @@ export const MailFolderItemRequestBuilderRequestsMetadata: Record<string, Reques
         responseBodyFactory:  createMailFolderFromDiscriminatorValue,
         queryParametersMapper: MailFolderItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/index.ts
index 3a8c46590..0fca9c32f 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/index.ts
index f9716a020..4d152abfc 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/index.ts
@@ -5,7 +5,7 @@ import { createMessageRuleCollectionResponseFromDiscriminatorValue, createMessag
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { MessageRuleItemRequestBuilderRequestsMetadata, MessageRuleItemRequestBuilderUriTemplate, type MessageRuleItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules
@@ -107,8 +107,8 @@ export const MessageRulesRequestBuilderNavigationMetadata: Record<Exclude<keyof
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessageRulesRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const MessageRulesRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -118,7 +118,7 @@ export const MessageRulesRequestBuilderRequestsMetadata: Record<string, RequestM
         responseBodyFactory:  createMessageRuleCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessageRulesRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/index.ts
index 5d41267a7..fdef765d4 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messageRules/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createMessageRuleFromDiscriminatorValue, serializeMessageRule, type MessageRule } from '../../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messageRules/{messageRule-id}
@@ -69,8 +69,8 @@ const MessageRuleItemRequestBuilderGetQueryParametersMapper: Record<string, stri
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessageRuleItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const MessageRuleItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -79,7 +79,7 @@ export const MessageRuleItemRequestBuilderRequestsMetadata: Record<string, Reque
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -89,7 +89,7 @@ export const MessageRuleItemRequestBuilderRequestsMetadata: Record<string, Reque
         responseBodyFactory:  createMessageRuleFromDiscriminatorValue,
         queryParametersMapper: MessageRuleItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/index.ts
index 9fce444bc..610fa1a3a 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/$count
@@ -44,8 +44,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/index.ts
index 1ffbb5887..09def06c6 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/index.ts
@@ -5,7 +5,7 @@ import { createMessageCollectionResponseFromDiscriminatorValue, createMessageFro
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, MessageItemRequestBuilderUriTemplate, type MessageItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages
@@ -118,8 +118,8 @@ export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof Mess
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessagesRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -129,7 +129,7 @@ export const MessagesRequestBuilderRequestsMetadata: Record<string, RequestMetad
         responseBodyFactory:  createMessageCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessagesRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/index.ts
index 78535e0a5..81f2fa572 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/index.ts
index 7056a900f..941f94668 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/index.ts
@@ -5,7 +5,7 @@ import { createAttachmentCollectionResponseFromDiscriminatorValue, createAttachm
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { AttachmentItemRequestBuilderRequestsMetadata, AttachmentItemRequestBuilderUriTemplate, type AttachmentItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments
@@ -102,8 +102,8 @@ export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof A
 /**
  * Metadata for all the requests in the request builder.
  */
-export const AttachmentsRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -113,7 +113,7 @@ export const AttachmentsRequestBuilderRequestsMetadata: Record<string, RequestMe
         responseBodyFactory:  createAttachmentCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: AttachmentsRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/index.ts
index 1e8a687c2..4b911b267 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/attachments/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createAttachmentFromDiscriminatorValue, type Attachment } from '../../../../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/attachments/{attachment-id}
@@ -58,8 +58,8 @@ const AttachmentItemRequestBuilderGetQueryParametersMapper: Record<string, strin
 /**
  * Metadata for all the requests in the request builder.
  */
-export const AttachmentItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const AttachmentItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -68,7 +68,7 @@ export const AttachmentItemRequestBuilderRequestsMetadata: Record<string, Reques
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/index.ts
index 5075c712e..4cc0916cf 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/index.ts
index e064da3b8..d1d682a59 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/index.ts
@@ -5,7 +5,7 @@ import { createExtensionCollectionResponseFromDiscriminatorValue, createExtensio
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { ExtensionItemRequestBuilderRequestsMetadata, ExtensionItemRequestBuilderUriTemplate, type ExtensionItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions
@@ -111,8 +111,8 @@ export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof Ex
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ExtensionsRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -122,7 +122,7 @@ export const ExtensionsRequestBuilderRequestsMetadata: Record<string, RequestMet
         responseBodyFactory:  createExtensionCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: ExtensionsRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/index.ts
index a631c39aa..ba1359b6c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/extensions/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createExtensionFromDiscriminatorValue, serializeExtension, type Extension } from '../../../../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/extensions/{extension-id}
@@ -73,8 +73,8 @@ const ExtensionItemRequestBuilderGetQueryParametersMapper: Record<string, string
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -83,7 +83,7 @@ export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, Request
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -93,7 +93,7 @@ export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, Request
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
         queryParametersMapper: ExtensionItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/index.ts
index 567579198..9b49afddd 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/index.ts
@@ -6,7 +6,7 @@ import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../.
 import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, AttachmentsRequestBuilderUriTemplate, type AttachmentsRequestBuilder } from './attachments/';
 import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, ExtensionsRequestBuilderUriTemplate, type ExtensionsRequestBuilder } from './extensions/';
 import { ContentRequestBuilderRequestsMetadata, ContentRequestBuilderUriTemplate, type ContentRequestBuilder } from './value/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}
@@ -105,8 +105,8 @@ export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof M
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -115,7 +115,7 @@ export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMe
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -125,7 +125,7 @@ export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMe
         responseBodyFactory:  createMessageFromDiscriminatorValue,
         queryParametersMapper: MessageItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/index.ts
index 0abdf02f9..86caf7304 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/childFolders/item/messages/item/value/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/childFolders/{mailFolder-id1}/messages/{message-id}/$value
@@ -39,8 +39,8 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ContentRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/octet-stream, application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -49,7 +49,7 @@ export const ContentRequestBuilderRequestsMetadata: Record<string, RequestMetada
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "put": {
+    put: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/index.ts
index 4394fbfe2..96814cc7f 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/index.ts
@@ -6,7 +6,7 @@ import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../.
 import { ChildFoldersRequestBuilderNavigationMetadata, ChildFoldersRequestBuilderRequestsMetadata, ChildFoldersRequestBuilderUriTemplate, type ChildFoldersRequestBuilder } from './childFolders/';
 import { MessageRulesRequestBuilderNavigationMetadata, MessageRulesRequestBuilderRequestsMetadata, MessageRulesRequestBuilderUriTemplate, type MessageRulesRequestBuilder } from './messageRules/';
 import { MessagesRequestBuilderNavigationMetadata, MessagesRequestBuilderRequestsMetadata, MessagesRequestBuilderUriTemplate, type MessagesRequestBuilder } from './messages/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}
@@ -113,8 +113,8 @@ export const MailFolderItemRequestBuilderNavigationMetadata: Record<Exclude<keyo
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MailFolderItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const MailFolderItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -123,7 +123,7 @@ export const MailFolderItemRequestBuilderRequestsMetadata: Record<string, Reques
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -133,7 +133,7 @@ export const MailFolderItemRequestBuilderRequestsMetadata: Record<string, Reques
         responseBodyFactory:  createMailFolderFromDiscriminatorValue,
         queryParametersMapper: MailFolderItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/index.ts
index 30ef39268..4b8bfcde9 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts
index 4015e7917..ea12189e9 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/index.ts
@@ -5,7 +5,7 @@ import { createMessageRuleCollectionResponseFromDiscriminatorValue, createMessag
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { MessageRuleItemRequestBuilderRequestsMetadata, MessageRuleItemRequestBuilderUriTemplate, type MessageRuleItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules
@@ -107,8 +107,8 @@ export const MessageRulesRequestBuilderNavigationMetadata: Record<Exclude<keyof
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessageRulesRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const MessageRulesRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -118,7 +118,7 @@ export const MessageRulesRequestBuilderRequestsMetadata: Record<string, RequestM
         responseBodyFactory:  createMessageRuleCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessageRulesRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/index.ts
index dc202b317..c436e391e 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messageRules/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createMessageRuleFromDiscriminatorValue, serializeMessageRule, type MessageRule } from '../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messageRules/{messageRule-id}
@@ -69,8 +69,8 @@ const MessageRuleItemRequestBuilderGetQueryParametersMapper: Record<string, stri
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessageRuleItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const MessageRuleItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -79,7 +79,7 @@ export const MessageRuleItemRequestBuilderRequestsMetadata: Record<string, Reque
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -89,7 +89,7 @@ export const MessageRuleItemRequestBuilderRequestsMetadata: Record<string, Reque
         responseBodyFactory:  createMessageRuleFromDiscriminatorValue,
         queryParametersMapper: MessageRuleItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/index.ts
index b789dfd34..605b6d0a5 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/$count
@@ -44,8 +44,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts
index 6acff0b1b..eed5e8db3 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/index.ts
@@ -5,7 +5,7 @@ import { createMessageCollectionResponseFromDiscriminatorValue, createMessageFro
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, MessageItemRequestBuilderUriTemplate, type MessageItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages
@@ -118,8 +118,8 @@ export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof Mess
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessagesRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -129,7 +129,7 @@ export const MessagesRequestBuilderRequestsMetadata: Record<string, RequestMetad
         responseBodyFactory:  createMessageCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessagesRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/index.ts
index 5bd7c2fa6..557322c0d 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/index.ts
index b75fff522..d1d17ceea 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/index.ts
@@ -5,7 +5,7 @@ import { createAttachmentCollectionResponseFromDiscriminatorValue, createAttachm
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { AttachmentItemRequestBuilderRequestsMetadata, AttachmentItemRequestBuilderUriTemplate, type AttachmentItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments
@@ -102,8 +102,8 @@ export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof A
 /**
  * Metadata for all the requests in the request builder.
  */
-export const AttachmentsRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -113,7 +113,7 @@ export const AttachmentsRequestBuilderRequestsMetadata: Record<string, RequestMe
         responseBodyFactory:  createAttachmentCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: AttachmentsRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/index.ts
index 29e8c5efd..4b341407b 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/attachments/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createAttachmentFromDiscriminatorValue, type Attachment } from '../../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/attachments/{attachment-id}
@@ -58,8 +58,8 @@ const AttachmentItemRequestBuilderGetQueryParametersMapper: Record<string, strin
 /**
  * Metadata for all the requests in the request builder.
  */
-export const AttachmentItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const AttachmentItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -68,7 +68,7 @@ export const AttachmentItemRequestBuilderRequestsMetadata: Record<string, Reques
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/index.ts
index c53813e02..a59421a4c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/index.ts
index 82a85bf72..5ecc8292e 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/index.ts
@@ -5,7 +5,7 @@ import { createExtensionCollectionResponseFromDiscriminatorValue, createExtensio
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { ExtensionItemRequestBuilderRequestsMetadata, ExtensionItemRequestBuilderUriTemplate, type ExtensionItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions
@@ -111,8 +111,8 @@ export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof Ex
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ExtensionsRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -122,7 +122,7 @@ export const ExtensionsRequestBuilderRequestsMetadata: Record<string, RequestMet
         responseBodyFactory:  createExtensionCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: ExtensionsRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/index.ts
index c1a85f199..2a92a81a6 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/extensions/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createExtensionFromDiscriminatorValue, serializeExtension, type Extension } from '../../../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/extensions/{extension-id}
@@ -73,8 +73,8 @@ const ExtensionItemRequestBuilderGetQueryParametersMapper: Record<string, string
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -83,7 +83,7 @@ export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, Request
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -93,7 +93,7 @@ export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, Request
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
         queryParametersMapper: ExtensionItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/index.ts
index 7f495811d..6009f0576 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/index.ts
@@ -6,7 +6,7 @@ import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../.
 import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, AttachmentsRequestBuilderUriTemplate, type AttachmentsRequestBuilder } from './attachments/';
 import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, ExtensionsRequestBuilderUriTemplate, type ExtensionsRequestBuilder } from './extensions/';
 import { ContentRequestBuilderRequestsMetadata, ContentRequestBuilderUriTemplate, type ContentRequestBuilder } from './value/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}
@@ -105,8 +105,8 @@ export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof M
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -115,7 +115,7 @@ export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMe
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -125,7 +125,7 @@ export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMe
         responseBodyFactory:  createMessageFromDiscriminatorValue,
         queryParametersMapper: MessageItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/index.ts b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/index.ts
index abb1c923b..a719d694c 100644
--- a/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/index.ts
+++ b/packages/test/generatedCode/users/item/mailFolders/item/messages/item/value/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/mailFolders/{mailFolder-id}/messages/{message-id}/$value
@@ -39,8 +39,8 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ContentRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/octet-stream, application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -49,7 +49,7 @@ export const ContentRequestBuilderRequestsMetadata: Record<string, RequestMetada
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "put": {
+    put: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/count/index.ts b/packages/test/generatedCode/users/item/messages/count/index.ts
index 803232445..324b491d9 100644
--- a/packages/test/generatedCode/users/item/messages/count/index.ts
+++ b/packages/test/generatedCode/users/item/messages/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/$count
@@ -44,8 +44,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/index.ts b/packages/test/generatedCode/users/item/messages/index.ts
index a756e9799..38f703f4c 100644
--- a/packages/test/generatedCode/users/item/messages/index.ts
+++ b/packages/test/generatedCode/users/item/messages/index.ts
@@ -5,7 +5,7 @@ import { createMessageCollectionResponseFromDiscriminatorValue, createMessageFro
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { MessageItemRequestBuilderNavigationMetadata, MessageItemRequestBuilderRequestsMetadata, MessageItemRequestBuilderUriTemplate, type MessageItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages
@@ -122,8 +122,8 @@ export const MessagesRequestBuilderNavigationMetadata: Record<Exclude<keyof Mess
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessagesRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const MessagesRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -133,7 +133,7 @@ export const MessagesRequestBuilderRequestsMetadata: Record<string, RequestMetad
         responseBodyFactory:  createMessageCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: MessagesRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/count/index.ts b/packages/test/generatedCode/users/item/messages/item/attachments/count/index.ts
index ac36c7cad..962589cbf 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/count/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/index.ts b/packages/test/generatedCode/users/item/messages/item/attachments/index.ts
index a309deae3..7944bb42c 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/index.ts
@@ -5,7 +5,7 @@ import { createAttachmentCollectionResponseFromDiscriminatorValue, createAttachm
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { AttachmentItemRequestBuilderRequestsMetadata, AttachmentItemRequestBuilderUriTemplate, type AttachmentItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments
@@ -102,8 +102,8 @@ export const AttachmentsRequestBuilderNavigationMetadata: Record<Exclude<keyof A
 /**
  * Metadata for all the requests in the request builder.
  */
-export const AttachmentsRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const AttachmentsRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -113,7 +113,7 @@ export const AttachmentsRequestBuilderRequestsMetadata: Record<string, RequestMe
         responseBodyFactory:  createAttachmentCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: AttachmentsRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/item/attachments/item/index.ts b/packages/test/generatedCode/users/item/messages/item/attachments/item/index.ts
index 1b863dd79..2f589c8ea 100644
--- a/packages/test/generatedCode/users/item/messages/item/attachments/item/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/attachments/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createAttachmentFromDiscriminatorValue, type Attachment } from '../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/attachments/{attachment-id}
@@ -58,8 +58,8 @@ const AttachmentItemRequestBuilderGetQueryParametersMapper: Record<string, strin
 /**
  * Metadata for all the requests in the request builder.
  */
-export const AttachmentItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const AttachmentItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -68,7 +68,7 @@ export const AttachmentItemRequestBuilderRequestsMetadata: Record<string, Reques
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/count/index.ts b/packages/test/generatedCode/users/item/messages/item/extensions/count/index.ts
index bbcd3ee4f..18cad8254 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/count/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/count/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/$count
@@ -39,8 +39,8 @@ const CountRequestBuilderGetQueryParametersMapper: Record<string, string> = {
 /**
  * Metadata for all the requests in the request builder.
  */
-export const CountRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const CountRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "text/plain;q=0.9",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/index.ts b/packages/test/generatedCode/users/item/messages/item/extensions/index.ts
index 137eae674..8fec52ead 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/index.ts
@@ -5,7 +5,7 @@ import { createExtensionCollectionResponseFromDiscriminatorValue, createExtensio
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
 import { CountRequestBuilderRequestsMetadata, CountRequestBuilderUriTemplate, type CountRequestBuilder } from './count/';
 import { ExtensionItemRequestBuilderRequestsMetadata, ExtensionItemRequestBuilderUriTemplate, type ExtensionItemRequestBuilder } from './item/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions
@@ -111,8 +111,8 @@ export const ExtensionsRequestBuilderNavigationMetadata: Record<Exclude<keyof Ex
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ExtensionsRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const ExtensionsRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -122,7 +122,7 @@ export const ExtensionsRequestBuilderRequestsMetadata: Record<string, RequestMet
         responseBodyFactory:  createExtensionCollectionResponseFromDiscriminatorValue,
         queryParametersMapper: ExtensionsRequestBuilderGetQueryParametersMapper,
     },
-    "post": {
+    post: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/item/extensions/item/index.ts b/packages/test/generatedCode/users/item/messages/item/extensions/item/index.ts
index 9ad215139..0ed3cff18 100644
--- a/packages/test/generatedCode/users/item/messages/item/extensions/item/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/extensions/item/index.ts
@@ -3,7 +3,7 @@
 // Generated by Microsoft Kiota
 import { createExtensionFromDiscriminatorValue, serializeExtension, type Extension } from '../../../../../../models/';
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/extensions/{extension-id}
@@ -73,8 +73,8 @@ const ExtensionItemRequestBuilderGetQueryParametersMapper: Record<string, string
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const ExtensionItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -83,7 +83,7 @@ export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, Request
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -93,7 +93,7 @@ export const ExtensionItemRequestBuilderRequestsMetadata: Record<string, Request
         responseBodyFactory:  createExtensionFromDiscriminatorValue,
         queryParametersMapper: ExtensionItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/item/index.ts b/packages/test/generatedCode/users/item/messages/item/index.ts
index 9481e8b58..c4617437a 100644
--- a/packages/test/generatedCode/users/item/messages/item/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/index.ts
@@ -6,7 +6,7 @@ import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../.
 import { AttachmentsRequestBuilderNavigationMetadata, AttachmentsRequestBuilderRequestsMetadata, AttachmentsRequestBuilderUriTemplate, type AttachmentsRequestBuilder } from './attachments/';
 import { ExtensionsRequestBuilderNavigationMetadata, ExtensionsRequestBuilderRequestsMetadata, ExtensionsRequestBuilderUriTemplate, type ExtensionsRequestBuilder } from './extensions/';
 import { ContentRequestBuilderRequestsMetadata, ContentRequestBuilderUriTemplate, type ContentRequestBuilder } from './value/';
-import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type KeysToExcludeForNavigationMetadata, type NavigationMetadata, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}
@@ -112,8 +112,8 @@ export const MessageItemRequestBuilderNavigationMetadata: Record<Exclude<keyof M
 /**
  * Metadata for all the requests in the request builder.
  */
-export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "delete": {
+export const MessageItemRequestBuilderRequestsMetadata: RequestsMetadata = {
+    delete: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -122,7 +122,7 @@ export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMe
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "get": {
+    get: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -132,7 +132,7 @@ export const MessageItemRequestBuilderRequestsMetadata: Record<string, RequestMe
         responseBodyFactory:  createMessageFromDiscriminatorValue,
         queryParametersMapper: MessageItemRequestBuilderGetQueryParametersMapper,
     },
-    "patch": {
+    patch: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
diff --git a/packages/test/generatedCode/users/item/messages/item/value/index.ts b/packages/test/generatedCode/users/item/messages/item/value/index.ts
index a688c2f92..474dc136b 100644
--- a/packages/test/generatedCode/users/item/messages/item/value/index.ts
+++ b/packages/test/generatedCode/users/item/messages/item/value/index.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // Generated by Microsoft Kiota
 import { createODataErrorFromDiscriminatorValue, type ODataError } from '../../../../../models/oDataErrors/';
-import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestMetadata } from '@microsoft/kiota-abstractions';
+import { type BaseRequestBuilder, type Parsable, type ParsableFactory, type RequestConfiguration, type RequestInformation, type RequestsMetadata } from '@microsoft/kiota-abstractions';
 
 /**
  * Builds and executes requests for operations under /users/{user-id}/messages/{message-id}/$value
@@ -39,8 +39,8 @@ export interface ContentRequestBuilder extends BaseRequestBuilder<ContentRequest
 /**
  * Metadata for all the requests in the request builder.
  */
-export const ContentRequestBuilderRequestsMetadata: Record<string, RequestMetadata> = {
-    "get": {
+export const ContentRequestBuilderRequestsMetadata: RequestsMetadata = {
+    get: {
         responseBodyContentType: "application/octet-stream, application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,
@@ -49,7 +49,7 @@ export const ContentRequestBuilderRequestsMetadata: Record<string, RequestMetada
         adapterMethodName: "sendPrimitiveAsync",
         responseBodyFactory:  "ArrayBuffer",
     },
-    "put": {
+    put: {
         responseBodyContentType: "application/json",
         errorMappings: {
             "4XX": createODataErrorFromDiscriminatorValue,