You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/01 08:24:56 UTC

[camel] branch main updated: Regen for commit 405554154cd75f450de6235b574829aba1cdb724 (#9747)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 5eac3f5c88f Regen for commit 405554154cd75f450de6235b574829aba1cdb724 (#9747)
5eac3f5c88f is described below

commit 5eac3f5c88f09ef5a4bc54c55dd975ca27e5ca3d
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Sat Apr 1 10:24:49 2023 +0200

    Regen for commit 405554154cd75f450de6235b574829aba1cdb724 (#9747)
    
    Signed-off-by: GitHub <no...@github.com>
    Co-authored-by: davsclaus <da...@users.noreply.github.com>
---
 .../component/as2/internal/AS2ApiCollection.java   |  10 +-
 .../component/box/internal/BoxApiCollection.java   |  26 ++---
 .../braintree/internal/BraintreeApiCollection.java |  40 +++----
 .../dhis2/internal/Dhis2ApiCollection.java         |  12 +--
 .../component/fhir/internal/FhirApiCollection.java |  32 +++---
 .../internal/GoogleCalendarApiCollection.java      |  22 ++--
 .../drive/internal/GoogleDriveApiCollection.java   |  34 +++---
 .../mail/internal/GoogleMailApiCollection.java     |  20 ++--
 .../sheets/internal/GoogleSheetsApiCollection.java |  10 +-
 .../olingo2/internal/Olingo2ApiCollection.java     |   8 +-
 .../olingo4/internal/Olingo4ApiCollection.java     |   8 +-
 .../twilio/internal/TwilioApiCollection.java       | 118 ++++++++++-----------
 .../zendesk/internal/ZendeskApiCollection.java     |   8 +-
 13 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiCollection.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiCollection.java
index a02299f43ca..9a456b4b20b 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiCollection.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/internal/AS2ApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.as2.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.as2.AS2Configuration;
 import org.apache.camel.component.as2.AS2ClientManagerEndpointConfiguration;
@@ -26,20 +26,20 @@ public final class AS2ApiCollection extends ApiCollection<AS2ApiName, AS2Configu
     private static AS2ApiCollection collection;
 
     private AS2ApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<AS2ApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<AS2ApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(AS2ApiName.class);
         final Map<Class<? extends ApiMethod>, AS2ApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList("ediMessageTransferEncoding", "signingAlgorithm", "signingCertificateChain", "signingPrivateKey", "compressionAlgorithm", "dispositionNotificationTo", "signedReceiptMicAlgorithms", "encryptingAlgorithm", "encryptingCertificateChain", "attachedFileName");
-        apiHelpers.put(AS2ApiName.CLIENT, new ApiMethodHelper<AS2ClientManagerApiMethod>(AS2ClientManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(AS2ApiName.CLIENT, new ApiMethodHelper<>(AS2ClientManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AS2ClientManagerApiMethod.class, AS2ApiName.CLIENT);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(AS2ApiName.SERVER, new ApiMethodHelper<AS2ServerManagerApiMethod>(AS2ServerManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(AS2ApiName.SERVER, new ApiMethodHelper<>(AS2ServerManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AS2ServerManagerApiMethod.class, AS2ApiName.SERVER);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiCollection.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiCollection.java
index 737bbd0fe5a..195e11474d0 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiCollection.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/internal/BoxApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.box.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.box.BoxConfiguration;
 import org.apache.camel.component.box.BoxCollaborationsManagerEndpointConfiguration;
@@ -34,8 +34,8 @@ public final class BoxApiCollection extends ApiCollection<BoxApiName, BoxConfigu
     private static BoxApiCollection collection;
 
     private BoxApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<BoxApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<BoxApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(BoxApiName.class);
         final Map<Class<? extends ApiMethod>, BoxApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
@@ -49,7 +49,7 @@ public final class BoxApiCollection extends ApiCollection<BoxApiName, BoxConfigu
         aliases.put("getCollaborationInfo", "info");
         aliases.put("updateCollaborationInfo", "updateInfo");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BoxApiName.COLLABORATIONS, new ApiMethodHelper<BoxCollaborationsManagerApiMethod>(BoxCollaborationsManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.COLLABORATIONS, new ApiMethodHelper<>(BoxCollaborationsManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxCollaborationsManagerApiMethod.class, BoxApiName.COLLABORATIONS);
 
         aliases.clear();
@@ -60,13 +60,13 @@ public final class BoxApiCollection extends ApiCollection<BoxApiName, BoxConfigu
         aliases.put("getFileComments", "comments");
         aliases.put("replyToComment", "reply");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BoxApiName.COMMENTS, new ApiMethodHelper<BoxCommentsManagerApiMethod>(BoxCommentsManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.COMMENTS, new ApiMethodHelper<>(BoxCommentsManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxCommentsManagerApiMethod.class, BoxApiName.COMMENTS);
 
         aliases.clear();
         aliases.put("getEnterpriseEvents", "events");
         nullableArgs = Arrays.asList("position", "types");
-        apiHelpers.put(BoxApiName.EVENT_LOGS, new ApiMethodHelper<BoxEventLogsManagerApiMethod>(BoxEventLogsManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.EVENT_LOGS, new ApiMethodHelper<>(BoxEventLogsManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxEventLogsManagerApiMethod.class, BoxApiName.EVENT_LOGS);
 
         aliases.clear();
@@ -93,7 +93,7 @@ public final class BoxApiCollection extends ApiCollection<BoxApiName, BoxConfigu
         aliases.put("getFileThumbnail", "thumbnail");
         aliases.put("checkUpload", "canUpload");
         nullableArgs = Arrays.asList("fields", "created", "modified", "size", "fileSize", "rangeStart", "rangeEnd", "listener", "fileSize", "newName", "unshareDate", "permissions", "typeName", "check");
-        apiHelpers.put(BoxApiName.FILES, new ApiMethodHelper<BoxFilesManagerApiMethod>(BoxFilesManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.FILES, new ApiMethodHelper<>(BoxFilesManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxFilesManagerApiMethod.class, BoxApiName.FILES);
 
         aliases.clear();
@@ -109,7 +109,7 @@ public final class BoxApiCollection extends ApiCollection<BoxApiName, BoxConfigu
         aliases.put("getFolderItems", "items");
         aliases.put("updateFolderInfo", "updateInfo");
         nullableArgs = Arrays.asList("offset", "limit", "fields", "newName");
-        apiHelpers.put(BoxApiName.FOLDERS, new ApiMethodHelper<BoxFoldersManagerApiMethod>(BoxFoldersManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.FOLDERS, new ApiMethodHelper<>(BoxFoldersManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxFoldersManagerApiMethod.class, BoxApiName.FOLDERS);
 
         aliases.clear();
@@ -123,18 +123,18 @@ public final class BoxApiCollection extends ApiCollection<BoxApiName, BoxConfigu
         aliases.put("getGroupMembershipInfo", "membershipInfo");
         aliases.put("updateGroupMembershipInfo", "updateMembershipInfo");
         nullableArgs = Arrays.asList("role", "description", "provenance", "externalSyncIdentifier", "invitabilityLevel", "memberViewabilityLevel");
-        apiHelpers.put(BoxApiName.GROUPS, new ApiMethodHelper<BoxGroupsManagerApiMethod>(BoxGroupsManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.GROUPS, new ApiMethodHelper<>(BoxGroupsManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxGroupsManagerApiMethod.class, BoxApiName.GROUPS);
 
         aliases.clear();
         nullableArgs = Arrays.asList("startingPosition");
-        apiHelpers.put(BoxApiName.EVENTS, new ApiMethodHelper<BoxEventsManagerApiMethod>(BoxEventsManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.EVENTS, new ApiMethodHelper<>(BoxEventsManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxEventsManagerApiMethod.class, BoxApiName.EVENTS);
 
         aliases.clear();
         aliases.put("searchFolder", "search");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BoxApiName.SEARCH, new ApiMethodHelper<BoxSearchManagerApiMethod>(BoxSearchManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.SEARCH, new ApiMethodHelper<>(BoxSearchManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxSearchManagerApiMethod.class, BoxApiName.SEARCH);
 
         aliases.clear();
@@ -148,7 +148,7 @@ public final class BoxApiCollection extends ApiCollection<BoxApiName, BoxConfigu
         aliases.put("getTaskAssignments", "assignments");
         aliases.put("getTaskAssignmentInfo", "assignmentInfo");
         nullableArgs = Arrays.asList("message");
-        apiHelpers.put(BoxApiName.TASKS, new ApiMethodHelper<BoxTasksManagerApiMethod>(BoxTasksManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.TASKS, new ApiMethodHelper<>(BoxTasksManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxTasksManagerApiMethod.class, BoxApiName.TASKS);
 
         aliases.clear();
@@ -163,7 +163,7 @@ public final class BoxApiCollection extends ApiCollection<BoxApiName, BoxConfigu
         aliases.put("getUserInfo", "info");
         aliases.put("updateUserInfo", "updateInfo");
         nullableArgs = Arrays.asList("filterTerm", "fields", "params");
-        apiHelpers.put(BoxApiName.USERS, new ApiMethodHelper<BoxUsersManagerApiMethod>(BoxUsersManagerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BoxApiName.USERS, new ApiMethodHelper<>(BoxUsersManagerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(BoxUsersManagerApiMethod.class, BoxApiName.USERS);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiCollection.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiCollection.java
index cf8e1ed8ea9..912659c9980 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiCollection.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/internal/BraintreeApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.braintree.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.braintree.BraintreeConfiguration;
 import org.apache.camel.component.braintree.AddOnGatewayEndpointConfiguration;
@@ -41,95 +41,95 @@ public final class BraintreeApiCollection extends ApiCollection<BraintreeApiName
     private static BraintreeApiCollection collection;
 
     private BraintreeApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<BraintreeApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<BraintreeApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(BraintreeApiName.class);
         final Map<Class<? extends ApiMethod>, BraintreeApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.ADD_ON, new ApiMethodHelper<AddOnGatewayApiMethod>(AddOnGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.ADD_ON, new ApiMethodHelper<>(AddOnGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AddOnGatewayApiMethod.class, BraintreeApiName.ADD_ON);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.ADDRESS, new ApiMethodHelper<AddressGatewayApiMethod>(AddressGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.ADDRESS, new ApiMethodHelper<>(AddressGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AddressGatewayApiMethod.class, BraintreeApiName.ADDRESS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.CLIENT_TOKEN, new ApiMethodHelper<ClientTokenGatewayApiMethod>(ClientTokenGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.CLIENT_TOKEN, new ApiMethodHelper<>(ClientTokenGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ClientTokenGatewayApiMethod.class, BraintreeApiName.CLIENT_TOKEN);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.CREDIT_CARD_VERIFICATION, new ApiMethodHelper<CreditCardVerificationGatewayApiMethod>(CreditCardVerificationGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.CREDIT_CARD_VERIFICATION, new ApiMethodHelper<>(CreditCardVerificationGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CreditCardVerificationGatewayApiMethod.class, BraintreeApiName.CREDIT_CARD_VERIFICATION);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.CUSTOMER, new ApiMethodHelper<CustomerGatewayApiMethod>(CustomerGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.CUSTOMER, new ApiMethodHelper<>(CustomerGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CustomerGatewayApiMethod.class, BraintreeApiName.CUSTOMER);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.DISCOUNT, new ApiMethodHelper<DiscountGatewayApiMethod>(DiscountGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.DISCOUNT, new ApiMethodHelper<>(DiscountGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DiscountGatewayApiMethod.class, BraintreeApiName.DISCOUNT);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.DISPUTE, new ApiMethodHelper<DisputeGatewayApiMethod>(DisputeGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.DISPUTE, new ApiMethodHelper<>(DisputeGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DisputeGatewayApiMethod.class, BraintreeApiName.DISPUTE);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.DOCUMENT_UPLOAD, new ApiMethodHelper<DocumentUploadGatewayApiMethod>(DocumentUploadGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.DOCUMENT_UPLOAD, new ApiMethodHelper<>(DocumentUploadGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DocumentUploadGatewayApiMethod.class, BraintreeApiName.DOCUMENT_UPLOAD);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.MERCHANT_ACCOUNT, new ApiMethodHelper<MerchantAccountGatewayApiMethod>(MerchantAccountGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.MERCHANT_ACCOUNT, new ApiMethodHelper<>(MerchantAccountGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(MerchantAccountGatewayApiMethod.class, BraintreeApiName.MERCHANT_ACCOUNT);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.PAYMENT_METHOD, new ApiMethodHelper<PaymentMethodGatewayApiMethod>(PaymentMethodGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.PAYMENT_METHOD, new ApiMethodHelper<>(PaymentMethodGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(PaymentMethodGatewayApiMethod.class, BraintreeApiName.PAYMENT_METHOD);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.PAYMENT_METHOD_NONCE, new ApiMethodHelper<PaymentMethodNonceGatewayApiMethod>(PaymentMethodNonceGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.PAYMENT_METHOD_NONCE, new ApiMethodHelper<>(PaymentMethodNonceGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(PaymentMethodNonceGatewayApiMethod.class, BraintreeApiName.PAYMENT_METHOD_NONCE);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.PLAN, new ApiMethodHelper<PlanGatewayApiMethod>(PlanGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.PLAN, new ApiMethodHelper<>(PlanGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(PlanGatewayApiMethod.class, BraintreeApiName.PLAN);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.REPORT, new ApiMethodHelper<ReportGatewayApiMethod>(ReportGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.REPORT, new ApiMethodHelper<>(ReportGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ReportGatewayApiMethod.class, BraintreeApiName.REPORT);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.SETTLEMENT_BATCH_SUMMARY, new ApiMethodHelper<SettlementBatchSummaryGatewayApiMethod>(SettlementBatchSummaryGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.SETTLEMENT_BATCH_SUMMARY, new ApiMethodHelper<>(SettlementBatchSummaryGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SettlementBatchSummaryGatewayApiMethod.class, BraintreeApiName.SETTLEMENT_BATCH_SUMMARY);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.SUBSCRIPTION, new ApiMethodHelper<SubscriptionGatewayApiMethod>(SubscriptionGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.SUBSCRIPTION, new ApiMethodHelper<>(SubscriptionGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SubscriptionGatewayApiMethod.class, BraintreeApiName.SUBSCRIPTION);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.TRANSACTION, new ApiMethodHelper<TransactionGatewayApiMethod>(TransactionGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.TRANSACTION, new ApiMethodHelper<>(TransactionGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(TransactionGatewayApiMethod.class, BraintreeApiName.TRANSACTION);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(BraintreeApiName.WEBHOOK_NOTIFICATION, new ApiMethodHelper<WebhookNotificationGatewayApiMethod>(WebhookNotificationGatewayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(BraintreeApiName.WEBHOOK_NOTIFICATION, new ApiMethodHelper<>(WebhookNotificationGatewayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(WebhookNotificationGatewayApiMethod.class, BraintreeApiName.WEBHOOK_NOTIFICATION);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiCollection.java b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiCollection.java
index 82f9d8cb13d..49ec2b66b8d 100644
--- a/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiCollection.java
+++ b/components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/internal/Dhis2ApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.dhis2.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.dhis2.Dhis2Configuration;
 import org.apache.camel.component.dhis2.Dhis2PostEndpointConfiguration;
@@ -27,25 +27,25 @@ public final class Dhis2ApiCollection extends ApiCollection<Dhis2ApiName, Dhis2C
     private static Dhis2ApiCollection collection;
 
     private Dhis2ApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<Dhis2ApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<Dhis2ApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(Dhis2ApiName.class);
         final Map<Class<? extends ApiMethod>, Dhis2ApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList("resource", "queryParams");
-        apiHelpers.put(Dhis2ApiName.POST, new ApiMethodHelper<Dhis2PostApiMethod>(Dhis2PostApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(Dhis2ApiName.POST, new ApiMethodHelper<>(Dhis2PostApiMethod.class, aliases, nullableArgs));
         apiMethods.put(Dhis2PostApiMethod.class, Dhis2ApiName.POST);
 
         aliases.clear();
         nullableArgs = Arrays.asList("skipEvents", "skipAggregate", "lastYears", "interval");
-        apiHelpers.put(Dhis2ApiName.RESOURCE_TABLES, new ApiMethodHelper<Dhis2ResourceTablesApiMethod>(Dhis2ResourceTablesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(Dhis2ApiName.RESOURCE_TABLES, new ApiMethodHelper<>(Dhis2ResourceTablesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(Dhis2ResourceTablesApiMethod.class, Dhis2ApiName.RESOURCE_TABLES);
 
         aliases.clear();
         nullableArgs = Arrays.asList("itemType", "paging", "fields", "filter", "queryParams");
-        apiHelpers.put(Dhis2ApiName.GET, new ApiMethodHelper<Dhis2GetApiMethod>(Dhis2GetApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(Dhis2ApiName.GET, new ApiMethodHelper<>(Dhis2GetApiMethod.class, aliases, nullableArgs));
         apiMethods.put(Dhis2GetApiMethod.class, Dhis2ApiName.GET);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiCollection.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiCollection.java
index 0257dca8355..98aba841ee7 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiCollection.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/internal/FhirApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.fhir.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.fhir.FhirConfiguration;
 import org.apache.camel.component.fhir.FhirCapabilitiesEndpointConfiguration;
@@ -37,75 +37,75 @@ public final class FhirApiCollection extends ApiCollection<FhirApiName, FhirConf
     private static FhirApiCollection collection;
 
     private FhirApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<FhirApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<FhirApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(FhirApiName.class);
         final Map<Class<? extends ApiMethod>, FhirApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList("extraParameters");
-        apiHelpers.put(FhirApiName.CAPABILITIES, new ApiMethodHelper<FhirCapabilitiesApiMethod>(FhirCapabilitiesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.CAPABILITIES, new ApiMethodHelper<>(FhirCapabilitiesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirCapabilitiesApiMethod.class, FhirApiName.CAPABILITIES);
 
         aliases.clear();
         nullableArgs = Arrays.asList("url", "preferReturn", "extraParameters");
-        apiHelpers.put(FhirApiName.CREATE, new ApiMethodHelper<FhirCreateApiMethod>(FhirCreateApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.CREATE, new ApiMethodHelper<>(FhirCreateApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirCreateApiMethod.class, FhirApiName.CREATE);
 
         aliases.clear();
         nullableArgs = Arrays.asList("extraParameters");
-        apiHelpers.put(FhirApiName.DELETE, new ApiMethodHelper<FhirDeleteApiMethod>(FhirDeleteApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.DELETE, new ApiMethodHelper<>(FhirDeleteApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirDeleteApiMethod.class, FhirApiName.DELETE);
 
         aliases.clear();
         nullableArgs = Arrays.asList("count", "cutoff", "iCutoff", "extraParameters");
-        apiHelpers.put(FhirApiName.HISTORY, new ApiMethodHelper<FhirHistoryApiMethod>(FhirHistoryApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.HISTORY, new ApiMethodHelper<>(FhirHistoryApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirHistoryApiMethod.class, FhirApiName.HISTORY);
 
         aliases.clear();
         nullableArgs = Arrays.asList("extraParameters");
-        apiHelpers.put(FhirApiName.LOAD_PAGE, new ApiMethodHelper<FhirLoadPageApiMethod>(FhirLoadPageApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.LOAD_PAGE, new ApiMethodHelper<>(FhirLoadPageApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirLoadPageApiMethod.class, FhirApiName.LOAD_PAGE);
 
         aliases.clear();
         nullableArgs = Arrays.asList("extraParameters");
-        apiHelpers.put(FhirApiName.META, new ApiMethodHelper<FhirMetaApiMethod>(FhirMetaApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.META, new ApiMethodHelper<>(FhirMetaApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirMetaApiMethod.class, FhirApiName.META);
 
         aliases.clear();
         nullableArgs = Arrays.asList("extraParameters", "parameters", "outputParameterType", "returnType", "respondToUri");
-        apiHelpers.put(FhirApiName.OPERATION, new ApiMethodHelper<FhirOperationApiMethod>(FhirOperationApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.OPERATION, new ApiMethodHelper<>(FhirOperationApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirOperationApiMethod.class, FhirApiName.OPERATION);
 
         aliases.clear();
         nullableArgs = Arrays.asList("preferReturn", "extraParameters");
-        apiHelpers.put(FhirApiName.PATCH, new ApiMethodHelper<FhirPatchApiMethod>(FhirPatchApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.PATCH, new ApiMethodHelper<>(FhirPatchApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirPatchApiMethod.class, FhirApiName.PATCH);
 
         aliases.clear();
         nullableArgs = Arrays.asList("ifVersionMatches", "returnNull", "returnResource", "throwError", "extraParameters", "version");
-        apiHelpers.put(FhirApiName.READ, new ApiMethodHelper<FhirReadApiMethod>(FhirReadApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.READ, new ApiMethodHelper<>(FhirReadApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirReadApiMethod.class, FhirApiName.READ);
 
         aliases.clear();
         nullableArgs = Arrays.asList("extraParameters");
-        apiHelpers.put(FhirApiName.SEARCH, new ApiMethodHelper<FhirSearchApiMethod>(FhirSearchApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.SEARCH, new ApiMethodHelper<>(FhirSearchApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirSearchApiMethod.class, FhirApiName.SEARCH);
 
         aliases.clear();
         nullableArgs = Arrays.asList("extraParameters");
-        apiHelpers.put(FhirApiName.TRANSACTION, new ApiMethodHelper<FhirTransactionApiMethod>(FhirTransactionApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.TRANSACTION, new ApiMethodHelper<>(FhirTransactionApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirTransactionApiMethod.class, FhirApiName.TRANSACTION);
 
         aliases.clear();
         nullableArgs = Arrays.asList("id", "stringId", "preferReturn", "extraParameters");
-        apiHelpers.put(FhirApiName.UPDATE, new ApiMethodHelper<FhirUpdateApiMethod>(FhirUpdateApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.UPDATE, new ApiMethodHelper<>(FhirUpdateApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirUpdateApiMethod.class, FhirApiName.UPDATE);
 
         aliases.clear();
         nullableArgs = Arrays.asList("extraParameters");
-        apiHelpers.put(FhirApiName.VALIDATE, new ApiMethodHelper<FhirValidateApiMethod>(FhirValidateApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(FhirApiName.VALIDATE, new ApiMethodHelper<>(FhirValidateApiMethod.class, aliases, nullableArgs));
         apiMethods.put(FhirValidateApiMethod.class, FhirApiName.VALIDATE);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiCollection.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiCollection.java
index 47ea5adbbfd..1b933ef36ba 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiCollection.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.google.calendar.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.google.calendar.GoogleCalendarConfiguration;
 import org.apache.camel.component.google.calendar.CalendarAclEndpointConfiguration;
@@ -32,50 +32,50 @@ public final class GoogleCalendarApiCollection extends ApiCollection<GoogleCalen
     private static GoogleCalendarApiCollection collection;
 
     private GoogleCalendarApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<GoogleCalendarApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<GoogleCalendarApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(GoogleCalendarApiName.class);
         final Map<Class<? extends ApiMethod>, GoogleCalendarApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleCalendarApiName.ACL, new ApiMethodHelper<CalendarAclApiMethod>(CalendarAclApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleCalendarApiName.ACL, new ApiMethodHelper<>(CalendarAclApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CalendarAclApiMethod.class, GoogleCalendarApiName.ACL);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleCalendarApiName.LIST, new ApiMethodHelper<CalendarCalendarListApiMethod>(CalendarCalendarListApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleCalendarApiName.LIST, new ApiMethodHelper<>(CalendarCalendarListApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CalendarCalendarListApiMethod.class, GoogleCalendarApiName.LIST);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleCalendarApiName.CALENDARS, new ApiMethodHelper<CalendarCalendarsApiMethod>(CalendarCalendarsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleCalendarApiName.CALENDARS, new ApiMethodHelper<>(CalendarCalendarsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CalendarCalendarsApiMethod.class, GoogleCalendarApiName.CALENDARS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleCalendarApiName.CHANNELS, new ApiMethodHelper<CalendarChannelsApiMethod>(CalendarChannelsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleCalendarApiName.CHANNELS, new ApiMethodHelper<>(CalendarChannelsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CalendarChannelsApiMethod.class, GoogleCalendarApiName.CHANNELS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleCalendarApiName.COLORS, new ApiMethodHelper<CalendarColorsApiMethod>(CalendarColorsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleCalendarApiName.COLORS, new ApiMethodHelper<>(CalendarColorsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CalendarColorsApiMethod.class, GoogleCalendarApiName.COLORS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleCalendarApiName.FREEBUSY, new ApiMethodHelper<CalendarFreebusyApiMethod>(CalendarFreebusyApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleCalendarApiName.FREEBUSY, new ApiMethodHelper<>(CalendarFreebusyApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CalendarFreebusyApiMethod.class, GoogleCalendarApiName.FREEBUSY);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleCalendarApiName.EVENTS, new ApiMethodHelper<CalendarEventsApiMethod>(CalendarEventsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleCalendarApiName.EVENTS, new ApiMethodHelper<>(CalendarEventsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CalendarEventsApiMethod.class, GoogleCalendarApiName.EVENTS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleCalendarApiName.SETTINGS, new ApiMethodHelper<CalendarSettingsApiMethod>(CalendarSettingsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleCalendarApiName.SETTINGS, new ApiMethodHelper<>(CalendarSettingsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CalendarSettingsApiMethod.class, GoogleCalendarApiName.SETTINGS);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java
index d043fe8ed00..92384728563 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.google.drive.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.google.drive.GoogleDriveConfiguration;
 import org.apache.camel.component.google.drive.DriveAboutEndpointConfiguration;
@@ -38,80 +38,80 @@ public final class GoogleDriveApiCollection extends ApiCollection<GoogleDriveApi
     private static GoogleDriveApiCollection collection;
 
     private GoogleDriveApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<GoogleDriveApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<GoogleDriveApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(GoogleDriveApiName.class);
         final Map<Class<? extends ApiMethod>, GoogleDriveApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_ABOUT, new ApiMethodHelper<DriveAboutApiMethod>(DriveAboutApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_ABOUT, new ApiMethodHelper<>(DriveAboutApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveAboutApiMethod.class, GoogleDriveApiName.DRIVE_ABOUT);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_APPS, new ApiMethodHelper<DriveAppsApiMethod>(DriveAppsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_APPS, new ApiMethodHelper<>(DriveAppsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveAppsApiMethod.class, GoogleDriveApiName.DRIVE_APPS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_CHANGES, new ApiMethodHelper<DriveChangesApiMethod>(DriveChangesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_CHANGES, new ApiMethodHelper<>(DriveChangesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveChangesApiMethod.class, GoogleDriveApiName.DRIVE_CHANGES);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_CHANNELS, new ApiMethodHelper<DriveChannelsApiMethod>(DriveChannelsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_CHANNELS, new ApiMethodHelper<>(DriveChannelsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveChannelsApiMethod.class, GoogleDriveApiName.DRIVE_CHANNELS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_CHILDREN, new ApiMethodHelper<DriveChildrenApiMethod>(DriveChildrenApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_CHILDREN, new ApiMethodHelper<>(DriveChildrenApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveChildrenApiMethod.class, GoogleDriveApiName.DRIVE_CHILDREN);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_COMMENTS, new ApiMethodHelper<DriveCommentsApiMethod>(DriveCommentsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_COMMENTS, new ApiMethodHelper<>(DriveCommentsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveCommentsApiMethod.class, GoogleDriveApiName.DRIVE_COMMENTS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_FILES, new ApiMethodHelper<DriveFilesApiMethod>(DriveFilesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_FILES, new ApiMethodHelper<>(DriveFilesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveFilesApiMethod.class, GoogleDriveApiName.DRIVE_FILES);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_PARENTS, new ApiMethodHelper<DriveParentsApiMethod>(DriveParentsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_PARENTS, new ApiMethodHelper<>(DriveParentsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveParentsApiMethod.class, GoogleDriveApiName.DRIVE_PARENTS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_PERMISSIONS, new ApiMethodHelper<DrivePermissionsApiMethod>(DrivePermissionsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_PERMISSIONS, new ApiMethodHelper<>(DrivePermissionsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DrivePermissionsApiMethod.class, GoogleDriveApiName.DRIVE_PERMISSIONS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_PROPERTIES, new ApiMethodHelper<DrivePropertiesApiMethod>(DrivePropertiesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_PROPERTIES, new ApiMethodHelper<>(DrivePropertiesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DrivePropertiesApiMethod.class, GoogleDriveApiName.DRIVE_PROPERTIES);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_DRIVES, new ApiMethodHelper<DriveDrivesApiMethod>(DriveDrivesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_DRIVES, new ApiMethodHelper<>(DriveDrivesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveDrivesApiMethod.class, GoogleDriveApiName.DRIVE_DRIVES);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_TEAMDRIVES, new ApiMethodHelper<DriveTeamdrivesApiMethod>(DriveTeamdrivesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_TEAMDRIVES, new ApiMethodHelper<>(DriveTeamdrivesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveTeamdrivesApiMethod.class, GoogleDriveApiName.DRIVE_TEAMDRIVES);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_REPLIES, new ApiMethodHelper<DriveRepliesApiMethod>(DriveRepliesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_REPLIES, new ApiMethodHelper<>(DriveRepliesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveRepliesApiMethod.class, GoogleDriveApiName.DRIVE_REPLIES);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleDriveApiName.DRIVE_REVISIONS, new ApiMethodHelper<DriveRevisionsApiMethod>(DriveRevisionsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleDriveApiName.DRIVE_REVISIONS, new ApiMethodHelper<>(DriveRevisionsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(DriveRevisionsApiMethod.class, GoogleDriveApiName.DRIVE_REVISIONS);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiCollection.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiCollection.java
index d016de8b669..6022b900185 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiCollection.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/internal/GoogleMailApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.google.mail.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.google.mail.GoogleMailConfiguration;
 import org.apache.camel.component.google.mail.GmailUsersThreadsEndpointConfiguration;
@@ -31,45 +31,45 @@ public final class GoogleMailApiCollection extends ApiCollection<GoogleMailApiNa
     private static GoogleMailApiCollection collection;
 
     private GoogleMailApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<GoogleMailApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<GoogleMailApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(GoogleMailApiName.class);
         final Map<Class<? extends ApiMethod>, GoogleMailApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleMailApiName.THREADS, new ApiMethodHelper<GmailUsersThreadsApiMethod>(GmailUsersThreadsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleMailApiName.THREADS, new ApiMethodHelper<>(GmailUsersThreadsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(GmailUsersThreadsApiMethod.class, GoogleMailApiName.THREADS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleMailApiName.MESSAGES, new ApiMethodHelper<GmailUsersMessagesApiMethod>(GmailUsersMessagesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleMailApiName.MESSAGES, new ApiMethodHelper<>(GmailUsersMessagesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(GmailUsersMessagesApiMethod.class, GoogleMailApiName.MESSAGES);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleMailApiName.ATTACHMENTS, new ApiMethodHelper<GmailUsersMessagesAttachmentsApiMethod>(GmailUsersMessagesAttachmentsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleMailApiName.ATTACHMENTS, new ApiMethodHelper<>(GmailUsersMessagesAttachmentsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(GmailUsersMessagesAttachmentsApiMethod.class, GoogleMailApiName.ATTACHMENTS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleMailApiName.LABELS, new ApiMethodHelper<GmailUsersLabelsApiMethod>(GmailUsersLabelsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleMailApiName.LABELS, new ApiMethodHelper<>(GmailUsersLabelsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(GmailUsersLabelsApiMethod.class, GoogleMailApiName.LABELS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleMailApiName.HISTORY, new ApiMethodHelper<GmailUsersHistoryApiMethod>(GmailUsersHistoryApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleMailApiName.HISTORY, new ApiMethodHelper<>(GmailUsersHistoryApiMethod.class, aliases, nullableArgs));
         apiMethods.put(GmailUsersHistoryApiMethod.class, GoogleMailApiName.HISTORY);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleMailApiName.DRAFTS, new ApiMethodHelper<GmailUsersDraftsApiMethod>(GmailUsersDraftsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleMailApiName.DRAFTS, new ApiMethodHelper<>(GmailUsersDraftsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(GmailUsersDraftsApiMethod.class, GoogleMailApiName.DRAFTS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleMailApiName.USERS, new ApiMethodHelper<GmailUsersApiMethod>(GmailUsersApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleMailApiName.USERS, new ApiMethodHelper<>(GmailUsersApiMethod.class, aliases, nullableArgs));
         apiMethods.put(GmailUsersApiMethod.class, GoogleMailApiName.USERS);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiCollection.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiCollection.java
index abbab71dc38..2b1ba051b7c 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiCollection.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.google.sheets.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.google.sheets.GoogleSheetsConfiguration;
 import org.apache.camel.component.google.sheets.SheetsSpreadsheetsEndpointConfiguration;
@@ -26,20 +26,20 @@ public final class GoogleSheetsApiCollection extends ApiCollection<GoogleSheetsA
     private static GoogleSheetsApiCollection collection;
 
     private GoogleSheetsApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<GoogleSheetsApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<GoogleSheetsApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(GoogleSheetsApiName.class);
         final Map<Class<? extends ApiMethod>, GoogleSheetsApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleSheetsApiName.SPREADSHEETS, new ApiMethodHelper<SheetsSpreadsheetsApiMethod>(SheetsSpreadsheetsApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleSheetsApiName.SPREADSHEETS, new ApiMethodHelper<>(SheetsSpreadsheetsApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SheetsSpreadsheetsApiMethod.class, GoogleSheetsApiName.SPREADSHEETS);
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(GoogleSheetsApiName.DATA, new ApiMethodHelper<SheetsSpreadsheetsValuesApiMethod>(SheetsSpreadsheetsValuesApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(GoogleSheetsApiName.DATA, new ApiMethodHelper<>(SheetsSpreadsheetsValuesApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SheetsSpreadsheetsValuesApiMethod.class, GoogleSheetsApiName.DATA);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiCollection.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiCollection.java
index 4e1f23ba14c..246d49ce427 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiCollection.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/internal/Olingo2ApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.olingo2.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.olingo2.Olingo2Configuration;
 import org.apache.camel.component.olingo2.Olingo2AppEndpointConfiguration;
@@ -25,15 +25,15 @@ public final class Olingo2ApiCollection extends ApiCollection<Olingo2ApiName, Ol
     private static Olingo2ApiCollection collection;
 
     private Olingo2ApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<Olingo2ApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<Olingo2ApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(Olingo2ApiName.class);
         final Map<Class<? extends ApiMethod>, Olingo2ApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList("queryParams", "endpointHttpHeaders", "edm", "responseHandler");
-        apiHelpers.put(Olingo2ApiName.DEFAULT, new ApiMethodHelper<Olingo2AppApiMethod>(Olingo2AppApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(Olingo2ApiName.DEFAULT, new ApiMethodHelper<>(Olingo2AppApiMethod.class, aliases, nullableArgs));
         apiMethods.put(Olingo2AppApiMethod.class, Olingo2ApiName.DEFAULT);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiCollection.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiCollection.java
index 9253a1bd408..831ae8351b2 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiCollection.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/internal/Olingo4ApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.olingo4.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.olingo4.Olingo4Configuration;
 import org.apache.camel.component.olingo4.Olingo4AppEndpointConfiguration;
@@ -25,15 +25,15 @@ public final class Olingo4ApiCollection extends ApiCollection<Olingo4ApiName, Ol
     private static Olingo4ApiCollection collection;
 
     private Olingo4ApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<Olingo4ApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<Olingo4ApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(Olingo4ApiName.class);
         final Map<Class<? extends ApiMethod>, Olingo4ApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList("queryParams", "endpointHttpHeaders", "edm", "responseHandler", "data");
-        apiHelpers.put(Olingo4ApiName.DEFAULT, new ApiMethodHelper<Olingo4AppApiMethod>(Olingo4AppApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(Olingo4ApiName.DEFAULT, new ApiMethodHelper<>(Olingo4AppApiMethod.class, aliases, nullableArgs));
         apiMethods.put(Olingo4AppApiMethod.class, Olingo4ApiName.DEFAULT);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiCollection.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiCollection.java
index f44b7a4a260..df547070f65 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiCollection.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/internal/TwilioApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.twilio.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.twilio.TwilioConfiguration;
 import org.apache.camel.component.twilio.AccountEndpointConfiguration;
@@ -80,8 +80,8 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
     private static TwilioApiCollection collection;
 
     private TwilioApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<TwilioApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<TwilioApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(TwilioApiName.class);
         final Map<Class<? extends ApiMethod>, TwilioApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
@@ -93,7 +93,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.ACCOUNT, new ApiMethodHelper<AccountApiMethod>(AccountApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.ACCOUNT, new ApiMethodHelper<>(AccountApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AccountApiMethod.class, TwilioApiName.ACCOUNT);
 
         aliases.clear();
@@ -103,7 +103,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.ADDRESS, new ApiMethodHelper<AddressApiMethod>(AddressApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.ADDRESS, new ApiMethodHelper<>(AddressApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AddressApiMethod.class, TwilioApiName.ADDRESS);
 
         aliases.clear();
@@ -113,7 +113,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.APPLICATION, new ApiMethodHelper<ApplicationApiMethod>(ApplicationApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.APPLICATION, new ApiMethodHelper<>(ApplicationApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ApplicationApiMethod.class, TwilioApiName.APPLICATION);
 
         aliases.clear();
@@ -123,7 +123,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY, new ApiMethodHelper<AvailablePhoneNumberCountryApiMethod>(AvailablePhoneNumberCountryApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY, new ApiMethodHelper<>(AvailablePhoneNumberCountryApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AvailablePhoneNumberCountryApiMethod.class, TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY);
 
         aliases.clear();
@@ -133,7 +133,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.CALL, new ApiMethodHelper<CallApiMethod>(CallApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.CALL, new ApiMethodHelper<>(CallApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CallApiMethod.class, TwilioApiName.CALL);
 
         aliases.clear();
@@ -143,7 +143,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.CONFERENCE, new ApiMethodHelper<ConferenceApiMethod>(ConferenceApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.CONFERENCE, new ApiMethodHelper<>(ConferenceApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ConferenceApiMethod.class, TwilioApiName.CONFERENCE);
 
         aliases.clear();
@@ -153,7 +153,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.CONNECT_APP, new ApiMethodHelper<ConnectAppApiMethod>(ConnectAppApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.CONNECT_APP, new ApiMethodHelper<>(ConnectAppApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ConnectAppApiMethod.class, TwilioApiName.CONNECT_APP);
 
         aliases.clear();
@@ -163,7 +163,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.INCOMING_PHONE_NUMBER, new ApiMethodHelper<IncomingPhoneNumberApiMethod>(IncomingPhoneNumberApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.INCOMING_PHONE_NUMBER, new ApiMethodHelper<>(IncomingPhoneNumberApiMethod.class, aliases, nullableArgs));
         apiMethods.put(IncomingPhoneNumberApiMethod.class, TwilioApiName.INCOMING_PHONE_NUMBER);
 
         aliases.clear();
@@ -173,7 +173,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.KEY, new ApiMethodHelper<KeyApiMethod>(KeyApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.KEY, new ApiMethodHelper<>(KeyApiMethod.class, aliases, nullableArgs));
         apiMethods.put(KeyApiMethod.class, TwilioApiName.KEY);
 
         aliases.clear();
@@ -183,7 +183,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.MESSAGE, new ApiMethodHelper<MessageApiMethod>(MessageApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.MESSAGE, new ApiMethodHelper<>(MessageApiMethod.class, aliases, nullableArgs));
         apiMethods.put(MessageApiMethod.class, TwilioApiName.MESSAGE);
 
         aliases.clear();
@@ -193,7 +193,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.NEW_KEY, new ApiMethodHelper<NewKeyApiMethod>(NewKeyApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.NEW_KEY, new ApiMethodHelper<>(NewKeyApiMethod.class, aliases, nullableArgs));
         apiMethods.put(NewKeyApiMethod.class, TwilioApiName.NEW_KEY);
 
         aliases.clear();
@@ -203,7 +203,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.NEW_SIGNING_KEY, new ApiMethodHelper<NewSigningKeyApiMethod>(NewSigningKeyApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.NEW_SIGNING_KEY, new ApiMethodHelper<>(NewSigningKeyApiMethod.class, aliases, nullableArgs));
         apiMethods.put(NewSigningKeyApiMethod.class, TwilioApiName.NEW_SIGNING_KEY);
 
         aliases.clear();
@@ -213,7 +213,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.NOTIFICATION, new ApiMethodHelper<NotificationApiMethod>(NotificationApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.NOTIFICATION, new ApiMethodHelper<>(NotificationApiMethod.class, aliases, nullableArgs));
         apiMethods.put(NotificationApiMethod.class, TwilioApiName.NOTIFICATION);
 
         aliases.clear();
@@ -223,7 +223,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.OUTGOING_CALLER_ID, new ApiMethodHelper<OutgoingCallerIdApiMethod>(OutgoingCallerIdApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.OUTGOING_CALLER_ID, new ApiMethodHelper<>(OutgoingCallerIdApiMethod.class, aliases, nullableArgs));
         apiMethods.put(OutgoingCallerIdApiMethod.class, TwilioApiName.OUTGOING_CALLER_ID);
 
         aliases.clear();
@@ -233,7 +233,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.QUEUE, new ApiMethodHelper<QueueApiMethod>(QueueApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.QUEUE, new ApiMethodHelper<>(QueueApiMethod.class, aliases, nullableArgs));
         apiMethods.put(QueueApiMethod.class, TwilioApiName.QUEUE);
 
         aliases.clear();
@@ -243,7 +243,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.RECORDING, new ApiMethodHelper<RecordingApiMethod>(RecordingApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.RECORDING, new ApiMethodHelper<>(RecordingApiMethod.class, aliases, nullableArgs));
         apiMethods.put(RecordingApiMethod.class, TwilioApiName.RECORDING);
 
         aliases.clear();
@@ -253,7 +253,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SHORT_CODE, new ApiMethodHelper<ShortCodeApiMethod>(ShortCodeApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SHORT_CODE, new ApiMethodHelper<>(ShortCodeApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ShortCodeApiMethod.class, TwilioApiName.SHORT_CODE);
 
         aliases.clear();
@@ -263,7 +263,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SIGNING_KEY, new ApiMethodHelper<SigningKeyApiMethod>(SigningKeyApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SIGNING_KEY, new ApiMethodHelper<>(SigningKeyApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SigningKeyApiMethod.class, TwilioApiName.SIGNING_KEY);
 
         aliases.clear();
@@ -273,7 +273,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.TOKEN, new ApiMethodHelper<TokenApiMethod>(TokenApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.TOKEN, new ApiMethodHelper<>(TokenApiMethod.class, aliases, nullableArgs));
         apiMethods.put(TokenApiMethod.class, TwilioApiName.TOKEN);
 
         aliases.clear();
@@ -283,7 +283,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.TRANSCRIPTION, new ApiMethodHelper<TranscriptionApiMethod>(TranscriptionApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.TRANSCRIPTION, new ApiMethodHelper<>(TranscriptionApiMethod.class, aliases, nullableArgs));
         apiMethods.put(TranscriptionApiMethod.class, TwilioApiName.TRANSCRIPTION);
 
         aliases.clear();
@@ -293,7 +293,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.VALIDATION_REQUEST, new ApiMethodHelper<ValidationRequestApiMethod>(ValidationRequestApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.VALIDATION_REQUEST, new ApiMethodHelper<>(ValidationRequestApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ValidationRequestApiMethod.class, TwilioApiName.VALIDATION_REQUEST);
 
         aliases.clear();
@@ -303,7 +303,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.ADDRESS_DEPENDENT_PHONE_NUMBER, new ApiMethodHelper<AddressDependentPhoneNumberApiMethod>(AddressDependentPhoneNumberApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.ADDRESS_DEPENDENT_PHONE_NUMBER, new ApiMethodHelper<>(AddressDependentPhoneNumberApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AddressDependentPhoneNumberApiMethod.class, TwilioApiName.ADDRESS_DEPENDENT_PHONE_NUMBER);
 
         aliases.clear();
@@ -313,7 +313,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_LOCAL, new ApiMethodHelper<AvailablePhoneNumberCountryLocalApiMethod>(AvailablePhoneNumberCountryLocalApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_LOCAL, new ApiMethodHelper<>(AvailablePhoneNumberCountryLocalApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AvailablePhoneNumberCountryLocalApiMethod.class, TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_LOCAL);
 
         aliases.clear();
@@ -323,7 +323,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_MOBILE, new ApiMethodHelper<AvailablePhoneNumberCountryMobileApiMethod>(AvailablePhoneNumberCountryMobileApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_MOBILE, new ApiMethodHelper<>(AvailablePhoneNumberCountryMobileApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AvailablePhoneNumberCountryMobileApiMethod.class, TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_MOBILE);
 
         aliases.clear();
@@ -333,7 +333,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_TOLL_FREE, new ApiMethodHelper<AvailablePhoneNumberCountryTollFreeApiMethod>(AvailablePhoneNumberCountryTollFreeApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_TOLL_FREE, new ApiMethodHelper<>(AvailablePhoneNumberCountryTollFreeApiMethod.class, aliases, nullableArgs));
         apiMethods.put(AvailablePhoneNumberCountryTollFreeApiMethod.class, TwilioApiName.AVAILABLE_PHONE_NUMBER_COUNTRY_TOLL_FREE);
 
         aliases.clear();
@@ -343,7 +343,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.CALL_FEEDBACK, new ApiMethodHelper<CallFeedbackApiMethod>(CallFeedbackApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.CALL_FEEDBACK, new ApiMethodHelper<>(CallFeedbackApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CallFeedbackApiMethod.class, TwilioApiName.CALL_FEEDBACK);
 
         aliases.clear();
@@ -353,7 +353,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.CALL_FEEDBACK_SUMMARY, new ApiMethodHelper<CallFeedbackSummaryApiMethod>(CallFeedbackSummaryApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.CALL_FEEDBACK_SUMMARY, new ApiMethodHelper<>(CallFeedbackSummaryApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CallFeedbackSummaryApiMethod.class, TwilioApiName.CALL_FEEDBACK_SUMMARY);
 
         aliases.clear();
@@ -363,7 +363,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.CALL_NOTIFICATION, new ApiMethodHelper<CallNotificationApiMethod>(CallNotificationApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.CALL_NOTIFICATION, new ApiMethodHelper<>(CallNotificationApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CallNotificationApiMethod.class, TwilioApiName.CALL_NOTIFICATION);
 
         aliases.clear();
@@ -373,7 +373,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.CALL_RECORDING, new ApiMethodHelper<CallRecordingApiMethod>(CallRecordingApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.CALL_RECORDING, new ApiMethodHelper<>(CallRecordingApiMethod.class, aliases, nullableArgs));
         apiMethods.put(CallRecordingApiMethod.class, TwilioApiName.CALL_RECORDING);
 
         aliases.clear();
@@ -383,7 +383,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.CONFERENCE_PARTICIPANT, new ApiMethodHelper<ConferenceParticipantApiMethod>(ConferenceParticipantApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.CONFERENCE_PARTICIPANT, new ApiMethodHelper<>(ConferenceParticipantApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ConferenceParticipantApiMethod.class, TwilioApiName.CONFERENCE_PARTICIPANT);
 
         aliases.clear();
@@ -393,7 +393,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.INCOMING_PHONE_NUMBER_LOCAL, new ApiMethodHelper<IncomingPhoneNumberLocalApiMethod>(IncomingPhoneNumberLocalApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.INCOMING_PHONE_NUMBER_LOCAL, new ApiMethodHelper<>(IncomingPhoneNumberLocalApiMethod.class, aliases, nullableArgs));
         apiMethods.put(IncomingPhoneNumberLocalApiMethod.class, TwilioApiName.INCOMING_PHONE_NUMBER_LOCAL);
 
         aliases.clear();
@@ -403,7 +403,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.INCOMING_PHONE_NUMBER_MOBILE, new ApiMethodHelper<IncomingPhoneNumberMobileApiMethod>(IncomingPhoneNumberMobileApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.INCOMING_PHONE_NUMBER_MOBILE, new ApiMethodHelper<>(IncomingPhoneNumberMobileApiMethod.class, aliases, nullableArgs));
         apiMethods.put(IncomingPhoneNumberMobileApiMethod.class, TwilioApiName.INCOMING_PHONE_NUMBER_MOBILE);
 
         aliases.clear();
@@ -413,7 +413,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.INCOMING_PHONE_NUMBER_TOLL_FREE, new ApiMethodHelper<IncomingPhoneNumberTollFreeApiMethod>(IncomingPhoneNumberTollFreeApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.INCOMING_PHONE_NUMBER_TOLL_FREE, new ApiMethodHelper<>(IncomingPhoneNumberTollFreeApiMethod.class, aliases, nullableArgs));
         apiMethods.put(IncomingPhoneNumberTollFreeApiMethod.class, TwilioApiName.INCOMING_PHONE_NUMBER_TOLL_FREE);
 
         aliases.clear();
@@ -423,7 +423,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.MESSAGE_FEEDBACK, new ApiMethodHelper<MessageFeedbackApiMethod>(MessageFeedbackApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.MESSAGE_FEEDBACK, new ApiMethodHelper<>(MessageFeedbackApiMethod.class, aliases, nullableArgs));
         apiMethods.put(MessageFeedbackApiMethod.class, TwilioApiName.MESSAGE_FEEDBACK);
 
         aliases.clear();
@@ -433,7 +433,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.MESSAGE_MEDIA, new ApiMethodHelper<MessageMediaApiMethod>(MessageMediaApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.MESSAGE_MEDIA, new ApiMethodHelper<>(MessageMediaApiMethod.class, aliases, nullableArgs));
         apiMethods.put(MessageMediaApiMethod.class, TwilioApiName.MESSAGE_MEDIA);
 
         aliases.clear();
@@ -443,7 +443,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.QUEUE_MEMBER, new ApiMethodHelper<QueueMemberApiMethod>(QueueMemberApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.QUEUE_MEMBER, new ApiMethodHelper<>(QueueMemberApiMethod.class, aliases, nullableArgs));
         apiMethods.put(QueueMemberApiMethod.class, TwilioApiName.QUEUE_MEMBER);
 
         aliases.clear();
@@ -453,7 +453,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.RECORDING_ADD_ON_RESULT, new ApiMethodHelper<RecordingAddOnResultApiMethod>(RecordingAddOnResultApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.RECORDING_ADD_ON_RESULT, new ApiMethodHelper<>(RecordingAddOnResultApiMethod.class, aliases, nullableArgs));
         apiMethods.put(RecordingAddOnResultApiMethod.class, TwilioApiName.RECORDING_ADD_ON_RESULT);
 
         aliases.clear();
@@ -463,7 +463,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.RECORDING_TRANSCRIPTION, new ApiMethodHelper<RecordingTranscriptionApiMethod>(RecordingTranscriptionApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.RECORDING_TRANSCRIPTION, new ApiMethodHelper<>(RecordingTranscriptionApiMethod.class, aliases, nullableArgs));
         apiMethods.put(RecordingTranscriptionApiMethod.class, TwilioApiName.RECORDING_TRANSCRIPTION);
 
         aliases.clear();
@@ -473,7 +473,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.RECORDING_ADD_ON_RESULT_PAYLOAD, new ApiMethodHelper<RecordingAddOnResultPayloadApiMethod>(RecordingAddOnResultPayloadApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.RECORDING_ADD_ON_RESULT_PAYLOAD, new ApiMethodHelper<>(RecordingAddOnResultPayloadApiMethod.class, aliases, nullableArgs));
         apiMethods.put(RecordingAddOnResultPayloadApiMethod.class, TwilioApiName.RECORDING_ADD_ON_RESULT_PAYLOAD);
 
         aliases.clear();
@@ -483,7 +483,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SIP_CREDENTIAL_LIST, new ApiMethodHelper<SipCredentialListApiMethod>(SipCredentialListApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SIP_CREDENTIAL_LIST, new ApiMethodHelper<>(SipCredentialListApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SipCredentialListApiMethod.class, TwilioApiName.SIP_CREDENTIAL_LIST);
 
         aliases.clear();
@@ -493,7 +493,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SIP_DOMAIN, new ApiMethodHelper<SipDomainApiMethod>(SipDomainApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SIP_DOMAIN, new ApiMethodHelper<>(SipDomainApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SipDomainApiMethod.class, TwilioApiName.SIP_DOMAIN);
 
         aliases.clear();
@@ -503,7 +503,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SIP_IP_ACCESS_CONTROL_LIST, new ApiMethodHelper<SipIpAccessControlListApiMethod>(SipIpAccessControlListApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SIP_IP_ACCESS_CONTROL_LIST, new ApiMethodHelper<>(SipIpAccessControlListApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SipIpAccessControlListApiMethod.class, TwilioApiName.SIP_IP_ACCESS_CONTROL_LIST);
 
         aliases.clear();
@@ -513,7 +513,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SIP_CREDENTIAL_LIST_CREDENTIAL, new ApiMethodHelper<SipCredentialApiMethod>(SipCredentialApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SIP_CREDENTIAL_LIST_CREDENTIAL, new ApiMethodHelper<>(SipCredentialApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SipCredentialApiMethod.class, TwilioApiName.SIP_CREDENTIAL_LIST_CREDENTIAL);
 
         aliases.clear();
@@ -523,7 +523,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SIP_DOMAIN_CREDENTIAL_LIST_MAPPING, new ApiMethodHelper<SipDomainCredentialListMappingApiMethod>(SipDomainCredentialListMappingApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SIP_DOMAIN_CREDENTIAL_LIST_MAPPING, new ApiMethodHelper<>(SipDomainCredentialListMappingApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SipDomainCredentialListMappingApiMethod.class, TwilioApiName.SIP_DOMAIN_CREDENTIAL_LIST_MAPPING);
 
         aliases.clear();
@@ -533,7 +533,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SIP_DOMAIN_IP_ACCESS_CONTROL_LIST_MAPPING, new ApiMethodHelper<SipDomainIpAccessControlListMappingApiMethod>(SipDomainIpAccessControlListMappingApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SIP_DOMAIN_IP_ACCESS_CONTROL_LIST_MAPPING, new ApiMethodHelper<>(SipDomainIpAccessControlListMappingApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SipDomainIpAccessControlListMappingApiMethod.class, TwilioApiName.SIP_DOMAIN_IP_ACCESS_CONTROL_LIST_MAPPING);
 
         aliases.clear();
@@ -543,7 +543,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.SIP_IP_ACCESS_CONTROL_LIST_IP_ADDRESS, new ApiMethodHelper<SipIpAccessControlListIpAddressApiMethod>(SipIpAccessControlListIpAddressApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.SIP_IP_ACCESS_CONTROL_LIST_IP_ADDRESS, new ApiMethodHelper<>(SipIpAccessControlListIpAddressApiMethod.class, aliases, nullableArgs));
         apiMethods.put(SipIpAccessControlListIpAddressApiMethod.class, TwilioApiName.SIP_IP_ACCESS_CONTROL_LIST_IP_ADDRESS);
 
         aliases.clear();
@@ -553,7 +553,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD, new ApiMethodHelper<UsageRecordApiMethod>(UsageRecordApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD, new ApiMethodHelper<>(UsageRecordApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordApiMethod.class, TwilioApiName.USAGE_RECORD);
 
         aliases.clear();
@@ -563,7 +563,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_TRIGGER, new ApiMethodHelper<UsageTriggerApiMethod>(UsageTriggerApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_TRIGGER, new ApiMethodHelper<>(UsageTriggerApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageTriggerApiMethod.class, TwilioApiName.USAGE_TRIGGER);
 
         aliases.clear();
@@ -573,7 +573,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD_ALL_TIME, new ApiMethodHelper<UsageRecordAllTimeApiMethod>(UsageRecordAllTimeApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD_ALL_TIME, new ApiMethodHelper<>(UsageRecordAllTimeApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordAllTimeApiMethod.class, TwilioApiName.USAGE_RECORD_ALL_TIME);
 
         aliases.clear();
@@ -583,7 +583,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD_DAILY, new ApiMethodHelper<UsageRecordDailyApiMethod>(UsageRecordDailyApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD_DAILY, new ApiMethodHelper<>(UsageRecordDailyApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordDailyApiMethod.class, TwilioApiName.USAGE_RECORD_DAILY);
 
         aliases.clear();
@@ -593,7 +593,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD_LAST_MONTH, new ApiMethodHelper<UsageRecordLastMonthApiMethod>(UsageRecordLastMonthApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD_LAST_MONTH, new ApiMethodHelper<>(UsageRecordLastMonthApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordLastMonthApiMethod.class, TwilioApiName.USAGE_RECORD_LAST_MONTH);
 
         aliases.clear();
@@ -603,7 +603,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD_MONTHLY, new ApiMethodHelper<UsageRecordMonthlyApiMethod>(UsageRecordMonthlyApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD_MONTHLY, new ApiMethodHelper<>(UsageRecordMonthlyApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordMonthlyApiMethod.class, TwilioApiName.USAGE_RECORD_MONTHLY);
 
         aliases.clear();
@@ -613,7 +613,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD_THIS_MONTH, new ApiMethodHelper<UsageRecordThisMonthApiMethod>(UsageRecordThisMonthApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD_THIS_MONTH, new ApiMethodHelper<>(UsageRecordThisMonthApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordThisMonthApiMethod.class, TwilioApiName.USAGE_RECORD_THIS_MONTH);
 
         aliases.clear();
@@ -623,7 +623,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD_TODAY, new ApiMethodHelper<UsageRecordTodayApiMethod>(UsageRecordTodayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD_TODAY, new ApiMethodHelper<>(UsageRecordTodayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordTodayApiMethod.class, TwilioApiName.USAGE_RECORD_TODAY);
 
         aliases.clear();
@@ -633,7 +633,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD_YEARLY, new ApiMethodHelper<UsageRecordYearlyApiMethod>(UsageRecordYearlyApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD_YEARLY, new ApiMethodHelper<>(UsageRecordYearlyApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordYearlyApiMethod.class, TwilioApiName.USAGE_RECORD_YEARLY);
 
         aliases.clear();
@@ -643,7 +643,7 @@ public final class TwilioApiCollection extends ApiCollection<TwilioApiName, Twil
         aliases.put("^reader$", "read");
         aliases.put("^updater$", "update");
         nullableArgs = Arrays.asList();
-        apiHelpers.put(TwilioApiName.USAGE_RECORD_YESTERDAY, new ApiMethodHelper<UsageRecordYesterdayApiMethod>(UsageRecordYesterdayApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(TwilioApiName.USAGE_RECORD_YESTERDAY, new ApiMethodHelper<>(UsageRecordYesterdayApiMethod.class, aliases, nullableArgs));
         apiMethods.put(UsageRecordYesterdayApiMethod.class, TwilioApiName.USAGE_RECORD_YESTERDAY);
 
         setApiHelpers(apiHelpers);
diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiCollection.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiCollection.java
index bfdaed60da0..53e4adadb7e 100644
--- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiCollection.java
+++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/internal/ZendeskApiCollection.java
@@ -5,10 +5,10 @@
 package org.apache.camel.component.zendesk.internal;
 
 import java.util.Arrays;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 import org.apache.camel.component.zendesk.ZendeskConfiguration;
 import org.apache.camel.component.zendesk.ZendeskEndpointConfiguration;
@@ -25,15 +25,15 @@ public final class ZendeskApiCollection extends ApiCollection<ZendeskApiName, Ze
     private static ZendeskApiCollection collection;
 
     private ZendeskApiCollection() {
-        final Map<String, String> aliases = new HashMap<String, String>();
-        final Map<ZendeskApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new HashMap<>();
+        final Map<String, String> aliases = new HashMap<>();
+        final Map<ZendeskApiName, ApiMethodHelper<? extends ApiMethod>> apiHelpers = new EnumMap<>(ZendeskApiName.class);
         final Map<Class<? extends ApiMethod>, ZendeskApiName> apiMethods = new HashMap<>();
 
         List<String> nullableArgs;
 
         aliases.clear();
         nullableArgs = Arrays.asList();
-        apiHelpers.put(ZendeskApiName.DEFAULT, new ApiMethodHelper<ZendeskApiMethod>(ZendeskApiMethod.class, aliases, nullableArgs));
+        apiHelpers.put(ZendeskApiName.DEFAULT, new ApiMethodHelper<>(ZendeskApiMethod.class, aliases, nullableArgs));
         apiMethods.put(ZendeskApiMethod.class, ZendeskApiName.DEFAULT);
 
         setApiHelpers(apiHelpers);