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 2020/09/02 16:24:31 UTC

[camel] branch master updated: CAMEL-15478: Generate documentation for API components with their API query parameters in tables per API.

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5887bdcb CAMEL-15478: Generate documentation for API components with their API query parameters in tables per API.
5887bdcb is described below

commit 5887bdcb51004b2d6056e1f17c32031dc111e3c8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 2 18:23:59 2020 +0200

    CAMEL-15478: Generate documentation for API components with their API query parameters in tables per API.
---
 .../apache/camel/catalog/docs/as2-component.adoc   |  43 ++
 .../apache/camel/catalog/docs/box-component.adoc   | 165 +++++
 .../camel/catalog/docs/braintree-component.adoc    | 774 ++++-----------------
 .../apache/camel/catalog/docs/fhir-component.adoc  | 167 +++++
 .../catalog/docs/google-calendar-component.adoc    |  74 ++
 .../docs/google-calendar-stream-component.adoc     |  74 ++
 .../camel/catalog/docs/google-drive-component.adoc | 119 ++++
 .../camel/catalog/docs/google-mail-component.adoc  |  78 +++
 .../catalog/docs/google-mail-stream-component.adoc |  78 +++
 .../catalog/docs/google-sheets-component.adoc      |  38 +
 .../docs/google-sheets-stream-component.adoc       |  38 +
 .../camel/catalog/docs/olingo2-component.adoc      |  26 +
 .../camel/catalog/docs/olingo4-component.adoc      |  26 +
 .../camel/catalog/docs/twilio-component.adoc       | 558 +++++++++++++--
 .../camel/catalog/docs/zendesk-component.adoc      | 134 ++++
 .../src/main/docs/as2-component.adoc               |  43 ++
 .../org/apache/camel/component/box/box.json        |  12 +-
 .../src/main/docs/box-component.adoc               | 165 +++++
 .../camel/component/braintree/braintree.json       |  22 +-
 .../src/main/docs/braintree-component.adoc         | 774 ++++-----------------
 .../org/apache/camel/component/fhir/fhir.json      |  18 +-
 .../src/main/docs/fhir-component.adoc              | 167 +++++
 .../component/google/calendar/google-calendar.json |  10 +-
 .../calendar/stream/google-calendar-stream.json    |  10 +-
 .../src/main/docs/google-calendar-component.adoc   |  74 ++
 .../docs/google-calendar-stream-component.adoc     |  74 ++
 .../camel/component/google/drive/google-drive.json |  14 +-
 .../src/main/docs/google-drive-component.adoc      | 119 ++++
 .../camel/component/google/mail/google-mail.json   |  10 +-
 .../google/mail/stream/google-mail-stream.json     |  10 +-
 .../src/main/docs/google-mail-component.adoc       |  78 +++
 .../main/docs/google-mail-stream-component.adoc    |  78 +++
 .../component/google/sheets/google-sheets.json     |   4 +-
 .../google/sheets/stream/google-sheets-stream.json |   4 +-
 .../src/main/docs/google-sheets-component.adoc     |  38 +
 .../main/docs/google-sheets-stream-component.adoc  |  38 +
 .../src/main/docs/olingo2-component.adoc           |  26 +
 .../src/main/docs/olingo4-component.adoc           |  26 +
 .../org/apache/camel/component/twilio/twilio.json  |  92 +--
 .../src/main/docs/twilio-component.adoc            | 558 +++++++++++++--
 .../src/main/docs/zendesk-component.adoc           | 134 ++++
 .../modules/ROOT/pages/as2-component.adoc          |  43 ++
 .../modules/ROOT/pages/box-component.adoc          | 165 +++++
 .../modules/ROOT/pages/braintree-component.adoc    | 774 ++++-----------------
 .../modules/ROOT/pages/fhir-component.adoc         | 167 +++++
 .../ROOT/pages/google-calendar-component.adoc      |  74 ++
 .../pages/google-calendar-stream-component.adoc    |  74 ++
 .../modules/ROOT/pages/google-drive-component.adoc | 119 ++++
 .../modules/ROOT/pages/google-mail-component.adoc  |  78 +++
 .../ROOT/pages/google-mail-stream-component.adoc   |  78 +++
 .../ROOT/pages/google-sheets-component.adoc        |  38 +
 .../ROOT/pages/google-sheets-stream-component.adoc |  38 +
 .../modules/ROOT/pages/olingo2-component.adoc      |  26 +
 .../modules/ROOT/pages/olingo4-component.adoc      |  26 +
 .../modules/ROOT/pages/twilio-component.adoc       | 558 +++++++++++++--
 .../modules/ROOT/pages/zendesk-component.adoc      | 134 ++++
 .../apache/camel/tooling/model/ComponentModel.java |   4 +-
 .../src/main/resources/endpoint-options.mvel       |  22 +
 58 files changed, 5185 insertions(+), 2223 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/as2-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/as2-component.adoc
index 59b8b81..8b30b52 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/as2-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/as2-component.adoc
@@ -140,6 +140,49 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The AS2 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+as2:apiName/methodName
+----
+
+
+==== apiName: client
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *as2From* (common) | AS2 name of sender |  | String
+| *as2MessageStructure* (common) | The structure of AS2 to send; see |  | AS2MessageStructure
+| *as2To* (common) | AS2 name of recipient |  | String
+| *compressionAlgorithm* (common) | The algorithm used to compress the message or |  | AS2CompressionAlgorithm
+| *dispositionNotificationTo* (common) | An RFC2822 address to request a receipt or |  | String
+| *ediMessage* (common) | EDI message to transport |  | String
+| *ediMessageContentType* (common) | The content typw of EDI message |  | ContentType
+| *ediMessageTransferEncoding* (common) | The transfer encoding used to transport EDI message |  | String
+| *encryptingAlgorithm* (common) | The algorithm used to encrypt the message or |  | AS2EncryptionAlgorithm
+| *encryptingCertificateChain* (common) | The chain of certificates used to encrypt the message or |  | Certificate[]
+| *from* (common) | RFC2822 address of sender |  | String
+| *requestUri* (common) | Resource location to deliver message |  | String
+| *signedReceiptMicAlgorithms* (common) | The senders list of signing algorithms for signing receipt, in preferred order, or |  | String[]
+| *signingAlgorithm* (common) | The algorithm used to sign the message or |  | AS2SignatureAlgorithm
+| *signingCertificateChain* (common) | The chain of certificates used to sign the message or |  | Certificate[]
+| *signingPrivateKey* (common) | The private key used to sign EDI message |  | PrivateKey
+| *subject* (common) | Message subject |  | String
+|===
+
+==== apiName: server
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *requestUriPattern* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/box-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/box-component.adoc
index 975d196..33de38f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/box-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/box-component.adoc
@@ -150,6 +150,171 @@ with the following path and query parameters:
 | *userName* (security) | Box user name, MUST be provided |  | String
 | *userPassword* (security) | Box user password, MUST be provided if authSecureStorage is not set, or returns null on first call |  | String
 |===
+
+
+
+
+=== Query API Parameters (10 APIs):
+
+The Box endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+box:apiName/methodName
+----
+
+
+==== apiName: collaborations
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *collaborationId* (common) | The id of comment to change |  | String
+| *collaborator* (common) | The collaborator to add |  | BoxCollaborator
+| *email* (common) | The email address of the collaborator to add |  | String
+| *folderId* (common) | The id of folder to add collaboration to |  | String
+| *info* (common) |  |  | Info
+| *role* (common) | The role of the collaborator |  | Role
+|===
+
+==== apiName: comments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) | The id of comment to change |  | String
+| *fileId* (common) | The id of file to rename |  | String
+| *message* (common) | The comment's message |  | String
+|===
+
+==== apiName: event-logs
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *after* (common) | The lower bound on the timestamp of the events returned |  | Date
+| *before* (common) | The upper bound on the timestamp of the events returned |  | Date
+| *position* (common) | The starting position of the event stream. May be |  | String
+| *types* (common) | An optional list of event types to filter by |  | Type[]
+|===
+
+==== apiName: events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *startingPosition* (common) | The starting position of the event stream |  | Long
+|===
+
+==== apiName: files
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *access* (common) | The access level of the shared link |  | Access
+| *check* (common) | If the file name is already used, call the uploadNewVersion instead. |  | Boolean
+| *content* (common) | A stream containing contents of the file to upload |  | InputStream
+| *created* (common) | The content created date that will be given to the uploaded file |  | Date
+| *destinationFolderId* (common) | The id of the destination folder |  | String
+| *fields* (common) | The information fields to retrieve; if |  | String[]
+| *fileContent* (common) | A stream containing contents of the file to upload |  | InputStream
+| *fileId* (common) | The id of file to copy |  | String
+| *fileName* (common) | The name to give the uploaded file |  | String
+| *fileSize* (common) | The size of the file's content used for monitoring the upload's progress |  | Long
+| *fileType* (common) | Either PNG of JPG |  | ThumbnailFileType
+| *info* (common) | The updated information |  | Info
+| *listener* (common) | A listener for monitoring the download's progress; if |  | ProgressListener
+| *maxHeight* (common) | Maximum height |  | Integer
+| *maxWidth* (common) | Maximum width |  | Integer
+| *metadata* (common) | The new metadata values |  | Metadata
+| *minHeight* (common) | Minimum height |  | Integer
+| *minWidth* (common) | Minimum width |  | Integer
+| *modified* (common) | The content modified date that will be given to the uploaded file |  | Date
+| *newFileName* (common) | The new name of file |  | String
+| *newName* (common) | Is |  | String
+| *output* (common) | The stream to which the file contents will be written |  | OutputStream
+| *parentFolderId* (common) | The id of parent folder |  | String
+| *permissions* (common) | Is |  | Permissions
+| *rangeEnd* (common) | The byte offset in file at which to stop the download; if |  | Long
+| *rangeStart* (common) | The byte offset in file at which to start the download; if |  | Long
+| *size* (common) | The size of the file's content used for monitoring the upload's progress.Skip navigation links |  | Long
+| *typeName* (common) | The metadata template type name; if |  | String
+| *unshareDate* (common) | The date and time at which time the created shared link will expire; if |  | Date
+| *version* (common) | The version of file to delete; initial version of file has value of |  | Integer
+|===
+
+==== apiName: folders
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *access* (common) | The access level of the shared link |  | Access
+| *destinationFolderId* (common) | The id of the destination folder |  | String
+| *fields* (common) | The information fields to retrieve; if |  | String[]
+| *folderId* (common) | The id of folder to copy |  | String
+| *folderName* (common) | The name of created folder |  | String
+| *info* (common) | The updated information |  | Info
+| *limit* (common) | The maximum number of children to retrieve after the offset; if |  | Long
+| *newFolderName* (common) | The new name of folder |  | String
+| *newName* (common) | Is |  | String
+| *offset* (common) | The index of first child item to retrieve; if |  | Long
+| *parentFolderId* (common) | The id of parent folder |  | String
+| *path* (common) | Sequence of Box folder names from parent folder to returned folder |  | String[]
+| *permissions* (common) | Is |  | Permissions
+| *unshareDate* (common) | The date and time at which time the created shared link will expire; if |  | Date
+|===
+
+==== apiName: groups
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *description* (common) | The description of the new group |  | String
+| *externalSyncIdentifier* (common) | The external_sync_identifier of the new group |  | String
+| *groupId* (common) | The id of group |  | String
+| *groupInfo* (common) | The updated information |  | Info
+| *groupMembershipId* (common) | The id of group membership to delete |  | String
+| *info* (common) | The updated information |  | Info
+| *invitabilityLevel* (common) | The invitibility_level of the new group |  | String
+| *memberViewabilityLevel* (common) | The member_viewability_level of the new group |  | String
+| *name* (common) | The name of the new group |  | String
+| *provenance* (common) | The provenance of the new group |  | String
+| *role* (common) | The role of the user in this group. Can be |  | Role
+| *userId* (common) | The id of user to be added to group |  | String
+|===
+
+==== apiName: search
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *folderId* (common) | The id of folder searched |  | String
+| *query* (common) | The search query |  | String
+|===
+
+==== apiName: tasks
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *action* (common) | The action the task assignee will be prompted to do |  | Action
+| *assignTo* (common) | The user to assign to task |  | BoxUser
+| *dueAt* (common) | The day at which this task is due |  | Date
+| *fileId* (common) | The id of file to add task to |  | String
+| *info* (common) | The updated information |  | Info
+| *message* (common) | An optional message to include with the task |  | String
+| *taskAssignmentId* (common) | The id of task assignment to delete.Skip navigation links |  | String
+| *taskId* (common) | The id of task to add assignment for |  | String
+|===
+
+==== apiName: users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *email* (common) | The email address to add as an alias |  | String
+| *emailAliasId* (common) | The id of the email alias to delete |  | String
+| *fields* (common) | The fields to retrieve. Leave this out for the standard fields. |  | String[]
+| *filterTerm* (common) | The filter term to lookup users by (login for external, login or name for managed); if |  | String
+| *force* (common) | Whether or not this user should be deleted even if they still own files |  | Boolean
+| *info* (common) | The updated information |  | Info
+| *login* (common) | The email address the user will use to login |  | String
+| *name* (common) | The name of the user |  | String
+| *notifyUser* (common) | Whether or not to send an email notification to the user that their account has been deleted |  | Boolean
+| *params* (common) | Additional user information |  | CreateUserParams
+| *sourceUserId* (common) | The user id of the user whose files will be the source for this operation.Skip navigation links |  | String
+| *userId* (common) | The id of user |  | String
+|===
 // endpoint options: END
 
 == URI format
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/braintree-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/braintree-component.adoc
index 21532ec..4b7dc1e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/braintree-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/braintree-component.adoc
@@ -123,70 +123,154 @@ with the following path and query parameters:
 | *privateKey* (security) | The private key provided by Braintree. |  | String
 | *publicKey* (security) | The public key provided by Braintree. |  | String
 |===
-// endpoint options: END
 
 
 
-== URI format
 
- 
+=== Query API Parameters (14 APIs):
 
-[source,java]
----------------------------------------------
-braintree://endpoint-prefix/endpoint?[options]
----------------------------------------------
+The Braintree endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
 
- 
+----
+braintree:apiName/methodName
+----
 
-Endpoint prefix can be one of:
-
-* addOn
-* address
-* clientToken
-* creditCardverification
-* customer
-* discount
-* dispute
-* documentUpload
-* merchantAccount
-* paymentmethod
-* paymentmethodNonce
-* plan
-* report
-* settlementBatchSummary
-* subscription
-* transaction
-* webhookNotification
 
- 
+==== apiName: address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *customerId* (common) | The id of the |  | String
+| *id* (common) | The id of the |  | String
+| *request* (common) | The request object |  | AddressRequest
+|===
 
-== BraintreeComponent
+==== apiName: clientToken
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) |  |  | ClientTokenRequest
+|===
 
-The Braintree Component can be configured with the options below. These
-options can be provided using the component's bean
-property *configuration* of
-type *org.apache.camel.component.braintree.BraintreeConfiguration*.
+==== apiName: creditCardVerification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (common) |  |  | String
+| *query* (common) |  |  | CreditCardVerificationSearchRequest
+| *request* (common) |  |  | CreditCardVerificationRequest
+|===
 
-[cols="<,<,<",options="header",]
-|=======================================================================
-|Option |Type |Description
-|environment |String |Value that specifies where requests should be
-directed – sandbox or production
+==== apiName: customer
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *associationFilterId* (common) | The id of the association filter to use |  | String
+| *id* (common) | The id of the |  | String
+| *query* (common) | The request query to use for search |  | CustomerSearchRequest
+| *request* (common) | The request |  | CustomerRequest
+|===
 
-|merchantId |String |A unique identifier for your gateway account, which
-is different than your merchant account ID
+==== apiName: dispute
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) | The content of the text evidence for the dispute |  | String
+| *disputeId* (common) | The dispute id to add text evidence to |  | String
+| *documentId* (common) | The document id of a previously uploaded document |  | String
+| *evidenceId* (common) | The evidence id to remove |  | String
+| *fileEvidenceRequest* (common) | The file evidence request for the dispute |  | FileEvidenceRequest
+| *id* (common) | The dispute id to accept |  | String
+| *query* (common) | The query for what disputes to find |  | DisputeSearchRequest
+| *textEvidenceRequest* (common) | The text evidence request for the dispute |  | TextEvidenceRequest
+|===
 
-|publicKey |String |User-specific public identifier
+==== apiName: documentUpload
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) |  |  | DocumentUploadRequest
+|===
 
-|privateKey |String |User-specific secure identifier that should not be
-shared – even with us!
+==== apiName: merchantAccount
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *currencyRequest* (common) |  |  | MerchantAccountCreateForCurrencyRequest
+| *id* (common) |  |  | String
+| *page* (common) |  |  | Integer
+| *request* (common) |  |  | MerchantAccountRequest
+|===
+
+==== apiName: paymentMethod
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *deleteRequest* (common) |  |  | PaymentMethodDeleteRequest
+| *grantRequest* (common) |  |  | PaymentMethodGrantRequest
+| *request* (common) |  |  | PaymentMethodRequest
+| *token* (common) |  |  | String
+|===
+
+==== apiName: paymentMethodNonce
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *paymentMethodNonce* (common) |  |  | String
+| *paymentMethodToken* (common) |  |  | String
+| *request* (common) |  |  | PaymentMethodNonceRequest
+|===
+
+==== apiName: report
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) | The request |  | TransactionLevelFeeReportRequest
+|===
 
-|accessToken |String |Token granted to a merchant using Braintree Auth
-allowing them to process transactions on another's behalf. Used in place
-of the environment, merchantId, publicKey and privateKey options.
-|=======================================================================
+==== apiName: settlementBatchSummary
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *groupByCustomField* (common) |  |  | String
+| *settlementDate* (common) |  |  | Calendar
+|===
+
+==== apiName: subscription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *amount* (common) |  |  | BigDecimal
+| *customerId* (common) |  |  | String
+| *id* (common) | Of the |  | String
+| *request* (common) | The request |  | SubscriptionRequest
+| *searchRequest* (common) | The |  | SubscriptionSearchRequest
+| *submitForSettlement* (common) |  |  | Boolean
+| *subscriptionId* (common) |  |  | String
+|===
+
+==== apiName: transaction
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *amount* (common) |  |  | BigDecimal
+| *cloneRequest* (common) |  |  | TransactionCloneRequest
+| *id* (common) | Of the transaction to cancel release from escrow of |  | String
+| *query* (common) | The search query |  | TransactionSearchRequest
+| *refundRequest* (common) |  |  | TransactionRefundRequest
+| *request* (common) | The request |  | TransactionRequest
+|===
 
-All the options above are provided by Braintree Payments
+==== apiName: webhookNotification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *challenge* (common) |  |  | String
+| *payload* (common) |  |  | String
+| *signature* (common) |  |  | String
+|===
+// endpoint options: END
 
 == Producer Endpoints:
 
@@ -210,600 +294,6 @@ For more information on the endpoints and options see Braintree
 references
 at https://developers.braintreepayments.com/reference/overview[https://developers.braintreepayments.com/reference/overview]
 
- 
-
-=== Endpoint prefix _addOn_
-
-The following endpoints can be invoked with the prefix *addOn* as
-follows:
-
- 
-
-[source,java]
---------------------------
-braintree://addOn/endpoint
---------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Addon>
-|====================================================
-
-=== Endpoint prefix _address_
-
-The following endpoints can be invoked with the prefix *address* as
-follows:
-
- 
-
-[source,java]
---------------------------------------
-braintree://address/endpoint?[options]
---------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |customerId, request
-|com.braintreegateway.Result<com.braintreegateway.Address>
-
-|delete |  |customerId, id
-|com.braintreegateway.Result<com.braintreegateway.Address> 
-
-|find |  |customerId, id |com.braintreegateway.Address
-
-|update |  |customerId, id, request
-|com.braintreegateway.Result<com.braintreegateway.Address> 
-|=======================================================================
-
-[[Braintree-URIOptionsforaddress]]
-URI Options for _address_
-
-[cols="<,<",options="header",]
-|============================================
-|Name |Type
-|customerId |String
-|request |com.braintreegateway.AddressRequest
-|id |String
-|============================================
-
-=== Endpoint prefix _clientToken_
-
-The following endpoints can be invoked with the prefix *clientToken* as
-follows:
-
- 
-
-[source,java]
-------------------------------------------
-braintree://clientToken/endpoint?[options]
-------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|generate |  | request |String
-|====================================================
-
-[[Braintree-URIOptionsforclientToken]]
-URI Options for _clientToken_
-
-[cols="<,<",options="header",]
-|================================================
-|Name |Type
-|request |com.braintreegateway.ClientTokenrequest
-|================================================
-
-=== Endpoint prefix _creditCardVerification_
-
-The following endpoints can be invoked with the
-prefix *creditCardverification* as follows:
-
- 
-
-[source,java]
------------------------------------------------------
-braintree://creditCardVerification/endpoint?[options]
------------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|find |  | id |com.braintreegateway.CreditCardVerification
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.CreditCardVerification>
-|=======================================================================
-
-[[Braintree-URIOptionsforcreditCardVerification]]
-URI Options for _creditCardVerification_
-
-[cols="<,<",options="header",]
-|===============================================================
-|Name |Type
-|id |String
-|query |com.braintreegateway.CreditCardVerificationSearchRequest
-|===============================================================
-
-=== Endpoint prefix _customer_
-
-The following endpoints can be invoked with the prefix *customer* as
-follows:
-
- 
-
-[source,java]
----------------------------------------
-braintree://customer/endpoint?[options]
----------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  | 
-
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-
-|delete |  |id
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-
-|find |  |id |com.braintreegateway.Customer
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Customer>
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-|=======================================================================
-
-[[Braintree-URIOptionsforcustomer]]
-URI Options for _customer_
-
-[cols="<,<",options="header",]
-|=================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.CustomerRequest
-|query |com.braintreegateway.CustomerSearchRequest
-|=================================================
-
-=== Endpoint prefix _discount_
-
-The following endpoints can be invoked with the prefix *discount* as
-follows:
-
- 
-
-[source,java]
------------------------------
-braintree://discount/endpoint
------------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Discount>
-|====================================================
-
- +
-
- +
-
-=== Endpoint prefix _dispute_
-
-The following endpoints can be invoked with the prefix *dispute* as
-follows:
-
-[source,java]
-----------------------------------------------
-braintree://dispute/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|accept |  |id
-|com.braintreegateway.Result
-
-|addFileEvidence |  |disputeId, documentId
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addFileEvidence |  |disputeId, fileEvidenceRequest
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addTextEvidence |  |disputeId, content
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addTextEvidence |  |disputeId, textEvidenceRequest
-|com.braintreegateway.Result<DisputeEvidence>
-
-|finalize |  |id
-|com.braintreegateway.Result
-
-|find |  |id
-|com.braintreegateway.Dispute
-
-|removeEvidence |  |id
-|com.braintreegateway.Result
-
-|search |  | disputeSearchRequest
-|com.braintreegateway.PaginatedCollection<com.braintreegateway.Dispute>
-|=======================================================================
-
-[[Braintree-URIOptionsfordispute]]
-URI Options for _dispute_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|id |String
-|disputeId |String
-|documentId |String
-|fileEvidenceRequest |com.braintreegateway.FileEvidenceRequest
-|content |String |
-|textEvidenceRequest |com.braintreegateway.TextEvidenceRequest
-|disputeSearchRequest |com.braintreegateway.DisputeSearchRequest
-|==========================================================
-
-
-=== Endpoint prefix _documentUpload_
-
-The following endpoints can be invoked with the prefix *documentUpload* as
-follows:
-
-[source,java]
-----------------------------------------------
-braintree://documentUpload/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.DocumentUpload>
-|=======================================================================
-
-[[Braintree-URIOptionsfordocumentUpload]]
-URI Options for _documentUpload_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|request |com.braintreegateway.DocumentUploadRequest
-|==========================================================
-
-
-=== Endpoint prefix _merchantAccount_
-
-The following endpoints can be invoked with the
-prefix *merchantAccount* as follows:
-
- 
-
-[source,java]
-----------------------------------------------
-braintree://merchantAccount/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-
-|createForCurrency |  |currencyRequest
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-
-|find |  |id |com.braintreegateway.MerchantAccount
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-|=======================================================================
-
-[[Braintree-URIOptionsformerchantAccount]]
-URI Options for _merchantAccount_
-
-[cols="<,<",options="header",]
-|====================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.MerchantAccountRequest
-|currencyRequest |com.braintreegateway.MerchantAccountCreateForCurrencyRequest
-|====================================================
-
-=== Endpoint prefix _paymentMethod_
-
-The following endpoints can be invoked with the
-prefix *paymentMethod* as follows:
-
- 
-
-[source,java]
---------------------------------------------
-braintree://paymentMethod/endpoint?[options]
---------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-
-|delete |  |token, deleteRequest
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-
-|find |  |token |com.braintreegateway.PaymentMethod
-
-|update |  |token, request
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-|=======================================================================
-
-[[Braintree-URIOptionsforpaymentMethod]]
-URI Options for _paymentMethod_
-
-[cols="<,<",options="header",]
-|==================================================
-|Name |Type
-|token |String
-|request |com.braintreegateway.PaymentMethodRequest
-|deleteRequest |com.braintreegateway.PaymentMethodDeleteRequest
-|==================================================
-
-=== Endpoint prefix _paymentMethodNonce_
-
-The following endpoints can be invoked with the
-prefix *paymentMethodNonce* as follows:
-
- 
-
-[source,java]
--------------------------------------------------
-braintree://paymentMethodNonce/endpoint?[options]
--------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |paymentMethodToken
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce>
-
-|find |  |paymentMethodNonce |com.braintreegateway.PaymentMethodNonce
-|=======================================================================
-
-[[Braintree-URIOptionsforpaymentMethodNonce]]
-URI Options for _paymentMethodNonce_
-
-[cols="<,<",options="header",]
-|==========================
-|Name |Type
-|paymentMethodToken |String
-|paymentMethodNonce |String
-|==========================
-
-=== Endpoint prefix _plan_
-
-The following endpoints can be invoked with the prefix *plan* as
-follows:
-
- 
-
-[source,java]
--------------------------
-braintree://plan/endpoint
--------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Plan>
-|====================================================
-
-
-=== Endpoint prefix _report_
-
-The following endpoints can be invoked with the prefix *report* as
-follows:
-
-[source,java]
----------------------------------
-braintree://plan/report?[options]
----------------------------------
-
-[cols="<,<,<,<",options="header",]
-|==============================================================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|transactionLevelFees |  | request |com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport>
-|==============================================================================================================
-
-[[Braintree-URIOptionsfortreport]]
-URI Options for _report_
-
-[cols="<,<",options="header",]
-|==============================================================
-|Name |Type
-|request |com.braintreegateway.TransactionLevelFeeReportRequest
-|==============================================================
-
-
-=== Endpoint prefix _settlementBatchSummary_
-
-The following endpoints can be invoked with the
-prefix *settlementBatchSummary* as follows:
-
- 
-
-[source,java]
------------------------------------------------------
-braintree://settlementBatchSummary/endpoint?[options]
------------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|generate |  | request
-|com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary>
-|=======================================================================
-
-[[Braintree-URIOptionsforsettlementBatchSummary]]
-URI Options for _settlementBatchSummary_
-
-[cols="<,<",options="header",]
-|==========================
-|Name |Type
-|settlementDate |Calendar
-|groupByCustomField |String
-|==========================
-
-=== Endpoint prefix _subscription_
-
-The following endpoints can be invoked with the prefix *subscription* as
-follows:
-
- 
-
-[source,java]
--------------------------------------------
-braintree://subscription/endpoint?[options]
--------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|cancel |  | id
-| com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|delete |  |customerId, id
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|find |  |id |com.braintreegateway.Subscription
-
-|retryCharge |  |subscriptionId, amount
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|search |  |searchRequest
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Subscription>
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-|=======================================================================
-
-[[Braintree-URIOptionsforsubscription]]
-URI Options for _subscription_
-
-[cols="<,<",options="header",]
-|==============================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.SubscriptionRequest
-|customerId |String
-|subscriptionId |String
-|amount |BigDecimal
-|searchRequest |com.braintreegateway.SubscriptionSearchRequest.
-|==============================================================
-
- 
-
-=== Endpoint prefix _transaction_
-
-The following endpoints can be invoked with the prefix *transaction* as
-follows:
-
- 
-
-[source,java]
-------------------------------------------
-braintree://transaction/endpoint?[options]
-------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|cancelRelease |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|cloneTransaction |  |id, cloneRequest
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|credit |  |request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|find |  |id |com.braintreegateway.Transaction
-
-|holdInEscrow |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|releaseFromEscrow |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|refund |  |id, amount, refundRequest
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|sale |  |request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Transaction>
-
-|submitForPartialSettlement |  |id, amount
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|submitForSettlement |  |id, amount, request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|voidTransaction |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-|=======================================================================
-
-[[Braintree-URIOptionsfortransaction]]
-URI Options for _transaction_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.TransactionCloneRequest
-|cloneRequest |com.braintreegateway.TransactionCloneRequest
-|refundRequest |com.braintreegateway.TransactionRefundRequest
-|amount |BigDecimal
-|query |com.braintreegateway.TransactionSearchRequest
-|==========================================================
-
-=== Endpoint prefix _webhookNotification_
-
-The following endpoints can be invoked with the
-prefix *webhookNotification* as follows:
-
- 
-
-[source,java]
---------------------------------------------------
-braintree://webhookNotification/endpoint?[options]
---------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|parse |  | signature, payload |com.braintreegateway.WebhookNotification
-|verify |  |challenge |String
-|=======================================================================
-
-[[Braintree-URIOptionsforwebhookNotification]]
-URI Options for _webhookNotification_
-
-[cols="<,<",options="header",]
-|=================
-|Name |Type
-|signature |String
-|payload |String
-|challenge |String
-|=================
-
- 
 
 == Consumer Endpoints
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/fhir-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/fhir-component.adoc
index 85617ac..f6182c5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/fhir-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/fhir-component.adoc
@@ -166,6 +166,173 @@ with the following path and query parameters:
 | *password* (security) | Username to use for basic authentication |  | String
 | *username* (security) | Username to use for basic authentication |  | String
 |===
+
+
+
+
+=== Query API Parameters (13 APIs):
+
+The FHIR endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+fhir:apiName/methodName
+----
+
+
+==== apiName: capabilities
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *type* (common) |  |  | Class
+|===
+
+==== apiName: create
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *preferReturn* (common) | Add a |  | PreferReturnEnum
+| *resource* (common) | The resource to create |  | IBaseResource
+| *resourceAsString* (common) | The resource to create |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: delete
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *id* (common) | The |  | IIdType
+| *resource* (common) | The |  | IBaseResource
+| *stringId* (common) | It's id |  | String
+| *type* (common) | The resource type e.g Patient |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *count* (common) |  |  | Integer
+| *cutoff* (common) |  |  | Date
+| *extraParameters* (common) |  |  | Map
+| *iCutoff* (common) |  |  | IPrimitiveType
+| *id* (common) |  |  | IIdType
+| *resourceType* (common) |  |  | Class
+| *returnType* (common) |  |  | Class
+|===
+
+==== apiName: load-page
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *bundle* (common) |  |  | IBaseBundle
+| *extraParameters* (common) |  |  | Map
+| *returnType* (common) |  |  | Class
+| *url* (common) |  |  | String
+|===
+
+==== apiName: meta
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *meta* (common) |  |  | IBaseMetaType
+| *metaType* (common) |  |  | Class
+| *theResourceName* (common) |  |  | String
+|===
+
+==== apiName: operation
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *asynchronous* (common) |  |  | Boolean
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *msgBundle* (common) |  |  | IBaseBundle
+| *name* (common) |  |  | String
+| *outputParameterType* (common) |  |  | Class
+| *parameters* (common) |  |  | IBaseParameters
+| *resourceType* (common) |  |  | Class
+| *respondToUri* (common) |  |  | String
+| *responseClass* (common) |  |  | Class
+| *returnType* (common) |  |  | Class
+| *useHttpGet* (common) |  |  | Boolean
+|===
+
+==== apiName: patch
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *id* (common) | The resource ID to patch |  | IIdType
+| *patchBody* (common) | The body of the patch document serialized in either XML or JSON which conforms to \http://jsonpatch.com/ or \http://tools.ietf.org/html/rfc5261 |  | String
+| *preferReturn* (common) | Add a |  | PreferReturnEnum
+| *stringId* (common) | The resource ID to patch |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: read
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *iUrl* (common) |  |  | IIdType
+| *id* (common) |  |  | IIdType
+| *ifVersionMatches* (common) |  |  | String
+| *longId* (common) |  |  | Long
+| *resource* (common) |  |  | Class
+| *resourceClass* (common) |  |  | String
+| *returnNull* (common) |  |  | Boolean
+| *returnResource* (common) |  |  | IBaseResource
+| *stringId* (common) |  |  | String
+| *throwError* (common) |  |  | Boolean
+| *url* (common) |  |  | String
+| *version* (common) |  |  | String
+|===
+
+==== apiName: search
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *url* (common) | The URL to search for. Note that this URL may be complete (e.g. \http://example.com/base/Patientname=foo) in which case the client's base URL will be ignored. Or it can be relative (e.g. Patientname=foo) in which case the client's base URL will be used. |  | String
+|===
+
+==== apiName: transaction
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *bundle* (common) | Bundle to use in the transaction |  | IBaseBundle
+| *extraParameters* (common) | See |  | Map
+| *resources* (common) | Resources to use in the transaction |  | List
+| *stringBundle* (common) | Bundle to use in the transaction |  | String
+|===
+
+==== apiName: update
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *preferReturn* (common) |  |  | PreferReturnEnum
+| *resource* (common) |  |  | IBaseResource
+| *resourceAsString* (common) |  |  | String
+| *stringId* (common) |  |  | String
+| *url* (common) |  |  | String
+|===
+
+==== apiName: validate
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *resource* (common) |  |  | IBaseResource
+| *resourceAsString* (common) |  |  | String
+|===
 // endpoint options: END
 
 include::camel-spring-boot::page$fhir-starter.adoc[]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-component.adoc
index 2125691..cc091df 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-component.adoc
@@ -137,6 +137,80 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the calendar application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Calendar endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-calendar:apiName/methodName
+----
+
+
+==== apiName: acl
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | AclRule
+| *contentChannel* (common) |  |  | Channel
+| *ruleId* (common) |  |  | String
+|===
+
+==== apiName: calendars
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | Calendar
+|===
+
+==== apiName: channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | Event
+| *contentChannel* (common) |  |  | Channel
+| *destination* (common) |  |  | String
+| *eventId* (common) |  |  | String
+| *text* (common) |  |  | String
+|===
+
+==== apiName: freebusy
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | FreeBusyRequest
+|===
+
+==== apiName: list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | CalendarListEntry
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: settings
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+| *setting* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
index 567d923..3e874f0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
@@ -140,6 +140,80 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Calendar Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-calendar-stream:index
+----
+
+
+==== : acl
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | AclRule
+| *contentChannel* (consumer) |  |  | Channel
+| *ruleId* (consumer) |  |  | String
+|===
+
+==== : calendars
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | Calendar
+|===
+
+==== : channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (consumer) |  |  | Channel
+|===
+
+==== : events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | Event
+| *contentChannel* (consumer) |  |  | Channel
+| *destination* (consumer) |  |  | String
+| *eventId* (consumer) |  |  | String
+| *text* (consumer) |  |  | String
+|===
+
+==== : freebusy
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | FreeBusyRequest
+|===
+
+==== : list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | CalendarListEntry
+| *contentChannel* (consumer) |  |  | Channel
+|===
+
+==== : settings
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (consumer) |  |  | Channel
+| *setting* (consumer) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-drive-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-drive-component.adoc
index afae927..5933f7c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-drive-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-drive-component.adoc
@@ -159,6 +159,125 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the drive application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (12 APIs):
+
+The Google Drive endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-drive:apiName/methodName
+----
+
+
+==== apiName: drive-apps
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *appId* (common) |  |  | String
+|===
+
+==== apiName: drive-changes
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *changeId* (common) |  |  | String
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: drive-channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: drive-children
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *childId* (common) |  |  | String
+| *content* (common) |  |  | ChildReference
+| *folderId* (common) |  |  | String
+|===
+
+==== apiName: drive-comments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) |  |  | String
+| *content* (common) |  |  | Comment
+| *fileId* (common) |  |  | String
+|===
+
+==== apiName: drive-files
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | File
+| *contentChannel* (common) |  |  | Channel
+| *fileId* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *mimeType* (common) |  |  | String
+|===
+
+==== apiName: drive-parents
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | ParentReference
+| *fileId* (common) |  |  | String
+| *parentId* (common) |  |  | String
+|===
+
+==== apiName: drive-permissions
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Permission
+| *email* (common) |  |  | String
+| *fileId* (common) |  |  | String
+| *permissionId* (common) |  |  | String
+|===
+
+==== apiName: drive-properties
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Property
+| *fileId* (common) |  |  | String
+| *propertyKey* (common) |  |  | String
+|===
+
+==== apiName: drive-realtime
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *fileId* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+|===
+
+==== apiName: drive-replies
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) |  |  | String
+| *content* (common) |  |  | CommentReply
+| *fileId* (common) |  |  | String
+| *replyId* (common) |  |  | String
+|===
+
+==== apiName: drive-revisions
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Revision
+| *fileId* (common) |  |  | String
+| *revisionId* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-component.adoc
index f0fde9a..a5505da 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-component.adoc
@@ -147,6 +147,84 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the mail application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Mail endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-mail:apiName/methodName
+----
+
+
+==== apiName: attachments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (common) |  |  | String
+| *messageId* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: drafts
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Draft
+| *id* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: labels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Label
+| *id* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: messages
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchDeleteMessagesRequest* (common) |  |  | BatchDeleteMessagesRequest
+| *batchModifyMessagesRequest* (common) |  |  | BatchModifyMessagesRequest
+| *content* (common) |  |  | Message
+| *id* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *modifyMessageRequest* (common) |  |  | ModifyMessageRequest
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: threads
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | ModifyThreadRequest
+| *id* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | WatchRequest
+| *userId* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-stream-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-stream-component.adoc
index f289b13..6ed04ea 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-stream-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-stream-component.adoc
@@ -134,6 +134,84 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Mail Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-mail-stream:index
+----
+
+
+==== : attachments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (consumer) |  |  | String
+| *messageId* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : drafts
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | Draft
+| *id* (consumer) |  |  | String
+| *mediaContent* (consumer) |  |  | AbstractInputStreamContent
+| *userId* (consumer) |  |  | String
+|===
+
+==== : history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *userId* (consumer) |  |  | String
+|===
+
+==== : labels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | Label
+| *id* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : messages
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchDeleteMessagesRequest* (consumer) |  |  | BatchDeleteMessagesRequest
+| *batchModifyMessagesRequest* (consumer) |  |  | BatchModifyMessagesRequest
+| *content* (consumer) |  |  | Message
+| *id* (consumer) |  |  | String
+| *mediaContent* (consumer) |  |  | AbstractInputStreamContent
+| *modifyMessageRequest* (consumer) |  |  | ModifyMessageRequest
+| *userId* (consumer) |  |  | String
+|===
+
+==== : threads
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | ModifyThreadRequest
+| *id* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | WatchRequest
+| *userId* (consumer) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-component.adoc
index bfc5608..ec4c1d5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-component.adoc
@@ -143,6 +143,44 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the sheets application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The Google Sheets endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-sheets:apiName/methodName
+----
+
+
+==== apiName: data
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchClearValuesRequest* (common) | The |  | BatchClearValuesRequest
+| *batchGetValuesByDataFilter Request* (common) | The |  | BatchGetValuesByDataFilterRequest
+| *batchUpdateValuesByDataFilter Request* (common) | The |  | BatchUpdateValuesByDataFilterRequest
+| *batchUpdateValuesRequest* (common) | The |  | BatchUpdateValuesRequest
+| *clearValuesRequest* (common) | The |  | ClearValuesRequest
+| *content* (common) | The |  | BatchClearValuesByDataFilterRequest
+| *range* (common) | The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table. |  | String
+| *spreadsheetId* (common) | The ID of the spreadsheet to update |  | String
+| *values* (common) | The |  | ValueRange
+|===
+
+==== apiName: spreadsheets
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchUpdateSpreadsheetRequest* (common) | The |  | BatchUpdateSpreadsheetRequest
+| *content* (common) | The |  | Spreadsheet
+| *getSpreadsheetByDataFilter Request* (common) | The |  | GetSpreadsheetByDataFilterRequest
+| *spreadsheetId* (common) | The spreadsheet to apply the updates to |  | String
+|===
 // endpoint options: END
 
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-stream-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-stream-component.adoc
index a018b9c..5cfb418 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-stream-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-stream-component.adoc
@@ -144,6 +144,44 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The Google Sheets Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-sheets-stream:apiName
+----
+
+
+==== : data
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchClearValuesRequest* (consumer) | The |  | BatchClearValuesRequest
+| *batchGetValuesByDataFilter Request* (consumer) | The |  | BatchGetValuesByDataFilterRequest
+| *batchUpdateValuesByDataFilter Request* (consumer) | The |  | BatchUpdateValuesByDataFilterRequest
+| *batchUpdateValuesRequest* (consumer) | The |  | BatchUpdateValuesRequest
+| *clearValuesRequest* (consumer) | The |  | ClearValuesRequest
+| *content* (consumer) | The |  | BatchClearValuesByDataFilterRequest
+| *range* (consumer) | The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table. |  | String
+| *spreadsheetId* (consumer) | The ID of the spreadsheet to update |  | String
+| *values* (consumer) | The |  | ValueRange
+|===
+
+==== : spreadsheets
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchUpdateSpreadsheetRequest* (consumer) | The |  | BatchUpdateSpreadsheetRequest
+| *content* (consumer) | The |  | Spreadsheet
+| *getSpreadsheetByDataFilter Request* (consumer) | The |  | GetSpreadsheetByDataFilterRequest
+| *spreadsheetId* (consumer) | The spreadsheet to apply the updates to |  | String
+|===
 // endpoint options: END
 
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/olingo2-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/olingo2-component.adoc
index d72a38f..7002e26 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/olingo2-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/olingo2-component.adoc
@@ -148,6 +148,32 @@ with the following path and query parameters:
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Olingo2 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+olingo2:apiName/methodName
+----
+
+
+==== apiName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *data* (common) |  |  | Object
+| *edm* (common) |  |  | Edm
+| *endpointHttpHeaders* (common) |  |  | Map
+| *keyPredicate* (common) |  |  | String
+| *queryParams* (common) |  |  | Map
+| *resourcePath* (common) |  |  | String
+| *responseHandler* (common) |  |  | Olingo2ResponseHandler
+|===
 // endpoint options: END
 
 == Producer Endpoints
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/olingo4-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/olingo4-component.adoc
index 55341db..4668e31 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/olingo4-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/olingo4-component.adoc
@@ -145,6 +145,32 @@ with the following path and query parameters:
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Olingo4 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+olingo4:apiName/methodName
+----
+
+
+==== apiName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *data* (common) |  |  | Object
+| *edm* (common) |  |  | Edm
+| *endpointHttpHeaders* (common) |  |  | Map
+| *keyPredicate* (common) |  |  | String
+| *queryParams* (common) |  |  | Map
+| *resourcePath* (common) |  |  | String
+| *responseHandler* (common) |  |  | Olingo4ResponseHandler
+|===
 // endpoint options: END
 
 == Producer Endpoints
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/twilio-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/twilio-component.adoc
index 0dc44c5..ad1aa64 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/twilio-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/twilio-component.adoc
@@ -98,76 +98,506 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
-// endpoint options: END
 
 
 
-== URI format
 
-[source,java]
--------------------------------------------------
-    twilio://endpoint-prefix/endpoint?[options]
--------------------------------------------------
+=== Query API Parameters (56 APIs):
+
+The Twilio endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+twilio:apiName/methodName
+----
+
 
-Endpoint prefix can be one of:
-
-* account
-* address
-* address-dependent-phone-number
-* application
-* available-phone-number-country
-* available-phone-number-country-local
-* available-phone-number-country-mobile
-* available-phone-number-country-toll-free
-* call
-* call-feedback
-* call-feedback-summary
-* call-notification
-* call-recording
-* conference
-* conference-participant
-* connect-app
-* incoming-phone-number
-* incoming-phone-number-local
-* incoming-phone-number-mobile
-* incoming-phone-number-toll-free
-* key
-* message
-* message-feedback
-* message-media
-* new-key
-* new-signing-key
-* notification
-* outgoing-caller-id
-* queue
-* queue-member
-* recording
-* recording-add-on-result
-* recording-add-on-result-payload
-* recording-transcription
-* short-code
-* signing-key
-* sip-credential-list
-* sip-credential-list-credential
-* sip-domain
-* sip-domain-credential-list-mapping
-* sip-domain-ip-access-control-list-mapping
-* sip-ip-access-control-list
-* sip-ip-access-control-list-ip-address
-* token
-* transcription
-* usage-record
-* usage-record-all-time
-* usage-record-daily
-* usage-record-last-month
-* usage-record-monthly
-* usage-record-this-month
-* usage-record-today
-* usage-record-yearly
-* usage-record-yesterday
-* usage-trigger
-* validation-request
+==== apiName: account
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathSid* (common) | Fetch by unique Account Sid |  | String
+|===
+
+==== apiName: address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *city* (common) | The city of the new address |  | String
+| *customerName* (common) | The name to associate with the new address |  | String
+| *isoCountry* (common) | The ISO country code of the new address |  | String
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Address resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *postalCode* (common) | The postal code of the new address |  | String
+| *region* (common) | The state or region of the new address |  | String
+| *street* (common) | The number and street address of the new address |  | String
+|===
 
+==== apiName: address-dependent-phone-number
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+| *pathAddressSid* (common) | The SID of the Address resource associated with the phone number |  | String
+|===
+
+==== apiName: application
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: available-phone-number-country
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the available phone number Country resource |  | String
+| *pathCountryCode* (common) | The ISO country code of the country to fetch available phone number information about |  | String
+|===
+
+==== apiName: available-phone-number-country-local
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: available-phone-number-country-mobile
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: available-phone-number-country-toll-free
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: call
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *applicationSid* (common) | The SID of the Application resource that will handle the call |  | String
+| *from* (common) | Twilio number from which to originate the call |  | Endpoint
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+| *to* (common) | Phone number, SIP address, or client identifier to call |  | Endpoint
+| *twiml* (common) | TwiML instructions for the call |  | Twiml
+| *url* (common) | The absolute URL that returns TwiML for this call |  | URI
+|===
+
+==== apiName: call-feedback
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathCallSid* (common) | The call sid that uniquely identifies the call |  | String
+| *qualityScore* (common) | The call quality expressed as an integer from 1 to 5 |  | Integer
+|===
+
+==== apiName: call-feedback-summary
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *endDate* (common) | Only include feedback given on or before this date |  | LocalDate
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathSid* (common) | A string that uniquely identifies this feedback summary resource |  | String
+| *startDate* (common) | Only include feedback given on or after this date |  | LocalDate
+|===
+
+==== apiName: call-notification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathCallSid* (common) | The Call SID of the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: call-recording
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathCallSid* (common) | The SID of the Call to associate the resource with |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *status* (common) | The new status of the recording |  | Status
+|===
+
+==== apiName: conference
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: conference-participant
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *from* (common) | The phone number, Client identifier, or username portion of SIP address that made this call. |  | PhoneNumber
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathCallSid* (common) | The Call SID or URL encoded label of the participant to delete |  | String
+| *pathConferenceSid* (common) | The SID of the participant's conference |  | String
+| *to* (common) | The phone number, SIP address or Client identifier that received this call. |  | PhoneNumber
+|===
+
+==== apiName: connect-app
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: incoming-phone-number
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *areaCode* (common) | The desired area code for the new phone number |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-local
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-mobile
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-toll-free
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: message
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *body* (common) | The text of the message you want to send. Can be up to 1,600 characters in length. |  | String
+| *from* (common) | The phone number that initiated the message |  | PhoneNumber
+| *mediaUrl* (common) | The URL of the media to send with the message |  | List
+| *messagingServiceSid* (common) | The SID of the Messaging Service you want to associate with the message |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *to* (common) | The destination phone number |  | PhoneNumber
+|===
+
+==== apiName: message-feedback
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathMessageSid* (common) | The SID of the Message resource for which the feedback was provided |  | String
+|===
+
+==== apiName: message-media
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to delete |  | String
+| *pathMessageSid* (common) | The SID of the Message resource that this Media resource belongs to |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: new-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Key resource |  | String
+|===
+
+==== apiName: new-signing-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Key resource |  | String
+|===
+
+==== apiName: notification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: outgoing-caller-id
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: queue
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A string to describe this resource |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: queue-member
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathCallSid* (common) | The Call SID of the resource(s) to fetch |  | String
+| *pathQueueSid* (common) | The SID of the Queue in which to find the members |  | String
+| *url* (common) | The absolute URL of the Queue resource |  | URI
+|===
+
+==== apiName: recording
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: recording-add-on-result
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathReferenceSid* (common) | The SID of the recording to which the result to delete belongs |  | String
+| *pathSid* (common) | The unique string that identifies the resource to delete |  | String
+|===
+
+==== apiName: recording-add-on-result-payload
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathAddOnResultSid* (common) | The SID of the AddOnResult to which the payloads to delete belongs |  | String
+| *pathReferenceSid* (common) | The SID of the recording to which the AddOnResult resource that contains the payloads to delete belongs |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: recording-transcription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathRecordingSid* (common) | The SID of the recording that created the transcription to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: short-code
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: signing-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The account_sid |  | String
+| *pathSid* (common) | The sid |  | String
+|===
+
+==== apiName: sip-credential-list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | Human readable descriptive text |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathSid* (common) | Delete by unique credential list Sid |  | String
+|===
+
+==== apiName: sip-credential-list-credential
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *password* (common) | The password will not be returned in the response |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathCredentialListSid* (common) | The unique id that identifies the credential list to include the created credential |  | String
+| *pathSid* (common) | The unique id that identifies the resource to delete |  | String
+| *username* (common) | The username for this credential |  | String
+|===
+
+==== apiName: sip-domain
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *domainName* (common) | The unique address on Twilio to route SIP traffic |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: sip-domain-credential-list-mapping
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *credentialListSid* (common) | A string that identifies the CredentialList resource to map to the SIP domain |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathDomainSid* (common) | A string that identifies the SIP Domain for which the CredentialList resource will be mapped |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: sip-domain-ip-access-control-list-mapping
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *ipAccessControlListSid* (common) | The unique id of the IP access control list to map to the SIP domain |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathDomainSid* (common) | A string that uniquely identifies the SIP Domain |  | String
+| *pathSid* (common) | A 34 character string that uniquely identifies the resource to delete. |  | String
+|===
+
+==== apiName: sip-ip-access-control-list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A human readable description of this resource |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: sip-ip-access-control-list-ip-address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A human readable descriptive text for this resource, up to 64 characters long. |  | String
+| *ipAddress* (common) | An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today. |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathIpAccessControlListSid* (common) | The IpAccessControlList Sid with which to associate the created IpAddress resource |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: token
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+|===
+
+==== apiName: transcription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: usage-record
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-all-time
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-daily
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-last-month
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-monthly
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-this-month
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-today
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-yearly
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-yesterday
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-trigger
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *callbackUrl* (common) | The URL we call when the trigger fires |  | URI
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *triggerValue* (common) | The usage value at which the trigger should fire |  | String
+| *usageCategory* (common) | The usage category the trigger watches |  | UsageCategory
+|===
+
+==== apiName: validation-request
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account responsible for the new Caller ID |  | String
+| *phoneNumber* (common) | The phone number to verify in E.164 format |  | PhoneNumber
+|===
+// endpoint options: END
 
 == Producer Endpoints:
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/zendesk-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/zendesk-component.adoc
index 2ab1b0d..dd8da2d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/zendesk-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/zendesk-component.adoc
@@ -104,6 +104,140 @@ with the following path and query parameters:
 | *token* (security) | The security token. |  | String
 | *username* (security) | The user name. |  | String
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Zendesk endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the methodName path parameter:
+
+----
+zendesk:methodName
+----
+
+
+==== methodName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *article* (common) |  |  | Article
+| *articleAttachments* (common) |  |  | ArticleAttachments
+| *articleId* (common) |  |  | Long
+| *articleId0* (common) |  |  | Long
+| *attachment* (common) |  |  | Attachment
+| *attachments* (common) |  |  | List
+| *audit* (common) |  |  | Audit
+| *auditId* (common) |  |  | Long
+| *automation* (common) |  |  | Automation
+| *automationId* (common) |  |  | Long
+| *automationId0* (common) |  |  | Long
+| *category* (common) |  |  | Category
+| *categoryId* (common) |  |  | Long
+| *category_id* (common) |  |  | Long
+| *comment* (common) |  |  | Comment
+| *commentId* (common) |  |  | Long
+| *content* (common) |  |  | byte[]
+| *contentType* (common) |  |  | String
+| *email* (common) |  |  | String
+| *endTime* (common) |  |  | Date
+| *externalId* (common) |  |  | String
+| *field* (common) |  |  | Field
+| *file* (common) |  |  | File
+| *fileName* (common) |  |  | String
+| *forum* (common) |  |  | Forum
+| *forum_id* (common) |  |  | Long
+| *group* (common) |  |  | Group
+| *groupMembership* (common) |  |  | GroupMembership
+| *group_id* (common) |  |  | Long
+| *group_membership_id* (common) |  |  | Long
+| *id* (common) |  |  | Long
+| *idArticle* (common) |  |  | String
+| *identity* (common) |  |  | Identity
+| *identityId* (common) |  |  | Long
+| *ids* (common) |  |  | long[]
+| *includeArchived* (common) |  |  | Boolean
+| *inline* (common) |  |  | Boolean
+| *installationId* (common) |  |  | Integer
+| *item* (common) |  |  | DynamicContentItem
+| *itemId* (common) |  |  | Long
+| *json* (common) |  |  | String
+| *labels* (common) |  |  | List
+| *locale* (common) |  |  | String
+| *macro* (common) |  |  | Macro
+| *macroId* (common) |  |  | Long
+| *macroId0* (common) |  |  | Long
+| *monitorId* (common) |  |  | Long
+| *name* (common) |  |  | String
+| *newPassword* (common) |  |  | String
+| *notifySubscribers* (common) |  |  | Boolean
+| *oldPassword* (common) |  |  | String
+| *order* (common) |  |  | SortOrder
+| *organization* (common) |  |  | Organization
+| *organizationId* (common) |  |  | Long
+| *organizationList* (common) |  |  | List
+| *organizationMembership* (common) |  |  | OrganizationMembership
+| *organizationMembershipList* (common) |  |  | List
+| *organizationMemberships* (common) |  |  | OrganizationMembership[]
+| *organization_id* (common) |  |  | Long
+| *organization_membership_id* (common) |  |  | Long
+| *organizations* (common) |  |  | Organization[]
+| *page* (common) |  |  | Integer
+| *parameters* (common) |  |  | String
+| *params* (common) |  |  | Map
+| *password* (common) |  |  | String
+| *permissionGroup* (common) |  |  | PermissionGroup
+| *query* (common) |  |  | String
+| *request* (common) |  |  | Request
+| *requestId* (common) |  |  | Long
+| *role* (common) |  |  | String
+| *roles* (common) |  |  | String[]
+| *satisfactionRating* (common) |  |  | SatisfactionRating
+| *schedule* (common) |  |  | Schedule
+| *scheduleId* (common) |  |  | Long
+| *searchTerm* (common) |  |  | String
+| *section* (common) |  |  | Section
+| *sectionId* (common) |  |  | Long
+| *sortBy* (common) |  |  | String
+| *sortOrder* (common) |  |  | SortOrder
+| *startTime* (common) |  |  | Date
+| *status* (common) |  |  | JobStatus
+| *statuses* (common) |  |  | List
+| *suspendedTicket* (common) |  |  | SuspendedTicket
+| *tags* (common) |  |  | String[]
+| *target* (common) |  |  | Target
+| *targetId* (common) |  |  | Long
+| *ticket* (common) |  |  | Ticket
+| *ticketForm* (common) |  |  | TicketForm
+| *ticketId* (common) |  |  | Long
+| *ticketId0* (common) |  |  | Long
+| *ticketImport* (common) |  |  | TicketImport
+| *ticketList* (common) |  |  | List
+| *tickets* (common) |  |  | Ticket[]
+| *token* (common) |  |  | String
+| *topic* (common) |  |  | Topic
+| *translation* (common) |  |  | Translation
+| *translationId* (common) |  |  | Long
+| *trigger* (common) |  |  | Trigger
+| *triggerId* (common) |  |  | Long
+| *triggerId0* (common) |  |  | Long
+| *tweetId* (common) |  |  | Long
+| *type* (common) |  |  | Class
+| *unixEpochTime* (common) |  |  | Long
+| *upload* (common) |  |  | Upload
+| *user* (common) |  |  | User
+| *userId* (common) |  |  | Long
+| *userId0* (common) |  |  | Long
+| *userIdThatWillBeMerged* (common) |  |  | Long
+| *userIdThatWillRemain* (common) |  |  | Long
+| *userList* (common) |  |  | List
+| *userSegment* (common) |  |  | UserSegment
+| *user_id* (common) |  |  | Long
+| *users* (common) |  |  | User[]
+| *usersList* (common) |  |  | List
+| *variant* (common) |  |  | DynamicContentItemVariant
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
index 59b8b81..8b30b52 100644
--- a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
+++ b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
@@ -140,6 +140,49 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The AS2 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+as2:apiName/methodName
+----
+
+
+==== apiName: client
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *as2From* (common) | AS2 name of sender |  | String
+| *as2MessageStructure* (common) | The structure of AS2 to send; see |  | AS2MessageStructure
+| *as2To* (common) | AS2 name of recipient |  | String
+| *compressionAlgorithm* (common) | The algorithm used to compress the message or |  | AS2CompressionAlgorithm
+| *dispositionNotificationTo* (common) | An RFC2822 address to request a receipt or |  | String
+| *ediMessage* (common) | EDI message to transport |  | String
+| *ediMessageContentType* (common) | The content typw of EDI message |  | ContentType
+| *ediMessageTransferEncoding* (common) | The transfer encoding used to transport EDI message |  | String
+| *encryptingAlgorithm* (common) | The algorithm used to encrypt the message or |  | AS2EncryptionAlgorithm
+| *encryptingCertificateChain* (common) | The chain of certificates used to encrypt the message or |  | Certificate[]
+| *from* (common) | RFC2822 address of sender |  | String
+| *requestUri* (common) | Resource location to deliver message |  | String
+| *signedReceiptMicAlgorithms* (common) | The senders list of signing algorithms for signing receipt, in preferred order, or |  | String[]
+| *signingAlgorithm* (common) | The algorithm used to sign the message or |  | AS2SignatureAlgorithm
+| *signingCertificateChain* (common) | The chain of certificates used to sign the message or |  | Certificate[]
+| *signingPrivateKey* (common) | The private key used to sign EDI message |  | PrivateKey
+| *subject* (common) | Message subject |  | String
+|===
+
+==== apiName: server
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *requestUriPattern* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json b/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
index e53c5f1..9c52d35 100644
--- a/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
+++ b/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
@@ -86,15 +86,15 @@
     "userPassword": { "kind": "parameter", "displayName": "User Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Box user password, MUST be provided if authSecureStorage is not set, or returns null on first call" }
   },
   "apiProperties": {
-    "files": { "access": { "kind": "parameter", "displayName": "Access", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxSharedLink.Access", "enum": [ "DEFAULT", "OPEN", "COMPANY", "COLLABORATORS" ], "deprecated": false, "secret": false, "description": "The access level of the shared link" }, "check": { "kind": "parameter", "displayName": "Check", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang. [...]
-    "search": { "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of folder searched" }, "query": { "kind": "parameter", "displayName": "Query", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The search query" } },
+    "collaborations": { "collaborationId": { "kind": "parameter", "displayName": "Collaboration Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of comment to change" }, "collaborator": { "kind": "parameter", "displayName": "Collaborator", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxCollaborator", "deprecated": false, " [...]
     "comments": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of comment to change" }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id o [...]
     "event-logs": { "after": { "kind": "parameter", "displayName": "After", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "description": "The lower bound on the timestamp of the events returned" }, "before": { "kind": "parameter", "displayName": "Before", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "descrip [...]
-    "collaborations": { "collaborationId": { "kind": "parameter", "displayName": "Collaboration Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of comment to change" }, "collaborator": { "kind": "parameter", "displayName": "Collaborator", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxCollaborator", "deprecated": false, " [...]
-    "tasks": { "action": { "kind": "parameter", "displayName": "Action", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxTask.Action", "enum": [ "REVIEW", "COMPLETE" ], "deprecated": false, "secret": false, "description": "The action the task assignee will be prompted to do" }, "assignTo": { "kind": "parameter", "displayName": "Assign To", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxUser [...]
     "events": { "startingPosition": { "kind": "parameter", "displayName": "Starting Position", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "The starting position of the event stream" } },
+    "files": { "access": { "kind": "parameter", "displayName": "Access", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxSharedLink.Access", "enum": [ "DEFAULT", "OPEN", "COMPANY", "COLLABORATORS" ], "deprecated": false, "secret": false, "description": "The access level of the shared link" }, "check": { "kind": "parameter", "displayName": "Check", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang. [...]
+    "folders": { "access": { "kind": "parameter", "displayName": "Access", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxSharedLink.Access", "enum": [ "DEFAULT", "OPEN", "COMPANY", "COLLABORATORS" ], "deprecated": false, "secret": false, "description": "The access level of the shared link" }, "destinationFolderId": { "kind": "parameter", "displayName": "Destination Folder Id", "group": "common", "label": "", "required": false, "type": "s [...]
     "groups": { "description": { "kind": "parameter", "displayName": "Description", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The description of the new group" }, "externalSyncIdentifier": { "kind": "parameter", "displayName": "External Sync Identifier", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "s [...]
-    "users": { "email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The email address to add as an alias" }, "emailAliasId": { "kind": "parameter", "displayName": "Email Alias Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": [...]
-    "folders": { "access": { "kind": "parameter", "displayName": "Access", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxSharedLink.Access", "enum": [ "DEFAULT", "OPEN", "COMPANY", "COLLABORATORS" ], "deprecated": false, "secret": false, "description": "The access level of the shared link" }, "destinationFolderId": { "kind": "parameter", "displayName": "Destination Folder Id", "group": "common", "label": "", "required": false, "type": "s [...]
+    "search": { "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of folder searched" }, "query": { "kind": "parameter", "displayName": "Query", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The search query" } },
+    "tasks": { "action": { "kind": "parameter", "displayName": "Action", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxTask.Action", "enum": [ "REVIEW", "COMPLETE" ], "deprecated": false, "secret": false, "description": "The action the task assignee will be prompted to do" }, "assignTo": { "kind": "parameter", "displayName": "Assign To", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxUser [...]
+    "users": { "email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The email address to add as an alias" }, "emailAliasId": { "kind": "parameter", "displayName": "Email Alias Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": [...]
   }
 }
diff --git a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
index 975d196..33de38f 100644
--- a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
+++ b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
@@ -150,6 +150,171 @@ with the following path and query parameters:
 | *userName* (security) | Box user name, MUST be provided |  | String
 | *userPassword* (security) | Box user password, MUST be provided if authSecureStorage is not set, or returns null on first call |  | String
 |===
+
+
+
+
+=== Query API Parameters (10 APIs):
+
+The Box endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+box:apiName/methodName
+----
+
+
+==== apiName: collaborations
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *collaborationId* (common) | The id of comment to change |  | String
+| *collaborator* (common) | The collaborator to add |  | BoxCollaborator
+| *email* (common) | The email address of the collaborator to add |  | String
+| *folderId* (common) | The id of folder to add collaboration to |  | String
+| *info* (common) |  |  | Info
+| *role* (common) | The role of the collaborator |  | Role
+|===
+
+==== apiName: comments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) | The id of comment to change |  | String
+| *fileId* (common) | The id of file to rename |  | String
+| *message* (common) | The comment's message |  | String
+|===
+
+==== apiName: event-logs
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *after* (common) | The lower bound on the timestamp of the events returned |  | Date
+| *before* (common) | The upper bound on the timestamp of the events returned |  | Date
+| *position* (common) | The starting position of the event stream. May be |  | String
+| *types* (common) | An optional list of event types to filter by |  | Type[]
+|===
+
+==== apiName: events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *startingPosition* (common) | The starting position of the event stream |  | Long
+|===
+
+==== apiName: files
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *access* (common) | The access level of the shared link |  | Access
+| *check* (common) | If the file name is already used, call the uploadNewVersion instead. |  | Boolean
+| *content* (common) | A stream containing contents of the file to upload |  | InputStream
+| *created* (common) | The content created date that will be given to the uploaded file |  | Date
+| *destinationFolderId* (common) | The id of the destination folder |  | String
+| *fields* (common) | The information fields to retrieve; if |  | String[]
+| *fileContent* (common) | A stream containing contents of the file to upload |  | InputStream
+| *fileId* (common) | The id of file to copy |  | String
+| *fileName* (common) | The name to give the uploaded file |  | String
+| *fileSize* (common) | The size of the file's content used for monitoring the upload's progress |  | Long
+| *fileType* (common) | Either PNG of JPG |  | ThumbnailFileType
+| *info* (common) | The updated information |  | Info
+| *listener* (common) | A listener for monitoring the download's progress; if |  | ProgressListener
+| *maxHeight* (common) | Maximum height |  | Integer
+| *maxWidth* (common) | Maximum width |  | Integer
+| *metadata* (common) | The new metadata values |  | Metadata
+| *minHeight* (common) | Minimum height |  | Integer
+| *minWidth* (common) | Minimum width |  | Integer
+| *modified* (common) | The content modified date that will be given to the uploaded file |  | Date
+| *newFileName* (common) | The new name of file |  | String
+| *newName* (common) | Is |  | String
+| *output* (common) | The stream to which the file contents will be written |  | OutputStream
+| *parentFolderId* (common) | The id of parent folder |  | String
+| *permissions* (common) | Is |  | Permissions
+| *rangeEnd* (common) | The byte offset in file at which to stop the download; if |  | Long
+| *rangeStart* (common) | The byte offset in file at which to start the download; if |  | Long
+| *size* (common) | The size of the file's content used for monitoring the upload's progress.Skip navigation links |  | Long
+| *typeName* (common) | The metadata template type name; if |  | String
+| *unshareDate* (common) | The date and time at which time the created shared link will expire; if |  | Date
+| *version* (common) | The version of file to delete; initial version of file has value of |  | Integer
+|===
+
+==== apiName: folders
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *access* (common) | The access level of the shared link |  | Access
+| *destinationFolderId* (common) | The id of the destination folder |  | String
+| *fields* (common) | The information fields to retrieve; if |  | String[]
+| *folderId* (common) | The id of folder to copy |  | String
+| *folderName* (common) | The name of created folder |  | String
+| *info* (common) | The updated information |  | Info
+| *limit* (common) | The maximum number of children to retrieve after the offset; if |  | Long
+| *newFolderName* (common) | The new name of folder |  | String
+| *newName* (common) | Is |  | String
+| *offset* (common) | The index of first child item to retrieve; if |  | Long
+| *parentFolderId* (common) | The id of parent folder |  | String
+| *path* (common) | Sequence of Box folder names from parent folder to returned folder |  | String[]
+| *permissions* (common) | Is |  | Permissions
+| *unshareDate* (common) | The date and time at which time the created shared link will expire; if |  | Date
+|===
+
+==== apiName: groups
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *description* (common) | The description of the new group |  | String
+| *externalSyncIdentifier* (common) | The external_sync_identifier of the new group |  | String
+| *groupId* (common) | The id of group |  | String
+| *groupInfo* (common) | The updated information |  | Info
+| *groupMembershipId* (common) | The id of group membership to delete |  | String
+| *info* (common) | The updated information |  | Info
+| *invitabilityLevel* (common) | The invitibility_level of the new group |  | String
+| *memberViewabilityLevel* (common) | The member_viewability_level of the new group |  | String
+| *name* (common) | The name of the new group |  | String
+| *provenance* (common) | The provenance of the new group |  | String
+| *role* (common) | The role of the user in this group. Can be |  | Role
+| *userId* (common) | The id of user to be added to group |  | String
+|===
+
+==== apiName: search
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *folderId* (common) | The id of folder searched |  | String
+| *query* (common) | The search query |  | String
+|===
+
+==== apiName: tasks
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *action* (common) | The action the task assignee will be prompted to do |  | Action
+| *assignTo* (common) | The user to assign to task |  | BoxUser
+| *dueAt* (common) | The day at which this task is due |  | Date
+| *fileId* (common) | The id of file to add task to |  | String
+| *info* (common) | The updated information |  | Info
+| *message* (common) | An optional message to include with the task |  | String
+| *taskAssignmentId* (common) | The id of task assignment to delete.Skip navigation links |  | String
+| *taskId* (common) | The id of task to add assignment for |  | String
+|===
+
+==== apiName: users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *email* (common) | The email address to add as an alias |  | String
+| *emailAliasId* (common) | The id of the email alias to delete |  | String
+| *fields* (common) | The fields to retrieve. Leave this out for the standard fields. |  | String[]
+| *filterTerm* (common) | The filter term to lookup users by (login for external, login or name for managed); if |  | String
+| *force* (common) | Whether or not this user should be deleted even if they still own files |  | Boolean
+| *info* (common) | The updated information |  | Info
+| *login* (common) | The email address the user will use to login |  | String
+| *name* (common) | The name of the user |  | String
+| *notifyUser* (common) | Whether or not to send an email notification to the user that their account has been deleted |  | Boolean
+| *params* (common) | Additional user information |  | CreateUserParams
+| *sourceUserId* (common) | The user id of the user whose files will be the source for this operation.Skip navigation links |  | String
+| *userId* (common) | The id of user |  | String
+|===
 // endpoint options: END
 
 == URI format
diff --git a/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json b/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
index da0ee1f..17f816f 100644
--- a/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
+++ b/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
@@ -67,19 +67,19 @@
     "publicKey": { "kind": "parameter", "displayName": "Public Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The public key provided by Braintree." }
   },
   "apiProperties": {
-    "paymentMethodNonce": { "paymentMethodNonce": { "kind": "parameter", "displayName": "Payment Method Nonce", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "paymentMethodToken": { "kind": "parameter", "displayName": "Payment Method Token", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": fals [...]
-    "documentUpload": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.DocumentUploadRequest", "deprecated": false, "secret": false, "description": "" } },
-    "subscription": { "amount": { "kind": "parameter", "displayName": "Amount", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.math.BigDecimal", "deprecated": false, "secret": false, "description": "" }, "customerId": { "kind": "parameter", "displayName": "Customer Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "para [...]
-    "dispute": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The content of the text evidence for the dispute" }, "disputeId": { "kind": "parameter", "displayName": "Dispute Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "de [...]
-    "settlementBatchSummary": { "groupByCustomField": { "kind": "parameter", "displayName": "Group By Custom Field", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "settlementDate": { "kind": "parameter", "displayName": "Settlement Date", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Calendar", "deprecated": false, "secret": false, [...]
     "address": { "customerId": { "kind": "parameter", "displayName": "Customer Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the" }, "request": { [...]
-    "webhookNotification": { "challenge": { "kind": "parameter", "displayName": "Challenge", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "payload": { "kind": "parameter", "displayName": "Payload", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "signature": { "kin [...]
-    "creditCardVerification": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "query": { "kind": "parameter", "displayName": "Query", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.CreditCardVerificationSearchRequest", "deprecated": false, "secret": false, "description":  [...]
-    "transaction": { "amount": { "kind": "parameter", "displayName": "Amount", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.math.BigDecimal", "deprecated": false, "secret": false, "description": "" }, "cloneRequest": { "kind": "parameter", "displayName": "Clone Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.TransactionCloneRequest", "deprecated": false, "secret": false, "descriptio [...]
-    "report": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.TransactionLevelFeeReportRequest", "deprecated": false, "secret": false, "description": "The request" } },
-    "paymentMethod": { "deleteRequest": { "kind": "parameter", "displayName": "Delete Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.PaymentMethodDeleteRequest", "deprecated": false, "secret": false, "description": "" }, "grantRequest": { "kind": "parameter", "displayName": "Grant Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.PaymentMethodGrantRequest", "de [...]
     "clientToken": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.ClientTokenRequest", "deprecated": false, "secret": false, "description": "" } },
+    "creditCardVerification": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "query": { "kind": "parameter", "displayName": "Query", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.CreditCardVerificationSearchRequest", "deprecated": false, "secret": false, "description":  [...]
+    "customer": { "associationFilterId": { "kind": "parameter", "displayName": "Association Filter Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the association filter to use" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false,  [...]
+    "dispute": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The content of the text evidence for the dispute" }, "disputeId": { "kind": "parameter", "displayName": "Dispute Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "de [...]
+    "documentUpload": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.DocumentUploadRequest", "deprecated": false, "secret": false, "description": "" } },
     "merchantAccount": { "currencyRequest": { "kind": "parameter", "displayName": "Currency Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.MerchantAccountCreateForCurrencyRequest", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": fals [...]
-    "customer": { "associationFilterId": { "kind": "parameter", "displayName": "Association Filter Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the association filter to use" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false,  [...]
+    "paymentMethod": { "deleteRequest": { "kind": "parameter", "displayName": "Delete Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.PaymentMethodDeleteRequest", "deprecated": false, "secret": false, "description": "" }, "grantRequest": { "kind": "parameter", "displayName": "Grant Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.PaymentMethodGrantRequest", "de [...]
+    "paymentMethodNonce": { "paymentMethodNonce": { "kind": "parameter", "displayName": "Payment Method Nonce", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "paymentMethodToken": { "kind": "parameter", "displayName": "Payment Method Token", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": fals [...]
+    "report": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.TransactionLevelFeeReportRequest", "deprecated": false, "secret": false, "description": "The request" } },
+    "settlementBatchSummary": { "groupByCustomField": { "kind": "parameter", "displayName": "Group By Custom Field", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "settlementDate": { "kind": "parameter", "displayName": "Settlement Date", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Calendar", "deprecated": false, "secret": false, [...]
+    "subscription": { "amount": { "kind": "parameter", "displayName": "Amount", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.math.BigDecimal", "deprecated": false, "secret": false, "description": "" }, "customerId": { "kind": "parameter", "displayName": "Customer Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "para [...]
+    "transaction": { "amount": { "kind": "parameter", "displayName": "Amount", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.math.BigDecimal", "deprecated": false, "secret": false, "description": "" }, "cloneRequest": { "kind": "parameter", "displayName": "Clone Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.TransactionCloneRequest", "deprecated": false, "secret": false, "descriptio [...]
+    "webhookNotification": { "challenge": { "kind": "parameter", "displayName": "Challenge", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "payload": { "kind": "parameter", "displayName": "Payload", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "signature": { "kin [...]
   }
 }
diff --git a/components/camel-braintree/src/main/docs/braintree-component.adoc b/components/camel-braintree/src/main/docs/braintree-component.adoc
index 21532ec..4b7dc1e 100644
--- a/components/camel-braintree/src/main/docs/braintree-component.adoc
+++ b/components/camel-braintree/src/main/docs/braintree-component.adoc
@@ -123,70 +123,154 @@ with the following path and query parameters:
 | *privateKey* (security) | The private key provided by Braintree. |  | String
 | *publicKey* (security) | The public key provided by Braintree. |  | String
 |===
-// endpoint options: END
 
 
 
-== URI format
 
- 
+=== Query API Parameters (14 APIs):
 
-[source,java]
----------------------------------------------
-braintree://endpoint-prefix/endpoint?[options]
----------------------------------------------
+The Braintree endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
 
- 
+----
+braintree:apiName/methodName
+----
 
-Endpoint prefix can be one of:
-
-* addOn
-* address
-* clientToken
-* creditCardverification
-* customer
-* discount
-* dispute
-* documentUpload
-* merchantAccount
-* paymentmethod
-* paymentmethodNonce
-* plan
-* report
-* settlementBatchSummary
-* subscription
-* transaction
-* webhookNotification
 
- 
+==== apiName: address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *customerId* (common) | The id of the |  | String
+| *id* (common) | The id of the |  | String
+| *request* (common) | The request object |  | AddressRequest
+|===
 
-== BraintreeComponent
+==== apiName: clientToken
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) |  |  | ClientTokenRequest
+|===
 
-The Braintree Component can be configured with the options below. These
-options can be provided using the component's bean
-property *configuration* of
-type *org.apache.camel.component.braintree.BraintreeConfiguration*.
+==== apiName: creditCardVerification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (common) |  |  | String
+| *query* (common) |  |  | CreditCardVerificationSearchRequest
+| *request* (common) |  |  | CreditCardVerificationRequest
+|===
 
-[cols="<,<,<",options="header",]
-|=======================================================================
-|Option |Type |Description
-|environment |String |Value that specifies where requests should be
-directed – sandbox or production
+==== apiName: customer
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *associationFilterId* (common) | The id of the association filter to use |  | String
+| *id* (common) | The id of the |  | String
+| *query* (common) | The request query to use for search |  | CustomerSearchRequest
+| *request* (common) | The request |  | CustomerRequest
+|===
 
-|merchantId |String |A unique identifier for your gateway account, which
-is different than your merchant account ID
+==== apiName: dispute
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) | The content of the text evidence for the dispute |  | String
+| *disputeId* (common) | The dispute id to add text evidence to |  | String
+| *documentId* (common) | The document id of a previously uploaded document |  | String
+| *evidenceId* (common) | The evidence id to remove |  | String
+| *fileEvidenceRequest* (common) | The file evidence request for the dispute |  | FileEvidenceRequest
+| *id* (common) | The dispute id to accept |  | String
+| *query* (common) | The query for what disputes to find |  | DisputeSearchRequest
+| *textEvidenceRequest* (common) | The text evidence request for the dispute |  | TextEvidenceRequest
+|===
 
-|publicKey |String |User-specific public identifier
+==== apiName: documentUpload
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) |  |  | DocumentUploadRequest
+|===
 
-|privateKey |String |User-specific secure identifier that should not be
-shared – even with us!
+==== apiName: merchantAccount
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *currencyRequest* (common) |  |  | MerchantAccountCreateForCurrencyRequest
+| *id* (common) |  |  | String
+| *page* (common) |  |  | Integer
+| *request* (common) |  |  | MerchantAccountRequest
+|===
+
+==== apiName: paymentMethod
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *deleteRequest* (common) |  |  | PaymentMethodDeleteRequest
+| *grantRequest* (common) |  |  | PaymentMethodGrantRequest
+| *request* (common) |  |  | PaymentMethodRequest
+| *token* (common) |  |  | String
+|===
+
+==== apiName: paymentMethodNonce
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *paymentMethodNonce* (common) |  |  | String
+| *paymentMethodToken* (common) |  |  | String
+| *request* (common) |  |  | PaymentMethodNonceRequest
+|===
+
+==== apiName: report
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) | The request |  | TransactionLevelFeeReportRequest
+|===
 
-|accessToken |String |Token granted to a merchant using Braintree Auth
-allowing them to process transactions on another's behalf. Used in place
-of the environment, merchantId, publicKey and privateKey options.
-|=======================================================================
+==== apiName: settlementBatchSummary
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *groupByCustomField* (common) |  |  | String
+| *settlementDate* (common) |  |  | Calendar
+|===
+
+==== apiName: subscription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *amount* (common) |  |  | BigDecimal
+| *customerId* (common) |  |  | String
+| *id* (common) | Of the |  | String
+| *request* (common) | The request |  | SubscriptionRequest
+| *searchRequest* (common) | The |  | SubscriptionSearchRequest
+| *submitForSettlement* (common) |  |  | Boolean
+| *subscriptionId* (common) |  |  | String
+|===
+
+==== apiName: transaction
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *amount* (common) |  |  | BigDecimal
+| *cloneRequest* (common) |  |  | TransactionCloneRequest
+| *id* (common) | Of the transaction to cancel release from escrow of |  | String
+| *query* (common) | The search query |  | TransactionSearchRequest
+| *refundRequest* (common) |  |  | TransactionRefundRequest
+| *request* (common) | The request |  | TransactionRequest
+|===
 
-All the options above are provided by Braintree Payments
+==== apiName: webhookNotification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *challenge* (common) |  |  | String
+| *payload* (common) |  |  | String
+| *signature* (common) |  |  | String
+|===
+// endpoint options: END
 
 == Producer Endpoints:
 
@@ -210,600 +294,6 @@ For more information on the endpoints and options see Braintree
 references
 at https://developers.braintreepayments.com/reference/overview[https://developers.braintreepayments.com/reference/overview]
 
- 
-
-=== Endpoint prefix _addOn_
-
-The following endpoints can be invoked with the prefix *addOn* as
-follows:
-
- 
-
-[source,java]
---------------------------
-braintree://addOn/endpoint
---------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Addon>
-|====================================================
-
-=== Endpoint prefix _address_
-
-The following endpoints can be invoked with the prefix *address* as
-follows:
-
- 
-
-[source,java]
---------------------------------------
-braintree://address/endpoint?[options]
---------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |customerId, request
-|com.braintreegateway.Result<com.braintreegateway.Address>
-
-|delete |  |customerId, id
-|com.braintreegateway.Result<com.braintreegateway.Address> 
-
-|find |  |customerId, id |com.braintreegateway.Address
-
-|update |  |customerId, id, request
-|com.braintreegateway.Result<com.braintreegateway.Address> 
-|=======================================================================
-
-[[Braintree-URIOptionsforaddress]]
-URI Options for _address_
-
-[cols="<,<",options="header",]
-|============================================
-|Name |Type
-|customerId |String
-|request |com.braintreegateway.AddressRequest
-|id |String
-|============================================
-
-=== Endpoint prefix _clientToken_
-
-The following endpoints can be invoked with the prefix *clientToken* as
-follows:
-
- 
-
-[source,java]
-------------------------------------------
-braintree://clientToken/endpoint?[options]
-------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|generate |  | request |String
-|====================================================
-
-[[Braintree-URIOptionsforclientToken]]
-URI Options for _clientToken_
-
-[cols="<,<",options="header",]
-|================================================
-|Name |Type
-|request |com.braintreegateway.ClientTokenrequest
-|================================================
-
-=== Endpoint prefix _creditCardVerification_
-
-The following endpoints can be invoked with the
-prefix *creditCardverification* as follows:
-
- 
-
-[source,java]
------------------------------------------------------
-braintree://creditCardVerification/endpoint?[options]
------------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|find |  | id |com.braintreegateway.CreditCardVerification
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.CreditCardVerification>
-|=======================================================================
-
-[[Braintree-URIOptionsforcreditCardVerification]]
-URI Options for _creditCardVerification_
-
-[cols="<,<",options="header",]
-|===============================================================
-|Name |Type
-|id |String
-|query |com.braintreegateway.CreditCardVerificationSearchRequest
-|===============================================================
-
-=== Endpoint prefix _customer_
-
-The following endpoints can be invoked with the prefix *customer* as
-follows:
-
- 
-
-[source,java]
----------------------------------------
-braintree://customer/endpoint?[options]
----------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  | 
-
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-
-|delete |  |id
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-
-|find |  |id |com.braintreegateway.Customer
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Customer>
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-|=======================================================================
-
-[[Braintree-URIOptionsforcustomer]]
-URI Options for _customer_
-
-[cols="<,<",options="header",]
-|=================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.CustomerRequest
-|query |com.braintreegateway.CustomerSearchRequest
-|=================================================
-
-=== Endpoint prefix _discount_
-
-The following endpoints can be invoked with the prefix *discount* as
-follows:
-
- 
-
-[source,java]
------------------------------
-braintree://discount/endpoint
------------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Discount>
-|====================================================
-
- +
-
- +
-
-=== Endpoint prefix _dispute_
-
-The following endpoints can be invoked with the prefix *dispute* as
-follows:
-
-[source,java]
-----------------------------------------------
-braintree://dispute/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|accept |  |id
-|com.braintreegateway.Result
-
-|addFileEvidence |  |disputeId, documentId
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addFileEvidence |  |disputeId, fileEvidenceRequest
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addTextEvidence |  |disputeId, content
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addTextEvidence |  |disputeId, textEvidenceRequest
-|com.braintreegateway.Result<DisputeEvidence>
-
-|finalize |  |id
-|com.braintreegateway.Result
-
-|find |  |id
-|com.braintreegateway.Dispute
-
-|removeEvidence |  |id
-|com.braintreegateway.Result
-
-|search |  | disputeSearchRequest
-|com.braintreegateway.PaginatedCollection<com.braintreegateway.Dispute>
-|=======================================================================
-
-[[Braintree-URIOptionsfordispute]]
-URI Options for _dispute_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|id |String
-|disputeId |String
-|documentId |String
-|fileEvidenceRequest |com.braintreegateway.FileEvidenceRequest
-|content |String |
-|textEvidenceRequest |com.braintreegateway.TextEvidenceRequest
-|disputeSearchRequest |com.braintreegateway.DisputeSearchRequest
-|==========================================================
-
-
-=== Endpoint prefix _documentUpload_
-
-The following endpoints can be invoked with the prefix *documentUpload* as
-follows:
-
-[source,java]
-----------------------------------------------
-braintree://documentUpload/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.DocumentUpload>
-|=======================================================================
-
-[[Braintree-URIOptionsfordocumentUpload]]
-URI Options for _documentUpload_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|request |com.braintreegateway.DocumentUploadRequest
-|==========================================================
-
-
-=== Endpoint prefix _merchantAccount_
-
-The following endpoints can be invoked with the
-prefix *merchantAccount* as follows:
-
- 
-
-[source,java]
-----------------------------------------------
-braintree://merchantAccount/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-
-|createForCurrency |  |currencyRequest
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-
-|find |  |id |com.braintreegateway.MerchantAccount
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-|=======================================================================
-
-[[Braintree-URIOptionsformerchantAccount]]
-URI Options for _merchantAccount_
-
-[cols="<,<",options="header",]
-|====================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.MerchantAccountRequest
-|currencyRequest |com.braintreegateway.MerchantAccountCreateForCurrencyRequest
-|====================================================
-
-=== Endpoint prefix _paymentMethod_
-
-The following endpoints can be invoked with the
-prefix *paymentMethod* as follows:
-
- 
-
-[source,java]
---------------------------------------------
-braintree://paymentMethod/endpoint?[options]
---------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-
-|delete |  |token, deleteRequest
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-
-|find |  |token |com.braintreegateway.PaymentMethod
-
-|update |  |token, request
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-|=======================================================================
-
-[[Braintree-URIOptionsforpaymentMethod]]
-URI Options for _paymentMethod_
-
-[cols="<,<",options="header",]
-|==================================================
-|Name |Type
-|token |String
-|request |com.braintreegateway.PaymentMethodRequest
-|deleteRequest |com.braintreegateway.PaymentMethodDeleteRequest
-|==================================================
-
-=== Endpoint prefix _paymentMethodNonce_
-
-The following endpoints can be invoked with the
-prefix *paymentMethodNonce* as follows:
-
- 
-
-[source,java]
--------------------------------------------------
-braintree://paymentMethodNonce/endpoint?[options]
--------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |paymentMethodToken
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce>
-
-|find |  |paymentMethodNonce |com.braintreegateway.PaymentMethodNonce
-|=======================================================================
-
-[[Braintree-URIOptionsforpaymentMethodNonce]]
-URI Options for _paymentMethodNonce_
-
-[cols="<,<",options="header",]
-|==========================
-|Name |Type
-|paymentMethodToken |String
-|paymentMethodNonce |String
-|==========================
-
-=== Endpoint prefix _plan_
-
-The following endpoints can be invoked with the prefix *plan* as
-follows:
-
- 
-
-[source,java]
--------------------------
-braintree://plan/endpoint
--------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Plan>
-|====================================================
-
-
-=== Endpoint prefix _report_
-
-The following endpoints can be invoked with the prefix *report* as
-follows:
-
-[source,java]
----------------------------------
-braintree://plan/report?[options]
----------------------------------
-
-[cols="<,<,<,<",options="header",]
-|==============================================================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|transactionLevelFees |  | request |com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport>
-|==============================================================================================================
-
-[[Braintree-URIOptionsfortreport]]
-URI Options for _report_
-
-[cols="<,<",options="header",]
-|==============================================================
-|Name |Type
-|request |com.braintreegateway.TransactionLevelFeeReportRequest
-|==============================================================
-
-
-=== Endpoint prefix _settlementBatchSummary_
-
-The following endpoints can be invoked with the
-prefix *settlementBatchSummary* as follows:
-
- 
-
-[source,java]
------------------------------------------------------
-braintree://settlementBatchSummary/endpoint?[options]
------------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|generate |  | request
-|com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary>
-|=======================================================================
-
-[[Braintree-URIOptionsforsettlementBatchSummary]]
-URI Options for _settlementBatchSummary_
-
-[cols="<,<",options="header",]
-|==========================
-|Name |Type
-|settlementDate |Calendar
-|groupByCustomField |String
-|==========================
-
-=== Endpoint prefix _subscription_
-
-The following endpoints can be invoked with the prefix *subscription* as
-follows:
-
- 
-
-[source,java]
--------------------------------------------
-braintree://subscription/endpoint?[options]
--------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|cancel |  | id
-| com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|delete |  |customerId, id
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|find |  |id |com.braintreegateway.Subscription
-
-|retryCharge |  |subscriptionId, amount
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|search |  |searchRequest
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Subscription>
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-|=======================================================================
-
-[[Braintree-URIOptionsforsubscription]]
-URI Options for _subscription_
-
-[cols="<,<",options="header",]
-|==============================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.SubscriptionRequest
-|customerId |String
-|subscriptionId |String
-|amount |BigDecimal
-|searchRequest |com.braintreegateway.SubscriptionSearchRequest.
-|==============================================================
-
- 
-
-=== Endpoint prefix _transaction_
-
-The following endpoints can be invoked with the prefix *transaction* as
-follows:
-
- 
-
-[source,java]
-------------------------------------------
-braintree://transaction/endpoint?[options]
-------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|cancelRelease |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|cloneTransaction |  |id, cloneRequest
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|credit |  |request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|find |  |id |com.braintreegateway.Transaction
-
-|holdInEscrow |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|releaseFromEscrow |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|refund |  |id, amount, refundRequest
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|sale |  |request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Transaction>
-
-|submitForPartialSettlement |  |id, amount
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|submitForSettlement |  |id, amount, request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|voidTransaction |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-|=======================================================================
-
-[[Braintree-URIOptionsfortransaction]]
-URI Options for _transaction_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.TransactionCloneRequest
-|cloneRequest |com.braintreegateway.TransactionCloneRequest
-|refundRequest |com.braintreegateway.TransactionRefundRequest
-|amount |BigDecimal
-|query |com.braintreegateway.TransactionSearchRequest
-|==========================================================
-
-=== Endpoint prefix _webhookNotification_
-
-The following endpoints can be invoked with the
-prefix *webhookNotification* as follows:
-
- 
-
-[source,java]
---------------------------------------------------
-braintree://webhookNotification/endpoint?[options]
---------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|parse |  | signature, payload |com.braintreegateway.WebhookNotification
-|verify |  |challenge |String
-|=======================================================================
-
-[[Braintree-URIOptionsforwebhookNotification]]
-URI Options for _webhookNotification_
-
-[cols="<,<",options="header",]
-|=================
-|Name |Type
-|signature |String
-|payload |String
-|challenge |String
-|=================
-
- 
 
 == Consumer Endpoints
 
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
index db69716..6117cfc 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
@@ -102,18 +102,18 @@
     "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "Username to use for basic authentication" }
   },
   "apiProperties": {
-    "update": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdType [...]
-    "create": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "preferReturn": { "kind": "parameter", "displayName": "Prefer Return", "group": "common", "label": "", "required": false, "type": "object", "javaType": "ca.uhn.fhir.res [...]
-    "validate": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "resource": { "kind": "parameter", "displayName": "Resource", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.mod [...]
-    "operation": { "asynchronous": { "kind": "parameter", "displayName": "Asynchronous", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Objec [...]
-    "search": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "url": { "kind": "parameter", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
     "capabilities": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "type": { "kind": "parameter", "displayName": "Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.Class<org.hl7.fhir. [...]
-    "patch": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdTy [...]
-    "meta": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdType", [...]
+    "create": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "preferReturn": { "kind": "parameter", "displayName": "Prefer Return", "group": "common", "label": "", "required": false, "type": "object", "javaType": "ca.uhn.fhir.res [...]
+    "delete": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdT [...]
     "history": { "count": { "kind": "parameter", "displayName": "Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "" }, "cutoff": { "kind": "parameter", "displayName": "Cutoff", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "description": "" }, "extraParameters": { "kind": "parameter", [...]
     "load-page": { "bundle": { "kind": "parameter", "displayName": "Bundle", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IBaseBundle", "deprecated": false, "secret": false, "description": "" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, ja [...]
-    "transaction": { "bundle": { "kind": "parameter", "displayName": "Bundle", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IBaseBundle", "deprecated": false, "secret": false, "description": "Bundle to use in the transaction" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.comp [...]
+    "meta": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdType", [...]
+    "operation": { "asynchronous": { "kind": "parameter", "displayName": "Asynchronous", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Objec [...]
+    "patch": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdTy [...]
     "read": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "iUrl": { "kind": "parameter", "displayName": "IUrl", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdTy [...]
-    "delete": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdT [...]
+    "search": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "url": { "kind": "parameter", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
+    "transaction": { "bundle": { "kind": "parameter", "displayName": "Bundle", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IBaseBundle", "deprecated": false, "secret": false, "description": "Bundle to use in the transaction" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.comp [...]
+    "update": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdType [...]
+    "validate": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "resource": { "kind": "parameter", "displayName": "Resource", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.mod [...]
   }
 }
diff --git a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
index 85617ac..f6182c5 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
+++ b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
@@ -166,6 +166,173 @@ with the following path and query parameters:
 | *password* (security) | Username to use for basic authentication |  | String
 | *username* (security) | Username to use for basic authentication |  | String
 |===
+
+
+
+
+=== Query API Parameters (13 APIs):
+
+The FHIR endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+fhir:apiName/methodName
+----
+
+
+==== apiName: capabilities
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *type* (common) |  |  | Class
+|===
+
+==== apiName: create
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *preferReturn* (common) | Add a |  | PreferReturnEnum
+| *resource* (common) | The resource to create |  | IBaseResource
+| *resourceAsString* (common) | The resource to create |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: delete
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *id* (common) | The |  | IIdType
+| *resource* (common) | The |  | IBaseResource
+| *stringId* (common) | It's id |  | String
+| *type* (common) | The resource type e.g Patient |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *count* (common) |  |  | Integer
+| *cutoff* (common) |  |  | Date
+| *extraParameters* (common) |  |  | Map
+| *iCutoff* (common) |  |  | IPrimitiveType
+| *id* (common) |  |  | IIdType
+| *resourceType* (common) |  |  | Class
+| *returnType* (common) |  |  | Class
+|===
+
+==== apiName: load-page
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *bundle* (common) |  |  | IBaseBundle
+| *extraParameters* (common) |  |  | Map
+| *returnType* (common) |  |  | Class
+| *url* (common) |  |  | String
+|===
+
+==== apiName: meta
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *meta* (common) |  |  | IBaseMetaType
+| *metaType* (common) |  |  | Class
+| *theResourceName* (common) |  |  | String
+|===
+
+==== apiName: operation
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *asynchronous* (common) |  |  | Boolean
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *msgBundle* (common) |  |  | IBaseBundle
+| *name* (common) |  |  | String
+| *outputParameterType* (common) |  |  | Class
+| *parameters* (common) |  |  | IBaseParameters
+| *resourceType* (common) |  |  | Class
+| *respondToUri* (common) |  |  | String
+| *responseClass* (common) |  |  | Class
+| *returnType* (common) |  |  | Class
+| *useHttpGet* (common) |  |  | Boolean
+|===
+
+==== apiName: patch
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *id* (common) | The resource ID to patch |  | IIdType
+| *patchBody* (common) | The body of the patch document serialized in either XML or JSON which conforms to \http://jsonpatch.com/ or \http://tools.ietf.org/html/rfc5261 |  | String
+| *preferReturn* (common) | Add a |  | PreferReturnEnum
+| *stringId* (common) | The resource ID to patch |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: read
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *iUrl* (common) |  |  | IIdType
+| *id* (common) |  |  | IIdType
+| *ifVersionMatches* (common) |  |  | String
+| *longId* (common) |  |  | Long
+| *resource* (common) |  |  | Class
+| *resourceClass* (common) |  |  | String
+| *returnNull* (common) |  |  | Boolean
+| *returnResource* (common) |  |  | IBaseResource
+| *stringId* (common) |  |  | String
+| *throwError* (common) |  |  | Boolean
+| *url* (common) |  |  | String
+| *version* (common) |  |  | String
+|===
+
+==== apiName: search
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *url* (common) | The URL to search for. Note that this URL may be complete (e.g. \http://example.com/base/Patientname=foo) in which case the client's base URL will be ignored. Or it can be relative (e.g. Patientname=foo) in which case the client's base URL will be used. |  | String
+|===
+
+==== apiName: transaction
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *bundle* (common) | Bundle to use in the transaction |  | IBaseBundle
+| *extraParameters* (common) | See |  | Map
+| *resources* (common) | Resources to use in the transaction |  | List
+| *stringBundle* (common) | Bundle to use in the transaction |  | String
+|===
+
+==== apiName: update
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *preferReturn* (common) |  |  | PreferReturnEnum
+| *resource* (common) |  |  | IBaseResource
+| *resourceAsString* (common) |  |  | String
+| *stringId* (common) |  |  | String
+| *url* (common) |  |  | String
+|===
+
+==== apiName: validate
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *resource* (common) |  |  | IBaseResource
+| *resourceAsString* (common) |  |  | String
+|===
 // endpoint options: END
 
 include::camel-spring-boot::page$fhir-starter.adoc[]
diff --git a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
index a75e4bf..62a66a1 100644
--- a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
+++ b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
@@ -75,12 +75,12 @@
     "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.calendar.GoogleCalendarConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one [...]
   },
   "apiProperties": {
-    "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "descripti [...]
-    "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "" } },
-    "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Event", "deprecated": false, "secret": false, "description": "" }, " [...]
-    "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" } },
     "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.AclRule", "deprecated": false, "secret": false, "description": "" }, "c [...]
     "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Calendar", "deprecated": false, "secret": false, "description": "" } },
-    "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.CalendarListEntry", "deprecated": false, "secret": false, "description [...]
+    "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" } },
+    "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Event", "deprecated": false, "secret": false, "description": "" }, " [...]
+    "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "" } },
+    "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.CalendarListEntry", "deprecated": false, "secret": false, "description [...]
+    "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "descripti [...]
   }
 }
diff --git a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
index 6b4612d..a756478 100644
--- a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
+++ b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
@@ -75,12 +75,12 @@
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apiProperties": {
-    "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "descr [...]
-    "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "" } },
-    "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Event", "deprecated": false, "secret": false, "description": ""  [...]
-    "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" } },
     "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.AclRule", "deprecated": false, "secret": false, "description": "" } [...]
     "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Calendar", "deprecated": false, "secret": false, "description [...]
-    "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.CalendarListEntry", "deprecated": false, "secret": false, "descrip [...]
+    "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" } },
+    "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Event", "deprecated": false, "secret": false, "description": ""  [...]
+    "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "" } },
+    "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.CalendarListEntry", "deprecated": false, "secret": false, "descrip [...]
+    "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "descr [...]
   }
 }
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
index 2125691..cc091df 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
@@ -137,6 +137,80 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the calendar application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Calendar endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-calendar:apiName/methodName
+----
+
+
+==== apiName: acl
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | AclRule
+| *contentChannel* (common) |  |  | Channel
+| *ruleId* (common) |  |  | String
+|===
+
+==== apiName: calendars
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | Calendar
+|===
+
+==== apiName: channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | Event
+| *contentChannel* (common) |  |  | Channel
+| *destination* (common) |  |  | String
+| *eventId* (common) |  |  | String
+| *text* (common) |  |  | String
+|===
+
+==== apiName: freebusy
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | FreeBusyRequest
+|===
+
+==== apiName: list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | CalendarListEntry
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: settings
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+| *setting* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index 567d923..3e874f0 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -140,6 +140,80 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Calendar Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-calendar-stream:index
+----
+
+
+==== : acl
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | AclRule
+| *contentChannel* (consumer) |  |  | Channel
+| *ruleId* (consumer) |  |  | String
+|===
+
+==== : calendars
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | Calendar
+|===
+
+==== : channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (consumer) |  |  | Channel
+|===
+
+==== : events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | Event
+| *contentChannel* (consumer) |  |  | Channel
+| *destination* (consumer) |  |  | String
+| *eventId* (consumer) |  |  | String
+| *text* (consumer) |  |  | String
+|===
+
+==== : freebusy
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | FreeBusyRequest
+|===
+
+==== : list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | CalendarListEntry
+| *contentChannel* (consumer) |  |  | Channel
+|===
+
+==== : settings
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (consumer) |  |  | Channel
+| *setting* (consumer) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json b/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
index 7fd8af1..55c8525 100644
--- a/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
+++ b/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
@@ -70,17 +70,17 @@
     "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.drive.GoogleDriveConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expir [...]
   },
   "apiProperties": {
-    "drive-channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Channel", "deprecated": false, "secret": false, "description": "" } },
-    "drive-revisions": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Revision", "deprecated": false, "secret": false, "description": "" }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" },  [...]
-    "drive-replies": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.CommentReply", "deprecated": false, "secret": false, "description" [...]
-    "drive-permissions": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Permission", "deprecated": false, "secret": false, "description": "" }, "email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, [...]
-    "drive-parents": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.ParentReference", "deprecated": false, "secret": false, "description": "" }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": " [...]
     "drive-apps": { "appId": { "kind": "parameter", "displayName": "App Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" } },
     "drive-changes": { "changeId": { "kind": "parameter", "displayName": "Change Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Channel", "deprecated": false, "secret": false, "desc [...]
+    "drive-channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Channel", "deprecated": false, "secret": false, "description": "" } },
+    "drive-children": { "childId": { "kind": "parameter", "displayName": "Child Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.ChildReference", "deprecated": false, "secret": false, "description": [...]
     "drive-comments": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Comment", "deprecated": false, "secret": false, "description": "" [...]
+    "drive-files": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.File", "deprecated": false, "secret": false, "description": "" }, "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Channel", "deprecated": false, "se [...]
+    "drive-parents": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.ParentReference", "deprecated": false, "secret": false, "description": "" }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": " [...]
+    "drive-permissions": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Permission", "deprecated": false, "secret": false, "description": "" }, "email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, [...]
     "drive-properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Property", "deprecated": false, "secret": false, "description": "" }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, [...]
     "drive-realtime": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "mediaContent": { "kind": "parameter", "displayName": "Media Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.client.http.AbstractInputStreamContent", "deprecated": false, "secret": false, "d [...]
-    "drive-children": { "childId": { "kind": "parameter", "displayName": "Child Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.ChildReference", "deprecated": false, "secret": false, "description": [...]
-    "drive-files": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.File", "deprecated": false, "secret": false, "description": "" }, "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Channel", "deprecated": false, "se [...]
+    "drive-replies": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.CommentReply", "deprecated": false, "secret": false, "description" [...]
+    "drive-revisions": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Revision", "deprecated": false, "secret": false, "description": "" }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" },  [...]
   }
 }
diff --git a/components/camel-google-drive/src/main/docs/google-drive-component.adoc b/components/camel-google-drive/src/main/docs/google-drive-component.adoc
index afae927..5933f7c 100644
--- a/components/camel-google-drive/src/main/docs/google-drive-component.adoc
+++ b/components/camel-google-drive/src/main/docs/google-drive-component.adoc
@@ -159,6 +159,125 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the drive application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (12 APIs):
+
+The Google Drive endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-drive:apiName/methodName
+----
+
+
+==== apiName: drive-apps
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *appId* (common) |  |  | String
+|===
+
+==== apiName: drive-changes
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *changeId* (common) |  |  | String
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: drive-channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: drive-children
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *childId* (common) |  |  | String
+| *content* (common) |  |  | ChildReference
+| *folderId* (common) |  |  | String
+|===
+
+==== apiName: drive-comments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) |  |  | String
+| *content* (common) |  |  | Comment
+| *fileId* (common) |  |  | String
+|===
+
+==== apiName: drive-files
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | File
+| *contentChannel* (common) |  |  | Channel
+| *fileId* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *mimeType* (common) |  |  | String
+|===
+
+==== apiName: drive-parents
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | ParentReference
+| *fileId* (common) |  |  | String
+| *parentId* (common) |  |  | String
+|===
+
+==== apiName: drive-permissions
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Permission
+| *email* (common) |  |  | String
+| *fileId* (common) |  |  | String
+| *permissionId* (common) |  |  | String
+|===
+
+==== apiName: drive-properties
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Property
+| *fileId* (common) |  |  | String
+| *propertyKey* (common) |  |  | String
+|===
+
+==== apiName: drive-realtime
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *fileId* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+|===
+
+==== apiName: drive-replies
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) |  |  | String
+| *content* (common) |  |  | CommentReply
+| *fileId* (common) |  |  | String
+| *replyId* (common) |  |  | String
+|===
+
+==== apiName: drive-revisions
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Revision
+| *fileId* (common) |  |  | String
+| *revisionId* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
index f801bc4..895b5d5 100644
--- a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
+++ b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
@@ -67,12 +67,12 @@
     "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires [...]
   },
   "apiProperties": {
-    "users": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.WatchRequest", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" } },
-    "threads": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.ModifyThreadRequest", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userI [...]
+    "attachments": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "messageId": { "kind": "parameter", "displayName": "Message Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": "parameter", "di [...]
     "drafts": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Draft", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "mediaContent": { "ki [...]
-    "labels": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Label", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": " [...]
     "history": { "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" } },
-    "attachments": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "messageId": { "kind": "parameter", "displayName": "Message Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": "parameter", "di [...]
-    "messages": { "batchDeleteMessagesRequest": { "kind": "parameter", "displayName": "Batch Delete Messages Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "deprecated": false, "secret": false, "description": "" }, "batchModifyMessagesRequest": { "kind": "parameter", "displayName": "Batch Modify Messages Request", "group": "common", "label": "", "required": false, "type": "object [...]
+    "labels": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Label", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": " [...]
+    "messages": { "batchDeleteMessagesRequest": { "kind": "parameter", "displayName": "Batch Delete Messages Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "deprecated": false, "secret": false, "description": "" }, "batchModifyMessagesRequest": { "kind": "parameter", "displayName": "Batch Modify Messages Request", "group": "common", "label": "", "required": false, "type": "object [...]
+    "threads": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.ModifyThreadRequest", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userI [...]
+    "users": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.WatchRequest", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" } }
   }
 }
diff --git a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
index 5493a7b..3753329 100644
--- a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
+++ b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
@@ -71,12 +71,12 @@
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apiProperties": {
-    "users": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.WatchRequest", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" } },
-    "threads": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.ModifyThreadRequest", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "u [...]
+    "attachments": { "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "messageId": { "kind": "parameter", "displayName": "Message Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": "parameter", [...]
     "drafts": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Draft", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "mediaContent": { [...]
-    "labels": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Label", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind [...]
     "history": { "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" } },
-    "attachments": { "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "messageId": { "kind": "parameter", "displayName": "Message Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": "parameter", [...]
-    "messages": { "batchDeleteMessagesRequest": { "kind": "parameter", "displayName": "Batch Delete Messages Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "deprecated": false, "secret": false, "description": "" }, "batchModifyMessagesRequest": { "kind": "parameter", "displayName": "Batch Modify Messages Request", "group": "consumer", "label": "", "required": false, "type": "ob [...]
+    "labels": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Label", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind [...]
+    "messages": { "batchDeleteMessagesRequest": { "kind": "parameter", "displayName": "Batch Delete Messages Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "deprecated": false, "secret": false, "description": "" }, "batchModifyMessagesRequest": { "kind": "parameter", "displayName": "Batch Modify Messages Request", "group": "consumer", "label": "", "required": false, "type": "ob [...]
+    "threads": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.ModifyThreadRequest", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "u [...]
+    "users": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.WatchRequest", "deprecated": false, "secret": false, "description": "" }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" } }
   }
 }
diff --git a/components/camel-google-mail/src/main/docs/google-mail-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-component.adoc
index f0fde9a..a5505da 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-component.adoc
@@ -147,6 +147,84 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the mail application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Mail endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-mail:apiName/methodName
+----
+
+
+==== apiName: attachments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (common) |  |  | String
+| *messageId* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: drafts
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Draft
+| *id* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: labels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Label
+| *id* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: messages
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchDeleteMessagesRequest* (common) |  |  | BatchDeleteMessagesRequest
+| *batchModifyMessagesRequest* (common) |  |  | BatchModifyMessagesRequest
+| *content* (common) |  |  | Message
+| *id* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *modifyMessageRequest* (common) |  |  | ModifyMessageRequest
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: threads
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | ModifyThreadRequest
+| *id* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | WatchRequest
+| *userId* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
index f289b13..6ed04ea 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
@@ -134,6 +134,84 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Mail Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-mail-stream:index
+----
+
+
+==== : attachments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (consumer) |  |  | String
+| *messageId* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : drafts
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | Draft
+| *id* (consumer) |  |  | String
+| *mediaContent* (consumer) |  |  | AbstractInputStreamContent
+| *userId* (consumer) |  |  | String
+|===
+
+==== : history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *userId* (consumer) |  |  | String
+|===
+
+==== : labels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | Label
+| *id* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : messages
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchDeleteMessagesRequest* (consumer) |  |  | BatchDeleteMessagesRequest
+| *batchModifyMessagesRequest* (consumer) |  |  | BatchModifyMessagesRequest
+| *content* (consumer) |  |  | Message
+| *id* (consumer) |  |  | String
+| *mediaContent* (consumer) |  |  | AbstractInputStreamContent
+| *modifyMessageRequest* (consumer) |  |  | ModifyMessageRequest
+| *userId* (consumer) |  |  | String
+|===
+
+==== : threads
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | ModifyThreadRequest
+| *id* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | WatchRequest
+| *userId* (consumer) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
index 7373476..f5d32eb 100644
--- a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
+++ b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
@@ -68,7 +68,7 @@
     "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expir [...]
   },
   "apiProperties": {
-    "spreadsheets": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.g [...]
-    "data": { "batchClearValuesRequest": { "kind": "parameter", "displayName": "Batch Clear Values Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchClearValuesRequest", "deprecated": false, "secret": false, "description": "The" }, "batchGetValuesByDataFilterRequest": { "kind": "parameter", "displayName": "Batch Get Values By Data Filter Request", "group": "common", "label": "", "required": false, "typ [...]
+    "data": { "batchClearValuesRequest": { "kind": "parameter", "displayName": "Batch Clear Values Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchClearValuesRequest", "deprecated": false, "secret": false, "description": "The" }, "batchGetValuesByDataFilterRequest": { "kind": "parameter", "displayName": "Batch Get Values By Data Filter Request", "group": "common", "label": "", "required": false, "typ [...]
+    "spreadsheets": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.g [...]
   }
 }
diff --git a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
index d8de946..b280ab6 100644
--- a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
+++ b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
@@ -80,7 +80,7 @@
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apiProperties": {
-    "spreadsheets": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "c [...]
-    "data": { "batchClearValuesRequest": { "kind": "parameter", "displayName": "Batch Clear Values Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchClearValuesRequest", "deprecated": false, "secret": false, "description": "The" }, "batchGetValuesByDataFilterRequest": { "kind": "parameter", "displayName": "Batch Get Values By Data Filter Request", "group": "consumer", "label": "", "required": false,  [...]
+    "data": { "batchClearValuesRequest": { "kind": "parameter", "displayName": "Batch Clear Values Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchClearValuesRequest", "deprecated": false, "secret": false, "description": "The" }, "batchGetValuesByDataFilterRequest": { "kind": "parameter", "displayName": "Batch Get Values By Data Filter Request", "group": "consumer", "label": "", "required": false,  [...]
+    "spreadsheets": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "c [...]
   }
 }
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
index bfc5608..ec4c1d5 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
@@ -143,6 +143,44 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the sheets application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The Google Sheets endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-sheets:apiName/methodName
+----
+
+
+==== apiName: data
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchClearValuesRequest* (common) | The |  | BatchClearValuesRequest
+| *batchGetValuesByDataFilter Request* (common) | The |  | BatchGetValuesByDataFilterRequest
+| *batchUpdateValuesByDataFilter Request* (common) | The |  | BatchUpdateValuesByDataFilterRequest
+| *batchUpdateValuesRequest* (common) | The |  | BatchUpdateValuesRequest
+| *clearValuesRequest* (common) | The |  | ClearValuesRequest
+| *content* (common) | The |  | BatchClearValuesByDataFilterRequest
+| *range* (common) | The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table. |  | String
+| *spreadsheetId* (common) | The ID of the spreadsheet to update |  | String
+| *values* (common) | The |  | ValueRange
+|===
+
+==== apiName: spreadsheets
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchUpdateSpreadsheetRequest* (common) | The |  | BatchUpdateSpreadsheetRequest
+| *content* (common) | The |  | Spreadsheet
+| *getSpreadsheetByDataFilter Request* (common) | The |  | GetSpreadsheetByDataFilterRequest
+| *spreadsheetId* (common) | The spreadsheet to apply the updates to |  | String
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index a018b9c..5cfb418 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -144,6 +144,44 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The Google Sheets Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-sheets-stream:apiName
+----
+
+
+==== : data
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchClearValuesRequest* (consumer) | The |  | BatchClearValuesRequest
+| *batchGetValuesByDataFilter Request* (consumer) | The |  | BatchGetValuesByDataFilterRequest
+| *batchUpdateValuesByDataFilter Request* (consumer) | The |  | BatchUpdateValuesByDataFilterRequest
+| *batchUpdateValuesRequest* (consumer) | The |  | BatchUpdateValuesRequest
+| *clearValuesRequest* (consumer) | The |  | ClearValuesRequest
+| *content* (consumer) | The |  | BatchClearValuesByDataFilterRequest
+| *range* (consumer) | The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table. |  | String
+| *spreadsheetId* (consumer) | The ID of the spreadsheet to update |  | String
+| *values* (consumer) | The |  | ValueRange
+|===
+
+==== : spreadsheets
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchUpdateSpreadsheetRequest* (consumer) | The |  | BatchUpdateSpreadsheetRequest
+| *content* (consumer) | The |  | Spreadsheet
+| *getSpreadsheetByDataFilter Request* (consumer) | The |  | GetSpreadsheetByDataFilterRequest
+| *spreadsheetId* (consumer) | The spreadsheet to apply the updates to |  | String
+|===
 // endpoint options: END
 
 
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index d72a38f..7002e26 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -148,6 +148,32 @@ with the following path and query parameters:
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Olingo2 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+olingo2:apiName/methodName
+----
+
+
+==== apiName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *data* (common) |  |  | Object
+| *edm* (common) |  |  | Edm
+| *endpointHttpHeaders* (common) |  |  | Map
+| *keyPredicate* (common) |  |  | String
+| *queryParams* (common) |  |  | Map
+| *resourcePath* (common) |  |  | String
+| *responseHandler* (common) |  |  | Olingo2ResponseHandler
+|===
 // endpoint options: END
 
 == Producer Endpoints
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
index 55341db..4668e31 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
@@ -145,6 +145,32 @@ with the following path and query parameters:
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Olingo4 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+olingo4:apiName/methodName
+----
+
+
+==== apiName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *data* (common) |  |  | Object
+| *edm* (common) |  |  | Edm
+| *endpointHttpHeaders* (common) |  |  | Map
+| *keyPredicate* (common) |  |  | String
+| *queryParams* (common) |  |  | Map
+| *resourcePath* (common) |  |  | String
+| *responseHandler* (common) |  |  | Olingo4ResponseHandler
+|===
 // endpoint options: END
 
 == Producer Endpoints
diff --git a/components/camel-twilio/src/generated/resources/org/apache/camel/component/twilio/twilio.json b/components/camel-twilio/src/generated/resources/org/apache/camel/component/twilio/twilio.json
index a75d452..9d13594 100644
--- a/components/camel-twilio/src/generated/resources/org/apache/camel/component/twilio/twilio.json
+++ b/components/camel-twilio/src/generated/resources/org/apache/camel/component/twilio/twilio.json
@@ -60,61 +60,61 @@
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apiProperties": {
-    "recording-add-on-result-payload": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathAddOnResultSid": { "kind": "parameter", "displayName": "Path Add On Result Sid", "group": "common", "label": "", "required": false, "type": "string", " [...]
-    "usage-record-today": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "account": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Fetch by unique Account Sid" } },
+    "address": { "city": { "kind": "parameter", "displayName": "City", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The city of the new address" }, "customerName": { "kind": "parameter", "displayName": "Customer Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name [...]
+    "address-dependent-phone-number": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" }, "pathAddressSid": { "kind": "parameter", "displayName": "Path Address Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "j [...]
+    "application": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false,  [...]
+    "available-phone-number-country": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the available phone number Country resource" }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "group": "common", "label": "", "required": false, "type": "s [...]
     "available-phone-number-country-local": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources" }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "group": "common", "label": "", "required": false, "type": "stri [...]
-    "call-recording": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecat [...]
-    "queue-member": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch" }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "de [...]
-    "usage-trigger": { "callbackUrl": { "kind": "parameter", "displayName": "Callback Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The URL we call when the trigger fires" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret" [...]
-    "usage-record-last-month": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
-    "usage-record-all-time": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
-    "recording-transcription": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathRecordingSid": { "kind": "parameter", "displayName": "Path Recording Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "ja [...]
-    "message": { "body": { "kind": "parameter", "displayName": "Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The text of the message you want to send. Can be up to 1,600 characters in length." }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.PhoneNumber", "deprecated": [...]
+    "available-phone-number-country-mobile": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources" }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "group": "common", "label": "", "required": false, "type": "str [...]
+    "available-phone-number-country-toll-free": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources" }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "group": "common", "label": "", "required": false, "type": " [...]
+    "call": { "applicationSid": { "kind": "parameter", "displayName": "Application Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Application resource that will handle the call" }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.Endpoint", "deprecated": false [...]
+    "call-feedback": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique sid that identifies this account" }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false [...]
     "call-feedback-summary": { "endDate": { "kind": "parameter", "displayName": "End Date", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.joda.time.LocalDate", "deprecated": false, "secret": false, "description": "Only include feedback given on or before this date" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "depre [...]
-    "sip-credential-list-credential": { "password": { "kind": "parameter", "displayName": "Password", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password will not be returned in the response" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "dep [...]
-    "new-key": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource" } },
-    "incoming-phone-number": { "areaCode": { "kind": "parameter", "displayName": "Area Code", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The desired area code for the new phone number" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
     "call-notification": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch" }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", " [...]
-    "validation-request": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account responsible for the new Caller ID" }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.Phone [...]
-    "usage-record-yesterday": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
-    "usage-record-this-month": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
-    "new-signing-key": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource" } },
+    "call-recording": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecat [...]
     "conference": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated":  [...]
-    "usage-record-daily": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
-    "application": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false,  [...]
-    "usage-record": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
-    "available-phone-number-country-mobile": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources" }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "group": "common", "label": "", "required": false, "type": "str [...]
     "conference-participant": { "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.PhoneNumber", "deprecated": false, "secret": false, "description": "The phone number, Client identifier, or username portion of SIP address that made this call." }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string" [...]
-    "recording-add-on-result": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathReferenceSid": { "kind": "parameter", "displayName": "Path Reference Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "ja [...]
-    "notification": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
-    "sip-domain-ip-access-control-list-mapping": { "ipAccessControlListSid": { "kind": "parameter", "displayName": "Ip Access Control List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique id of the IP access control list to map to the SIP domain" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": [...]
-    "sip-domain": { "domainName": { "kind": "parameter", "displayName": "Domain Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique address on Twilio to route SIP traffic" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false [...]
-    "address": { "city": { "kind": "parameter", "displayName": "City", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The city of the new address" }, "customerName": { "kind": "parameter", "displayName": "Customer Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name [...]
+    "connect-app": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": fa [...]
+    "incoming-phone-number": { "areaCode": { "kind": "parameter", "displayName": "Area Code", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The desired area code for the new phone number" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
+    "incoming-phone-number-local": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type. [...]
+    "incoming-phone-number-mobile": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type [...]
+    "incoming-phone-number-toll-free": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.t [...]
+    "key": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, " [...]
+    "message": { "body": { "kind": "parameter", "displayName": "Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The text of the message you want to send. Can be up to 1,600 characters in length." }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.PhoneNumber", "deprecated": [...]
+    "message-feedback": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", " [...]
     "message-media": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to delete" }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.Stri [...]
-    "sip-ip-access-control-list-ip-address": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable descriptive text for this resource, up to 64 characters long." }, "ipAddress": { "kind": "parameter", "displayName": "Ip Address", "group": "common", "label": "", "required": false, "type": "string", "j [...]
-    "available-phone-number-country": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the available phone number Country resource" }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "group": "common", "label": "", "required": false, "type": "s [...]
-    "usage-record-yearly": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "new-key": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource" } },
+    "new-signing-key": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource" } },
+    "notification": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
+    "outgoing-caller-id": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprec [...]
     "queue": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A string to describe this resource" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": fals [...]
-    "transcription": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated" [...]
+    "queue-member": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch" }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "de [...]
+    "recording": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": fa [...]
+    "recording-add-on-result": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathReferenceSid": { "kind": "parameter", "displayName": "Path Reference Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "ja [...]
+    "recording-add-on-result-payload": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathAddOnResultSid": { "kind": "parameter", "displayName": "Path Add On Result Sid", "group": "common", "label": "", "required": false, "type": "string", " [...]
+    "recording-transcription": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathRecordingSid": { "kind": "parameter", "displayName": "Path Recording Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "ja [...]
+    "short-code": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated":  [...]
+    "signing-key": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The account_sid" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The  [...]
+    "sip-credential-list": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Human readable descriptive text" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "se [...]
+    "sip-credential-list-credential": { "password": { "kind": "parameter", "displayName": "Password", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password will not be returned in the response" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "dep [...]
+    "sip-domain": { "domainName": { "kind": "parameter", "displayName": "Domain Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique address on Twilio to route SIP traffic" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false [...]
     "sip-domain-credential-list-mapping": { "credentialListSid": { "kind": "parameter", "displayName": "Credential List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A string that identifies the CredentialList resource to map to the SIP domain" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "t [...]
-    "call-feedback": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique sid that identifies this account" }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false [...]
-    "key": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, " [...]
-    "incoming-phone-number-toll-free": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.t [...]
+    "sip-domain-ip-access-control-list-mapping": { "ipAccessControlListSid": { "kind": "parameter", "displayName": "Ip Access Control List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique id of the IP access control list to map to the SIP domain" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": [...]
+    "sip-ip-access-control-list": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable description of this resource" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "de [...]
+    "sip-ip-access-control-list-ip-address": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable descriptive text for this resource, up to 64 characters long." }, "ipAddress": { "kind": "parameter", "displayName": "Ip Address", "group": "common", "label": "", "required": false, "type": "string", "j [...]
     "token": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" } },
-    "short-code": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated":  [...]
-    "available-phone-number-country-toll-free": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources" }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "group": "common", "label": "", "required": false, "type": " [...]
+    "transcription": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated" [...]
+    "usage-record": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "usage-record-all-time": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "usage-record-daily": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "usage-record-last-month": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
     "usage-record-monthly": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
-    "sip-ip-access-control-list": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable description of this resource" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "de [...]
-    "connect-app": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": fa [...]
-    "address-dependent-phone-number": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" }, "pathAddressSid": { "kind": "parameter", "displayName": "Path Address Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "j [...]
-    "signing-key": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The account_sid" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The  [...]
-    "outgoing-caller-id": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprec [...]
-    "call": { "applicationSid": { "kind": "parameter", "displayName": "Application Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Application resource that will handle the call" }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.Endpoint", "deprecated": false [...]
-    "incoming-phone-number-local": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type. [...]
-    "message-feedback": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", " [...]
-    "recording": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete" }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": fa [...]
-    "incoming-phone-number-mobile": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource" }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type [...]
-    "account": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Fetch by unique Account Sid" } },
-    "sip-credential-list": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Human readable descriptive text" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "se [...]
+    "usage-record-this-month": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "usage-record-today": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "usage-record-yearly": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "usage-record-yesterday": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read" } },
+    "usage-trigger": { "callbackUrl": { "kind": "parameter", "displayName": "Callback Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The URL we call when the trigger fires" }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret" [...]
+    "validation-request": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account responsible for the new Caller ID" }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.Phone [...]
   }
 }
diff --git a/components/camel-twilio/src/main/docs/twilio-component.adoc b/components/camel-twilio/src/main/docs/twilio-component.adoc
index 0dc44c5..ad1aa64 100644
--- a/components/camel-twilio/src/main/docs/twilio-component.adoc
+++ b/components/camel-twilio/src/main/docs/twilio-component.adoc
@@ -98,76 +98,506 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
-// endpoint options: END
 
 
 
-== URI format
 
-[source,java]
--------------------------------------------------
-    twilio://endpoint-prefix/endpoint?[options]
--------------------------------------------------
+=== Query API Parameters (56 APIs):
+
+The Twilio endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+twilio:apiName/methodName
+----
+
 
-Endpoint prefix can be one of:
-
-* account
-* address
-* address-dependent-phone-number
-* application
-* available-phone-number-country
-* available-phone-number-country-local
-* available-phone-number-country-mobile
-* available-phone-number-country-toll-free
-* call
-* call-feedback
-* call-feedback-summary
-* call-notification
-* call-recording
-* conference
-* conference-participant
-* connect-app
-* incoming-phone-number
-* incoming-phone-number-local
-* incoming-phone-number-mobile
-* incoming-phone-number-toll-free
-* key
-* message
-* message-feedback
-* message-media
-* new-key
-* new-signing-key
-* notification
-* outgoing-caller-id
-* queue
-* queue-member
-* recording
-* recording-add-on-result
-* recording-add-on-result-payload
-* recording-transcription
-* short-code
-* signing-key
-* sip-credential-list
-* sip-credential-list-credential
-* sip-domain
-* sip-domain-credential-list-mapping
-* sip-domain-ip-access-control-list-mapping
-* sip-ip-access-control-list
-* sip-ip-access-control-list-ip-address
-* token
-* transcription
-* usage-record
-* usage-record-all-time
-* usage-record-daily
-* usage-record-last-month
-* usage-record-monthly
-* usage-record-this-month
-* usage-record-today
-* usage-record-yearly
-* usage-record-yesterday
-* usage-trigger
-* validation-request
+==== apiName: account
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathSid* (common) | Fetch by unique Account Sid |  | String
+|===
+
+==== apiName: address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *city* (common) | The city of the new address |  | String
+| *customerName* (common) | The name to associate with the new address |  | String
+| *isoCountry* (common) | The ISO country code of the new address |  | String
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Address resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *postalCode* (common) | The postal code of the new address |  | String
+| *region* (common) | The state or region of the new address |  | String
+| *street* (common) | The number and street address of the new address |  | String
+|===
 
+==== apiName: address-dependent-phone-number
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+| *pathAddressSid* (common) | The SID of the Address resource associated with the phone number |  | String
+|===
+
+==== apiName: application
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: available-phone-number-country
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the available phone number Country resource |  | String
+| *pathCountryCode* (common) | The ISO country code of the country to fetch available phone number information about |  | String
+|===
+
+==== apiName: available-phone-number-country-local
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: available-phone-number-country-mobile
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: available-phone-number-country-toll-free
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: call
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *applicationSid* (common) | The SID of the Application resource that will handle the call |  | String
+| *from* (common) | Twilio number from which to originate the call |  | Endpoint
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+| *to* (common) | Phone number, SIP address, or client identifier to call |  | Endpoint
+| *twiml* (common) | TwiML instructions for the call |  | Twiml
+| *url* (common) | The absolute URL that returns TwiML for this call |  | URI
+|===
+
+==== apiName: call-feedback
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathCallSid* (common) | The call sid that uniquely identifies the call |  | String
+| *qualityScore* (common) | The call quality expressed as an integer from 1 to 5 |  | Integer
+|===
+
+==== apiName: call-feedback-summary
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *endDate* (common) | Only include feedback given on or before this date |  | LocalDate
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathSid* (common) | A string that uniquely identifies this feedback summary resource |  | String
+| *startDate* (common) | Only include feedback given on or after this date |  | LocalDate
+|===
+
+==== apiName: call-notification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathCallSid* (common) | The Call SID of the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: call-recording
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathCallSid* (common) | The SID of the Call to associate the resource with |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *status* (common) | The new status of the recording |  | Status
+|===
+
+==== apiName: conference
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: conference-participant
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *from* (common) | The phone number, Client identifier, or username portion of SIP address that made this call. |  | PhoneNumber
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathCallSid* (common) | The Call SID or URL encoded label of the participant to delete |  | String
+| *pathConferenceSid* (common) | The SID of the participant's conference |  | String
+| *to* (common) | The phone number, SIP address or Client identifier that received this call. |  | PhoneNumber
+|===
+
+==== apiName: connect-app
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: incoming-phone-number
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *areaCode* (common) | The desired area code for the new phone number |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-local
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-mobile
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-toll-free
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: message
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *body* (common) | The text of the message you want to send. Can be up to 1,600 characters in length. |  | String
+| *from* (common) | The phone number that initiated the message |  | PhoneNumber
+| *mediaUrl* (common) | The URL of the media to send with the message |  | List
+| *messagingServiceSid* (common) | The SID of the Messaging Service you want to associate with the message |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *to* (common) | The destination phone number |  | PhoneNumber
+|===
+
+==== apiName: message-feedback
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathMessageSid* (common) | The SID of the Message resource for which the feedback was provided |  | String
+|===
+
+==== apiName: message-media
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to delete |  | String
+| *pathMessageSid* (common) | The SID of the Message resource that this Media resource belongs to |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: new-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Key resource |  | String
+|===
+
+==== apiName: new-signing-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Key resource |  | String
+|===
+
+==== apiName: notification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: outgoing-caller-id
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: queue
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A string to describe this resource |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: queue-member
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathCallSid* (common) | The Call SID of the resource(s) to fetch |  | String
+| *pathQueueSid* (common) | The SID of the Queue in which to find the members |  | String
+| *url* (common) | The absolute URL of the Queue resource |  | URI
+|===
+
+==== apiName: recording
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: recording-add-on-result
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathReferenceSid* (common) | The SID of the recording to which the result to delete belongs |  | String
+| *pathSid* (common) | The unique string that identifies the resource to delete |  | String
+|===
+
+==== apiName: recording-add-on-result-payload
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathAddOnResultSid* (common) | The SID of the AddOnResult to which the payloads to delete belongs |  | String
+| *pathReferenceSid* (common) | The SID of the recording to which the AddOnResult resource that contains the payloads to delete belongs |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: recording-transcription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathRecordingSid* (common) | The SID of the recording that created the transcription to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: short-code
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: signing-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The account_sid |  | String
+| *pathSid* (common) | The sid |  | String
+|===
+
+==== apiName: sip-credential-list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | Human readable descriptive text |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathSid* (common) | Delete by unique credential list Sid |  | String
+|===
+
+==== apiName: sip-credential-list-credential
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *password* (common) | The password will not be returned in the response |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathCredentialListSid* (common) | The unique id that identifies the credential list to include the created credential |  | String
+| *pathSid* (common) | The unique id that identifies the resource to delete |  | String
+| *username* (common) | The username for this credential |  | String
+|===
+
+==== apiName: sip-domain
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *domainName* (common) | The unique address on Twilio to route SIP traffic |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: sip-domain-credential-list-mapping
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *credentialListSid* (common) | A string that identifies the CredentialList resource to map to the SIP domain |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathDomainSid* (common) | A string that identifies the SIP Domain for which the CredentialList resource will be mapped |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: sip-domain-ip-access-control-list-mapping
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *ipAccessControlListSid* (common) | The unique id of the IP access control list to map to the SIP domain |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathDomainSid* (common) | A string that uniquely identifies the SIP Domain |  | String
+| *pathSid* (common) | A 34 character string that uniquely identifies the resource to delete. |  | String
+|===
+
+==== apiName: sip-ip-access-control-list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A human readable description of this resource |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: sip-ip-access-control-list-ip-address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A human readable descriptive text for this resource, up to 64 characters long. |  | String
+| *ipAddress* (common) | An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today. |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathIpAccessControlListSid* (common) | The IpAccessControlList Sid with which to associate the created IpAddress resource |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: token
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+|===
+
+==== apiName: transcription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: usage-record
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-all-time
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-daily
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-last-month
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-monthly
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-this-month
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-today
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-yearly
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-yesterday
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-trigger
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *callbackUrl* (common) | The URL we call when the trigger fires |  | URI
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *triggerValue* (common) | The usage value at which the trigger should fire |  | String
+| *usageCategory* (common) | The usage category the trigger watches |  | UsageCategory
+|===
+
+==== apiName: validation-request
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account responsible for the new Caller ID |  | String
+| *phoneNumber* (common) | The phone number to verify in E.164 format |  | PhoneNumber
+|===
+// endpoint options: END
 
 == Producer Endpoints:
 
diff --git a/components/camel-zendesk/src/main/docs/zendesk-component.adoc b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
index 2ab1b0d..dd8da2d 100644
--- a/components/camel-zendesk/src/main/docs/zendesk-component.adoc
+++ b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
@@ -104,6 +104,140 @@ with the following path and query parameters:
 | *token* (security) | The security token. |  | String
 | *username* (security) | The user name. |  | String
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Zendesk endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the methodName path parameter:
+
+----
+zendesk:methodName
+----
+
+
+==== methodName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *article* (common) |  |  | Article
+| *articleAttachments* (common) |  |  | ArticleAttachments
+| *articleId* (common) |  |  | Long
+| *articleId0* (common) |  |  | Long
+| *attachment* (common) |  |  | Attachment
+| *attachments* (common) |  |  | List
+| *audit* (common) |  |  | Audit
+| *auditId* (common) |  |  | Long
+| *automation* (common) |  |  | Automation
+| *automationId* (common) |  |  | Long
+| *automationId0* (common) |  |  | Long
+| *category* (common) |  |  | Category
+| *categoryId* (common) |  |  | Long
+| *category_id* (common) |  |  | Long
+| *comment* (common) |  |  | Comment
+| *commentId* (common) |  |  | Long
+| *content* (common) |  |  | byte[]
+| *contentType* (common) |  |  | String
+| *email* (common) |  |  | String
+| *endTime* (common) |  |  | Date
+| *externalId* (common) |  |  | String
+| *field* (common) |  |  | Field
+| *file* (common) |  |  | File
+| *fileName* (common) |  |  | String
+| *forum* (common) |  |  | Forum
+| *forum_id* (common) |  |  | Long
+| *group* (common) |  |  | Group
+| *groupMembership* (common) |  |  | GroupMembership
+| *group_id* (common) |  |  | Long
+| *group_membership_id* (common) |  |  | Long
+| *id* (common) |  |  | Long
+| *idArticle* (common) |  |  | String
+| *identity* (common) |  |  | Identity
+| *identityId* (common) |  |  | Long
+| *ids* (common) |  |  | long[]
+| *includeArchived* (common) |  |  | Boolean
+| *inline* (common) |  |  | Boolean
+| *installationId* (common) |  |  | Integer
+| *item* (common) |  |  | DynamicContentItem
+| *itemId* (common) |  |  | Long
+| *json* (common) |  |  | String
+| *labels* (common) |  |  | List
+| *locale* (common) |  |  | String
+| *macro* (common) |  |  | Macro
+| *macroId* (common) |  |  | Long
+| *macroId0* (common) |  |  | Long
+| *monitorId* (common) |  |  | Long
+| *name* (common) |  |  | String
+| *newPassword* (common) |  |  | String
+| *notifySubscribers* (common) |  |  | Boolean
+| *oldPassword* (common) |  |  | String
+| *order* (common) |  |  | SortOrder
+| *organization* (common) |  |  | Organization
+| *organizationId* (common) |  |  | Long
+| *organizationList* (common) |  |  | List
+| *organizationMembership* (common) |  |  | OrganizationMembership
+| *organizationMembershipList* (common) |  |  | List
+| *organizationMemberships* (common) |  |  | OrganizationMembership[]
+| *organization_id* (common) |  |  | Long
+| *organization_membership_id* (common) |  |  | Long
+| *organizations* (common) |  |  | Organization[]
+| *page* (common) |  |  | Integer
+| *parameters* (common) |  |  | String
+| *params* (common) |  |  | Map
+| *password* (common) |  |  | String
+| *permissionGroup* (common) |  |  | PermissionGroup
+| *query* (common) |  |  | String
+| *request* (common) |  |  | Request
+| *requestId* (common) |  |  | Long
+| *role* (common) |  |  | String
+| *roles* (common) |  |  | String[]
+| *satisfactionRating* (common) |  |  | SatisfactionRating
+| *schedule* (common) |  |  | Schedule
+| *scheduleId* (common) |  |  | Long
+| *searchTerm* (common) |  |  | String
+| *section* (common) |  |  | Section
+| *sectionId* (common) |  |  | Long
+| *sortBy* (common) |  |  | String
+| *sortOrder* (common) |  |  | SortOrder
+| *startTime* (common) |  |  | Date
+| *status* (common) |  |  | JobStatus
+| *statuses* (common) |  |  | List
+| *suspendedTicket* (common) |  |  | SuspendedTicket
+| *tags* (common) |  |  | String[]
+| *target* (common) |  |  | Target
+| *targetId* (common) |  |  | Long
+| *ticket* (common) |  |  | Ticket
+| *ticketForm* (common) |  |  | TicketForm
+| *ticketId* (common) |  |  | Long
+| *ticketId0* (common) |  |  | Long
+| *ticketImport* (common) |  |  | TicketImport
+| *ticketList* (common) |  |  | List
+| *tickets* (common) |  |  | Ticket[]
+| *token* (common) |  |  | String
+| *topic* (common) |  |  | Topic
+| *translation* (common) |  |  | Translation
+| *translationId* (common) |  |  | Long
+| *trigger* (common) |  |  | Trigger
+| *triggerId* (common) |  |  | Long
+| *triggerId0* (common) |  |  | Long
+| *tweetId* (common) |  |  | Long
+| *type* (common) |  |  | Class
+| *unixEpochTime* (common) |  |  | Long
+| *upload* (common) |  |  | Upload
+| *user* (common) |  |  | User
+| *userId* (common) |  |  | Long
+| *userId0* (common) |  |  | Long
+| *userIdThatWillBeMerged* (common) |  |  | Long
+| *userIdThatWillRemain* (common) |  |  | Long
+| *userList* (common) |  |  | List
+| *userSegment* (common) |  |  | UserSegment
+| *user_id* (common) |  |  | Long
+| *users* (common) |  |  | User[]
+| *usersList* (common) |  |  | List
+| *variant* (common) |  |  | DynamicContentItemVariant
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/as2-component.adoc b/docs/components/modules/ROOT/pages/as2-component.adoc
index a1b7c6b..6a115ae 100644
--- a/docs/components/modules/ROOT/pages/as2-component.adoc
+++ b/docs/components/modules/ROOT/pages/as2-component.adoc
@@ -142,6 +142,49 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The AS2 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+as2:apiName/methodName
+----
+
+
+==== apiName: client
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *as2From* (common) | AS2 name of sender |  | String
+| *as2MessageStructure* (common) | The structure of AS2 to send; see |  | AS2MessageStructure
+| *as2To* (common) | AS2 name of recipient |  | String
+| *compressionAlgorithm* (common) | The algorithm used to compress the message or |  | AS2CompressionAlgorithm
+| *dispositionNotificationTo* (common) | An RFC2822 address to request a receipt or |  | String
+| *ediMessage* (common) | EDI message to transport |  | String
+| *ediMessageContentType* (common) | The content typw of EDI message |  | ContentType
+| *ediMessageTransferEncoding* (common) | The transfer encoding used to transport EDI message |  | String
+| *encryptingAlgorithm* (common) | The algorithm used to encrypt the message or |  | AS2EncryptionAlgorithm
+| *encryptingCertificateChain* (common) | The chain of certificates used to encrypt the message or |  | Certificate[]
+| *from* (common) | RFC2822 address of sender |  | String
+| *requestUri* (common) | Resource location to deliver message |  | String
+| *signedReceiptMicAlgorithms* (common) | The senders list of signing algorithms for signing receipt, in preferred order, or |  | String[]
+| *signingAlgorithm* (common) | The algorithm used to sign the message or |  | AS2SignatureAlgorithm
+| *signingCertificateChain* (common) | The chain of certificates used to sign the message or |  | Certificate[]
+| *signingPrivateKey* (common) | The private key used to sign EDI message |  | PrivateKey
+| *subject* (common) | Message subject |  | String
+|===
+
+==== apiName: server
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *requestUriPattern* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/box-component.adoc b/docs/components/modules/ROOT/pages/box-component.adoc
index ed8d5e9..2729537 100644
--- a/docs/components/modules/ROOT/pages/box-component.adoc
+++ b/docs/components/modules/ROOT/pages/box-component.adoc
@@ -152,6 +152,171 @@ with the following path and query parameters:
 | *userName* (security) | Box user name, MUST be provided |  | String
 | *userPassword* (security) | Box user password, MUST be provided if authSecureStorage is not set, or returns null on first call |  | String
 |===
+
+
+
+
+=== Query API Parameters (10 APIs):
+
+The Box endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+box:apiName/methodName
+----
+
+
+==== apiName: collaborations
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *collaborationId* (common) | The id of comment to change |  | String
+| *collaborator* (common) | The collaborator to add |  | BoxCollaborator
+| *email* (common) | The email address of the collaborator to add |  | String
+| *folderId* (common) | The id of folder to add collaboration to |  | String
+| *info* (common) |  |  | Info
+| *role* (common) | The role of the collaborator |  | Role
+|===
+
+==== apiName: comments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) | The id of comment to change |  | String
+| *fileId* (common) | The id of file to rename |  | String
+| *message* (common) | The comment's message |  | String
+|===
+
+==== apiName: event-logs
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *after* (common) | The lower bound on the timestamp of the events returned |  | Date
+| *before* (common) | The upper bound on the timestamp of the events returned |  | Date
+| *position* (common) | The starting position of the event stream. May be |  | String
+| *types* (common) | An optional list of event types to filter by |  | Type[]
+|===
+
+==== apiName: events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *startingPosition* (common) | The starting position of the event stream |  | Long
+|===
+
+==== apiName: files
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *access* (common) | The access level of the shared link |  | Access
+| *check* (common) | If the file name is already used, call the uploadNewVersion instead. |  | Boolean
+| *content* (common) | A stream containing contents of the file to upload |  | InputStream
+| *created* (common) | The content created date that will be given to the uploaded file |  | Date
+| *destinationFolderId* (common) | The id of the destination folder |  | String
+| *fields* (common) | The information fields to retrieve; if |  | String[]
+| *fileContent* (common) | A stream containing contents of the file to upload |  | InputStream
+| *fileId* (common) | The id of file to copy |  | String
+| *fileName* (common) | The name to give the uploaded file |  | String
+| *fileSize* (common) | The size of the file's content used for monitoring the upload's progress |  | Long
+| *fileType* (common) | Either PNG of JPG |  | ThumbnailFileType
+| *info* (common) | The updated information |  | Info
+| *listener* (common) | A listener for monitoring the download's progress; if |  | ProgressListener
+| *maxHeight* (common) | Maximum height |  | Integer
+| *maxWidth* (common) | Maximum width |  | Integer
+| *metadata* (common) | The new metadata values |  | Metadata
+| *minHeight* (common) | Minimum height |  | Integer
+| *minWidth* (common) | Minimum width |  | Integer
+| *modified* (common) | The content modified date that will be given to the uploaded file |  | Date
+| *newFileName* (common) | The new name of file |  | String
+| *newName* (common) | Is |  | String
+| *output* (common) | The stream to which the file contents will be written |  | OutputStream
+| *parentFolderId* (common) | The id of parent folder |  | String
+| *permissions* (common) | Is |  | Permissions
+| *rangeEnd* (common) | The byte offset in file at which to stop the download; if |  | Long
+| *rangeStart* (common) | The byte offset in file at which to start the download; if |  | Long
+| *size* (common) | The size of the file's content used for monitoring the upload's progress.Skip navigation links |  | Long
+| *typeName* (common) | The metadata template type name; if |  | String
+| *unshareDate* (common) | The date and time at which time the created shared link will expire; if |  | Date
+| *version* (common) | The version of file to delete; initial version of file has value of |  | Integer
+|===
+
+==== apiName: folders
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *access* (common) | The access level of the shared link |  | Access
+| *destinationFolderId* (common) | The id of the destination folder |  | String
+| *fields* (common) | The information fields to retrieve; if |  | String[]
+| *folderId* (common) | The id of folder to copy |  | String
+| *folderName* (common) | The name of created folder |  | String
+| *info* (common) | The updated information |  | Info
+| *limit* (common) | The maximum number of children to retrieve after the offset; if |  | Long
+| *newFolderName* (common) | The new name of folder |  | String
+| *newName* (common) | Is |  | String
+| *offset* (common) | The index of first child item to retrieve; if |  | Long
+| *parentFolderId* (common) | The id of parent folder |  | String
+| *path* (common) | Sequence of Box folder names from parent folder to returned folder |  | String[]
+| *permissions* (common) | Is |  | Permissions
+| *unshareDate* (common) | The date and time at which time the created shared link will expire; if |  | Date
+|===
+
+==== apiName: groups
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *description* (common) | The description of the new group |  | String
+| *externalSyncIdentifier* (common) | The external_sync_identifier of the new group |  | String
+| *groupId* (common) | The id of group |  | String
+| *groupInfo* (common) | The updated information |  | Info
+| *groupMembershipId* (common) | The id of group membership to delete |  | String
+| *info* (common) | The updated information |  | Info
+| *invitabilityLevel* (common) | The invitibility_level of the new group |  | String
+| *memberViewabilityLevel* (common) | The member_viewability_level of the new group |  | String
+| *name* (common) | The name of the new group |  | String
+| *provenance* (common) | The provenance of the new group |  | String
+| *role* (common) | The role of the user in this group. Can be |  | Role
+| *userId* (common) | The id of user to be added to group |  | String
+|===
+
+==== apiName: search
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *folderId* (common) | The id of folder searched |  | String
+| *query* (common) | The search query |  | String
+|===
+
+==== apiName: tasks
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *action* (common) | The action the task assignee will be prompted to do |  | Action
+| *assignTo* (common) | The user to assign to task |  | BoxUser
+| *dueAt* (common) | The day at which this task is due |  | Date
+| *fileId* (common) | The id of file to add task to |  | String
+| *info* (common) | The updated information |  | Info
+| *message* (common) | An optional message to include with the task |  | String
+| *taskAssignmentId* (common) | The id of task assignment to delete.Skip navigation links |  | String
+| *taskId* (common) | The id of task to add assignment for |  | String
+|===
+
+==== apiName: users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *email* (common) | The email address to add as an alias |  | String
+| *emailAliasId* (common) | The id of the email alias to delete |  | String
+| *fields* (common) | The fields to retrieve. Leave this out for the standard fields. |  | String[]
+| *filterTerm* (common) | The filter term to lookup users by (login for external, login or name for managed); if |  | String
+| *force* (common) | Whether or not this user should be deleted even if they still own files |  | Boolean
+| *info* (common) | The updated information |  | Info
+| *login* (common) | The email address the user will use to login |  | String
+| *name* (common) | The name of the user |  | String
+| *notifyUser* (common) | Whether or not to send an email notification to the user that their account has been deleted |  | Boolean
+| *params* (common) | Additional user information |  | CreateUserParams
+| *sourceUserId* (common) | The user id of the user whose files will be the source for this operation.Skip navigation links |  | String
+| *userId* (common) | The id of user |  | String
+|===
 // endpoint options: END
 
 == URI format
diff --git a/docs/components/modules/ROOT/pages/braintree-component.adoc b/docs/components/modules/ROOT/pages/braintree-component.adoc
index e08495d..914e987 100644
--- a/docs/components/modules/ROOT/pages/braintree-component.adoc
+++ b/docs/components/modules/ROOT/pages/braintree-component.adoc
@@ -125,70 +125,154 @@ with the following path and query parameters:
 | *privateKey* (security) | The private key provided by Braintree. |  | String
 | *publicKey* (security) | The public key provided by Braintree. |  | String
 |===
-// endpoint options: END
 
 
 
-== URI format
 
- 
+=== Query API Parameters (14 APIs):
 
-[source,java]
----------------------------------------------
-braintree://endpoint-prefix/endpoint?[options]
----------------------------------------------
+The Braintree endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
 
- 
+----
+braintree:apiName/methodName
+----
 
-Endpoint prefix can be one of:
-
-* addOn
-* address
-* clientToken
-* creditCardverification
-* customer
-* discount
-* dispute
-* documentUpload
-* merchantAccount
-* paymentmethod
-* paymentmethodNonce
-* plan
-* report
-* settlementBatchSummary
-* subscription
-* transaction
-* webhookNotification
 
- 
+==== apiName: address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *customerId* (common) | The id of the |  | String
+| *id* (common) | The id of the |  | String
+| *request* (common) | The request object |  | AddressRequest
+|===
 
-== BraintreeComponent
+==== apiName: clientToken
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) |  |  | ClientTokenRequest
+|===
 
-The Braintree Component can be configured with the options below. These
-options can be provided using the component's bean
-property *configuration* of
-type *org.apache.camel.component.braintree.BraintreeConfiguration*.
+==== apiName: creditCardVerification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (common) |  |  | String
+| *query* (common) |  |  | CreditCardVerificationSearchRequest
+| *request* (common) |  |  | CreditCardVerificationRequest
+|===
 
-[cols="<,<,<",options="header",]
-|=======================================================================
-|Option |Type |Description
-|environment |String |Value that specifies where requests should be
-directed – sandbox or production
+==== apiName: customer
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *associationFilterId* (common) | The id of the association filter to use |  | String
+| *id* (common) | The id of the |  | String
+| *query* (common) | The request query to use for search |  | CustomerSearchRequest
+| *request* (common) | The request |  | CustomerRequest
+|===
 
-|merchantId |String |A unique identifier for your gateway account, which
-is different than your merchant account ID
+==== apiName: dispute
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) | The content of the text evidence for the dispute |  | String
+| *disputeId* (common) | The dispute id to add text evidence to |  | String
+| *documentId* (common) | The document id of a previously uploaded document |  | String
+| *evidenceId* (common) | The evidence id to remove |  | String
+| *fileEvidenceRequest* (common) | The file evidence request for the dispute |  | FileEvidenceRequest
+| *id* (common) | The dispute id to accept |  | String
+| *query* (common) | The query for what disputes to find |  | DisputeSearchRequest
+| *textEvidenceRequest* (common) | The text evidence request for the dispute |  | TextEvidenceRequest
+|===
 
-|publicKey |String |User-specific public identifier
+==== apiName: documentUpload
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) |  |  | DocumentUploadRequest
+|===
 
-|privateKey |String |User-specific secure identifier that should not be
-shared – even with us!
+==== apiName: merchantAccount
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *currencyRequest* (common) |  |  | MerchantAccountCreateForCurrencyRequest
+| *id* (common) |  |  | String
+| *page* (common) |  |  | Integer
+| *request* (common) |  |  | MerchantAccountRequest
+|===
+
+==== apiName: paymentMethod
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *deleteRequest* (common) |  |  | PaymentMethodDeleteRequest
+| *grantRequest* (common) |  |  | PaymentMethodGrantRequest
+| *request* (common) |  |  | PaymentMethodRequest
+| *token* (common) |  |  | String
+|===
+
+==== apiName: paymentMethodNonce
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *paymentMethodNonce* (common) |  |  | String
+| *paymentMethodToken* (common) |  |  | String
+| *request* (common) |  |  | PaymentMethodNonceRequest
+|===
+
+==== apiName: report
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *request* (common) | The request |  | TransactionLevelFeeReportRequest
+|===
 
-|accessToken |String |Token granted to a merchant using Braintree Auth
-allowing them to process transactions on another's behalf. Used in place
-of the environment, merchantId, publicKey and privateKey options.
-|=======================================================================
+==== apiName: settlementBatchSummary
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *groupByCustomField* (common) |  |  | String
+| *settlementDate* (common) |  |  | Calendar
+|===
+
+==== apiName: subscription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *amount* (common) |  |  | BigDecimal
+| *customerId* (common) |  |  | String
+| *id* (common) | Of the |  | String
+| *request* (common) | The request |  | SubscriptionRequest
+| *searchRequest* (common) | The |  | SubscriptionSearchRequest
+| *submitForSettlement* (common) |  |  | Boolean
+| *subscriptionId* (common) |  |  | String
+|===
+
+==== apiName: transaction
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *amount* (common) |  |  | BigDecimal
+| *cloneRequest* (common) |  |  | TransactionCloneRequest
+| *id* (common) | Of the transaction to cancel release from escrow of |  | String
+| *query* (common) | The search query |  | TransactionSearchRequest
+| *refundRequest* (common) |  |  | TransactionRefundRequest
+| *request* (common) | The request |  | TransactionRequest
+|===
 
-All the options above are provided by Braintree Payments
+==== apiName: webhookNotification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *challenge* (common) |  |  | String
+| *payload* (common) |  |  | String
+| *signature* (common) |  |  | String
+|===
+// endpoint options: END
 
 == Producer Endpoints:
 
@@ -212,600 +296,6 @@ For more information on the endpoints and options see Braintree
 references
 at https://developers.braintreepayments.com/reference/overview[https://developers.braintreepayments.com/reference/overview]
 
- 
-
-=== Endpoint prefix _addOn_
-
-The following endpoints can be invoked with the prefix *addOn* as
-follows:
-
- 
-
-[source,java]
---------------------------
-braintree://addOn/endpoint
---------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Addon>
-|====================================================
-
-=== Endpoint prefix _address_
-
-The following endpoints can be invoked with the prefix *address* as
-follows:
-
- 
-
-[source,java]
---------------------------------------
-braintree://address/endpoint?[options]
---------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |customerId, request
-|com.braintreegateway.Result<com.braintreegateway.Address>
-
-|delete |  |customerId, id
-|com.braintreegateway.Result<com.braintreegateway.Address> 
-
-|find |  |customerId, id |com.braintreegateway.Address
-
-|update |  |customerId, id, request
-|com.braintreegateway.Result<com.braintreegateway.Address> 
-|=======================================================================
-
-[[Braintree-URIOptionsforaddress]]
-URI Options for _address_
-
-[cols="<,<",options="header",]
-|============================================
-|Name |Type
-|customerId |String
-|request |com.braintreegateway.AddressRequest
-|id |String
-|============================================
-
-=== Endpoint prefix _clientToken_
-
-The following endpoints can be invoked with the prefix *clientToken* as
-follows:
-
- 
-
-[source,java]
-------------------------------------------
-braintree://clientToken/endpoint?[options]
-------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|generate |  | request |String
-|====================================================
-
-[[Braintree-URIOptionsforclientToken]]
-URI Options for _clientToken_
-
-[cols="<,<",options="header",]
-|================================================
-|Name |Type
-|request |com.braintreegateway.ClientTokenrequest
-|================================================
-
-=== Endpoint prefix _creditCardVerification_
-
-The following endpoints can be invoked with the
-prefix *creditCardverification* as follows:
-
- 
-
-[source,java]
------------------------------------------------------
-braintree://creditCardVerification/endpoint?[options]
------------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|find |  | id |com.braintreegateway.CreditCardVerification
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.CreditCardVerification>
-|=======================================================================
-
-[[Braintree-URIOptionsforcreditCardVerification]]
-URI Options for _creditCardVerification_
-
-[cols="<,<",options="header",]
-|===============================================================
-|Name |Type
-|id |String
-|query |com.braintreegateway.CreditCardVerificationSearchRequest
-|===============================================================
-
-=== Endpoint prefix _customer_
-
-The following endpoints can be invoked with the prefix *customer* as
-follows:
-
- 
-
-[source,java]
----------------------------------------
-braintree://customer/endpoint?[options]
----------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  | 
-
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-
-|delete |  |id
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-
-|find |  |id |com.braintreegateway.Customer
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Customer>
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.Customer>
-|=======================================================================
-
-[[Braintree-URIOptionsforcustomer]]
-URI Options for _customer_
-
-[cols="<,<",options="header",]
-|=================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.CustomerRequest
-|query |com.braintreegateway.CustomerSearchRequest
-|=================================================
-
-=== Endpoint prefix _discount_
-
-The following endpoints can be invoked with the prefix *discount* as
-follows:
-
- 
-
-[source,java]
------------------------------
-braintree://discount/endpoint
------------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Discount>
-|====================================================
-
- +
-
- +
-
-=== Endpoint prefix _dispute_
-
-The following endpoints can be invoked with the prefix *dispute* as
-follows:
-
-[source,java]
-----------------------------------------------
-braintree://dispute/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|accept |  |id
-|com.braintreegateway.Result
-
-|addFileEvidence |  |disputeId, documentId
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addFileEvidence |  |disputeId, fileEvidenceRequest
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addTextEvidence |  |disputeId, content
-|com.braintreegateway.Result<DisputeEvidence>
-
-|addTextEvidence |  |disputeId, textEvidenceRequest
-|com.braintreegateway.Result<DisputeEvidence>
-
-|finalize |  |id
-|com.braintreegateway.Result
-
-|find |  |id
-|com.braintreegateway.Dispute
-
-|removeEvidence |  |id
-|com.braintreegateway.Result
-
-|search |  | disputeSearchRequest
-|com.braintreegateway.PaginatedCollection<com.braintreegateway.Dispute>
-|=======================================================================
-
-[[Braintree-URIOptionsfordispute]]
-URI Options for _dispute_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|id |String
-|disputeId |String
-|documentId |String
-|fileEvidenceRequest |com.braintreegateway.FileEvidenceRequest
-|content |String |
-|textEvidenceRequest |com.braintreegateway.TextEvidenceRequest
-|disputeSearchRequest |com.braintreegateway.DisputeSearchRequest
-|==========================================================
-
-
-=== Endpoint prefix _documentUpload_
-
-The following endpoints can be invoked with the prefix *documentUpload* as
-follows:
-
-[source,java]
-----------------------------------------------
-braintree://documentUpload/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.DocumentUpload>
-|=======================================================================
-
-[[Braintree-URIOptionsfordocumentUpload]]
-URI Options for _documentUpload_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|request |com.braintreegateway.DocumentUploadRequest
-|==========================================================
-
-
-=== Endpoint prefix _merchantAccount_
-
-The following endpoints can be invoked with the
-prefix *merchantAccount* as follows:
-
- 
-
-[source,java]
-----------------------------------------------
-braintree://merchantAccount/endpoint?[options]
-----------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-
-|createForCurrency |  |currencyRequest
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-
-|find |  |id |com.braintreegateway.MerchantAccount
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
-|=======================================================================
-
-[[Braintree-URIOptionsformerchantAccount]]
-URI Options for _merchantAccount_
-
-[cols="<,<",options="header",]
-|====================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.MerchantAccountRequest
-|currencyRequest |com.braintreegateway.MerchantAccountCreateForCurrencyRequest
-|====================================================
-
-=== Endpoint prefix _paymentMethod_
-
-The following endpoints can be invoked with the
-prefix *paymentMethod* as follows:
-
- 
-
-[source,java]
---------------------------------------------
-braintree://paymentMethod/endpoint?[options]
---------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-
-|delete |  |token, deleteRequest
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-
-|find |  |token |com.braintreegateway.PaymentMethod
-
-|update |  |token, request
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
-|=======================================================================
-
-[[Braintree-URIOptionsforpaymentMethod]]
-URI Options for _paymentMethod_
-
-[cols="<,<",options="header",]
-|==================================================
-|Name |Type
-|token |String
-|request |com.braintreegateway.PaymentMethodRequest
-|deleteRequest |com.braintreegateway.PaymentMethodDeleteRequest
-|==================================================
-
-=== Endpoint prefix _paymentMethodNonce_
-
-The following endpoints can be invoked with the
-prefix *paymentMethodNonce* as follows:
-
- 
-
-[source,java]
--------------------------------------------------
-braintree://paymentMethodNonce/endpoint?[options]
--------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |paymentMethodToken
-|com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce>
-
-|find |  |paymentMethodNonce |com.braintreegateway.PaymentMethodNonce
-|=======================================================================
-
-[[Braintree-URIOptionsforpaymentMethodNonce]]
-URI Options for _paymentMethodNonce_
-
-[cols="<,<",options="header",]
-|==========================
-|Name |Type
-|paymentMethodToken |String
-|paymentMethodNonce |String
-|==========================
-
-=== Endpoint prefix _plan_
-
-The following endpoints can be invoked with the prefix *plan* as
-follows:
-
- 
-
-[source,java]
--------------------------
-braintree://plan/endpoint
--------------------------
-
-[cols="<,<,<,<",options="header",]
-|====================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Plan>
-|====================================================
-
-
-=== Endpoint prefix _report_
-
-The following endpoints can be invoked with the prefix *report* as
-follows:
-
-[source,java]
----------------------------------
-braintree://plan/report?[options]
----------------------------------
-
-[cols="<,<,<,<",options="header",]
-|==============================================================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|transactionLevelFees |  | request |com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport>
-|==============================================================================================================
-
-[[Braintree-URIOptionsfortreport]]
-URI Options for _report_
-
-[cols="<,<",options="header",]
-|==============================================================
-|Name |Type
-|request |com.braintreegateway.TransactionLevelFeeReportRequest
-|==============================================================
-
-
-=== Endpoint prefix _settlementBatchSummary_
-
-The following endpoints can be invoked with the
-prefix *settlementBatchSummary* as follows:
-
- 
-
-[source,java]
------------------------------------------------------
-braintree://settlementBatchSummary/endpoint?[options]
------------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|generate |  | request
-|com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary>
-|=======================================================================
-
-[[Braintree-URIOptionsforsettlementBatchSummary]]
-URI Options for _settlementBatchSummary_
-
-[cols="<,<",options="header",]
-|==========================
-|Name |Type
-|settlementDate |Calendar
-|groupByCustomField |String
-|==========================
-
-=== Endpoint prefix _subscription_
-
-The following endpoints can be invoked with the prefix *subscription* as
-follows:
-
- 
-
-[source,java]
--------------------------------------------
-braintree://subscription/endpoint?[options]
--------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|cancel |  | id
-| com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|create |  |request
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|delete |  |customerId, id
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-
-|find |  |id |com.braintreegateway.Subscription
-
-|retryCharge |  |subscriptionId, amount
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|search |  |searchRequest
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Subscription>
-
-|update |  |id, request
-|com.braintreegateway.Result<com.braintreegateway.Subscription>
-|=======================================================================
-
-[[Braintree-URIOptionsforsubscription]]
-URI Options for _subscription_
-
-[cols="<,<",options="header",]
-|==============================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.SubscriptionRequest
-|customerId |String
-|subscriptionId |String
-|amount |BigDecimal
-|searchRequest |com.braintreegateway.SubscriptionSearchRequest.
-|==============================================================
-
- 
-
-=== Endpoint prefix _transaction_
-
-The following endpoints can be invoked with the prefix *transaction* as
-follows:
-
- 
-
-[source,java]
-------------------------------------------
-braintree://transaction/endpoint?[options]
-------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|cancelRelease |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|cloneTransaction |  |id, cloneRequest
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|credit |  |request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|find |  |id |com.braintreegateway.Transaction
-
-|holdInEscrow |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|releaseFromEscrow |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|refund |  |id, amount, refundRequest
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|sale |  |request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|search |  |query
-|com.braintreegateway.ResourceCollection<com.braintreegateway.Transaction>
-
-|submitForPartialSettlement |  |id, amount
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|submitForSettlement |  |id, amount, request
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-
-|voidTransaction |  |id
-|com.braintreegateway.Result<com.braintreegateway.Transaction>
-|=======================================================================
-
-[[Braintree-URIOptionsfortransaction]]
-URI Options for _transaction_
-
-[cols="<,<",options="header",]
-|==========================================================
-|Name |Type
-|id |String
-|request |com.braintreegateway.TransactionCloneRequest
-|cloneRequest |com.braintreegateway.TransactionCloneRequest
-|refundRequest |com.braintreegateway.TransactionRefundRequest
-|amount |BigDecimal
-|query |com.braintreegateway.TransactionSearchRequest
-|==========================================================
-
-=== Endpoint prefix _webhookNotification_
-
-The following endpoints can be invoked with the
-prefix *webhookNotification* as follows:
-
- 
-
-[source,java]
---------------------------------------------------
-braintree://webhookNotification/endpoint?[options]
---------------------------------------------------
-
-[cols="<,<,<,<",options="header",]
-|=======================================================================
-|Endpoint |Shorthand Alias |Options |Result Body Type
-|parse |  | signature, payload |com.braintreegateway.WebhookNotification
-|verify |  |challenge |String
-|=======================================================================
-
-[[Braintree-URIOptionsforwebhookNotification]]
-URI Options for _webhookNotification_
-
-[cols="<,<",options="header",]
-|=================
-|Name |Type
-|signature |String
-|payload |String
-|challenge |String
-|=================
-
- 
 
 == Consumer Endpoints
 
diff --git a/docs/components/modules/ROOT/pages/fhir-component.adoc b/docs/components/modules/ROOT/pages/fhir-component.adoc
index 43d7a1a..2d7a34c 100644
--- a/docs/components/modules/ROOT/pages/fhir-component.adoc
+++ b/docs/components/modules/ROOT/pages/fhir-component.adoc
@@ -168,6 +168,173 @@ with the following path and query parameters:
 | *password* (security) | Username to use for basic authentication |  | String
 | *username* (security) | Username to use for basic authentication |  | String
 |===
+
+
+
+
+=== Query API Parameters (13 APIs):
+
+The FHIR endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+fhir:apiName/methodName
+----
+
+
+==== apiName: capabilities
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *type* (common) |  |  | Class
+|===
+
+==== apiName: create
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *preferReturn* (common) | Add a |  | PreferReturnEnum
+| *resource* (common) | The resource to create |  | IBaseResource
+| *resourceAsString* (common) | The resource to create |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: delete
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *id* (common) | The |  | IIdType
+| *resource* (common) | The |  | IBaseResource
+| *stringId* (common) | It's id |  | String
+| *type* (common) | The resource type e.g Patient |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *count* (common) |  |  | Integer
+| *cutoff* (common) |  |  | Date
+| *extraParameters* (common) |  |  | Map
+| *iCutoff* (common) |  |  | IPrimitiveType
+| *id* (common) |  |  | IIdType
+| *resourceType* (common) |  |  | Class
+| *returnType* (common) |  |  | Class
+|===
+
+==== apiName: load-page
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *bundle* (common) |  |  | IBaseBundle
+| *extraParameters* (common) |  |  | Map
+| *returnType* (common) |  |  | Class
+| *url* (common) |  |  | String
+|===
+
+==== apiName: meta
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *meta* (common) |  |  | IBaseMetaType
+| *metaType* (common) |  |  | Class
+| *theResourceName* (common) |  |  | String
+|===
+
+==== apiName: operation
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *asynchronous* (common) |  |  | Boolean
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *msgBundle* (common) |  |  | IBaseBundle
+| *name* (common) |  |  | String
+| *outputParameterType* (common) |  |  | Class
+| *parameters* (common) |  |  | IBaseParameters
+| *resourceType* (common) |  |  | Class
+| *respondToUri* (common) |  |  | String
+| *responseClass* (common) |  |  | Class
+| *returnType* (common) |  |  | Class
+| *useHttpGet* (common) |  |  | Boolean
+|===
+
+==== apiName: patch
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *id* (common) | The resource ID to patch |  | IIdType
+| *patchBody* (common) | The body of the patch document serialized in either XML or JSON which conforms to \http://jsonpatch.com/ or \http://tools.ietf.org/html/rfc5261 |  | String
+| *preferReturn* (common) | Add a |  | PreferReturnEnum
+| *stringId* (common) | The resource ID to patch |  | String
+| *url* (common) | The search URL to use. The format of this URL should be of the form |  | String
+|===
+
+==== apiName: read
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *iUrl* (common) |  |  | IIdType
+| *id* (common) |  |  | IIdType
+| *ifVersionMatches* (common) |  |  | String
+| *longId* (common) |  |  | Long
+| *resource* (common) |  |  | Class
+| *resourceClass* (common) |  |  | String
+| *returnNull* (common) |  |  | Boolean
+| *returnResource* (common) |  |  | IBaseResource
+| *stringId* (common) |  |  | String
+| *throwError* (common) |  |  | Boolean
+| *url* (common) |  |  | String
+| *version* (common) |  |  | String
+|===
+
+==== apiName: search
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) | See |  | Map
+| *url* (common) | The URL to search for. Note that this URL may be complete (e.g. \http://example.com/base/Patientname=foo) in which case the client's base URL will be ignored. Or it can be relative (e.g. Patientname=foo) in which case the client's base URL will be used. |  | String
+|===
+
+==== apiName: transaction
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *bundle* (common) | Bundle to use in the transaction |  | IBaseBundle
+| *extraParameters* (common) | See |  | Map
+| *resources* (common) | Resources to use in the transaction |  | List
+| *stringBundle* (common) | Bundle to use in the transaction |  | String
+|===
+
+==== apiName: update
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *id* (common) |  |  | IIdType
+| *preferReturn* (common) |  |  | PreferReturnEnum
+| *resource* (common) |  |  | IBaseResource
+| *resourceAsString* (common) |  |  | String
+| *stringId* (common) |  |  | String
+| *url* (common) |  |  | String
+|===
+
+==== apiName: validate
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *extraParameters* (common) |  |  | Map
+| *resource* (common) |  |  | IBaseResource
+| *resourceAsString* (common) |  |  | String
+|===
 // endpoint options: END
 
 include::camel-spring-boot::page$fhir-starter.adoc[]
diff --git a/docs/components/modules/ROOT/pages/google-calendar-component.adoc b/docs/components/modules/ROOT/pages/google-calendar-component.adoc
index 7f164f2..0bc57ea 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-component.adoc
@@ -139,6 +139,80 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the calendar application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Calendar endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-calendar:apiName/methodName
+----
+
+
+==== apiName: acl
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | AclRule
+| *contentChannel* (common) |  |  | Channel
+| *ruleId* (common) |  |  | String
+|===
+
+==== apiName: calendars
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | Calendar
+|===
+
+==== apiName: channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | Event
+| *contentChannel* (common) |  |  | Channel
+| *destination* (common) |  |  | String
+| *eventId* (common) |  |  | String
+| *text* (common) |  |  | String
+|===
+
+==== apiName: freebusy
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | FreeBusyRequest
+|===
+
+==== apiName: list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (common) |  |  | String
+| *content* (common) |  |  | CalendarListEntry
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: settings
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+| *setting* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
index 4399e2d..f5811a2 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
@@ -142,6 +142,80 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Calendar Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-calendar-stream:index
+----
+
+
+==== : acl
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | AclRule
+| *contentChannel* (consumer) |  |  | Channel
+| *ruleId* (consumer) |  |  | String
+|===
+
+==== : calendars
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | Calendar
+|===
+
+==== : channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (consumer) |  |  | Channel
+|===
+
+==== : events
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | Event
+| *contentChannel* (consumer) |  |  | Channel
+| *destination* (consumer) |  |  | String
+| *eventId* (consumer) |  |  | String
+| *text* (consumer) |  |  | String
+|===
+
+==== : freebusy
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | FreeBusyRequest
+|===
+
+==== : list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *calendarId* (consumer) |  |  | String
+| *content* (consumer) |  |  | CalendarListEntry
+| *contentChannel* (consumer) |  |  | Channel
+|===
+
+==== : settings
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (consumer) |  |  | Channel
+| *setting* (consumer) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/google-drive-component.adoc b/docs/components/modules/ROOT/pages/google-drive-component.adoc
index 4d91547..81423ad 100644
--- a/docs/components/modules/ROOT/pages/google-drive-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-drive-component.adoc
@@ -161,6 +161,125 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the drive application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (12 APIs):
+
+The Google Drive endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-drive:apiName/methodName
+----
+
+
+==== apiName: drive-apps
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *appId* (common) |  |  | String
+|===
+
+==== apiName: drive-changes
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *changeId* (common) |  |  | String
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: drive-channels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *contentChannel* (common) |  |  | Channel
+|===
+
+==== apiName: drive-children
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *childId* (common) |  |  | String
+| *content* (common) |  |  | ChildReference
+| *folderId* (common) |  |  | String
+|===
+
+==== apiName: drive-comments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) |  |  | String
+| *content* (common) |  |  | Comment
+| *fileId* (common) |  |  | String
+|===
+
+==== apiName: drive-files
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | File
+| *contentChannel* (common) |  |  | Channel
+| *fileId* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *mimeType* (common) |  |  | String
+|===
+
+==== apiName: drive-parents
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | ParentReference
+| *fileId* (common) |  |  | String
+| *parentId* (common) |  |  | String
+|===
+
+==== apiName: drive-permissions
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Permission
+| *email* (common) |  |  | String
+| *fileId* (common) |  |  | String
+| *permissionId* (common) |  |  | String
+|===
+
+==== apiName: drive-properties
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Property
+| *fileId* (common) |  |  | String
+| *propertyKey* (common) |  |  | String
+|===
+
+==== apiName: drive-realtime
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *fileId* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+|===
+
+==== apiName: drive-replies
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *commentId* (common) |  |  | String
+| *content* (common) |  |  | CommentReply
+| *fileId* (common) |  |  | String
+| *replyId* (common) |  |  | String
+|===
+
+==== apiName: drive-revisions
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Revision
+| *fileId* (common) |  |  | String
+| *revisionId* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/google-mail-component.adoc b/docs/components/modules/ROOT/pages/google-mail-component.adoc
index d5979fc..5aed0a4 100644
--- a/docs/components/modules/ROOT/pages/google-mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-mail-component.adoc
@@ -149,6 +149,84 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the mail application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Mail endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-mail:apiName/methodName
+----
+
+
+==== apiName: attachments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (common) |  |  | String
+| *messageId* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: drafts
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Draft
+| *id* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: labels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | Label
+| *id* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: messages
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchDeleteMessagesRequest* (common) |  |  | BatchDeleteMessagesRequest
+| *batchModifyMessagesRequest* (common) |  |  | BatchModifyMessagesRequest
+| *content* (common) |  |  | Message
+| *id* (common) |  |  | String
+| *mediaContent* (common) |  |  | AbstractInputStreamContent
+| *modifyMessageRequest* (common) |  |  | ModifyMessageRequest
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: threads
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | ModifyThreadRequest
+| *id* (common) |  |  | String
+| *userId* (common) |  |  | String
+|===
+
+==== apiName: users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (common) |  |  | WatchRequest
+| *userId* (common) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
index 6fd5f75..d4b2cf0 100644
--- a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
@@ -136,6 +136,84 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (7 APIs):
+
+The Google Mail Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-mail-stream:index
+----
+
+
+==== : attachments
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *id* (consumer) |  |  | String
+| *messageId* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : drafts
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | Draft
+| *id* (consumer) |  |  | String
+| *mediaContent* (consumer) |  |  | AbstractInputStreamContent
+| *userId* (consumer) |  |  | String
+|===
+
+==== : history
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *userId* (consumer) |  |  | String
+|===
+
+==== : labels
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | Label
+| *id* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : messages
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchDeleteMessagesRequest* (consumer) |  |  | BatchDeleteMessagesRequest
+| *batchModifyMessagesRequest* (consumer) |  |  | BatchModifyMessagesRequest
+| *content* (consumer) |  |  | Message
+| *id* (consumer) |  |  | String
+| *mediaContent* (consumer) |  |  | AbstractInputStreamContent
+| *modifyMessageRequest* (consumer) |  |  | ModifyMessageRequest
+| *userId* (consumer) |  |  | String
+|===
+
+==== : threads
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | ModifyThreadRequest
+| *id* (consumer) |  |  | String
+| *userId* (consumer) |  |  | String
+|===
+
+==== : users
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *content* (consumer) |  |  | WatchRequest
+| *userId* (consumer) |  |  | String
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/google-sheets-component.adoc b/docs/components/modules/ROOT/pages/google-sheets-component.adoc
index 96ed7c9..3c6e133 100644
--- a/docs/components/modules/ROOT/pages/google-sheets-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-sheets-component.adoc
@@ -145,6 +145,44 @@ with the following path and query parameters:
 | *clientSecret* (security) | Client secret of the sheets application |  | String
 | *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The Google Sheets endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+google-sheets:apiName/methodName
+----
+
+
+==== apiName: data
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchClearValuesRequest* (common) | The |  | BatchClearValuesRequest
+| *batchGetValuesByDataFilter Request* (common) | The |  | BatchGetValuesByDataFilterRequest
+| *batchUpdateValuesByDataFilter Request* (common) | The |  | BatchUpdateValuesByDataFilterRequest
+| *batchUpdateValuesRequest* (common) | The |  | BatchUpdateValuesRequest
+| *clearValuesRequest* (common) | The |  | ClearValuesRequest
+| *content* (common) | The |  | BatchClearValuesByDataFilterRequest
+| *range* (common) | The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table. |  | String
+| *spreadsheetId* (common) | The ID of the spreadsheet to update |  | String
+| *values* (common) | The |  | ValueRange
+|===
+
+==== apiName: spreadsheets
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchUpdateSpreadsheetRequest* (common) | The |  | BatchUpdateSpreadsheetRequest
+| *content* (common) | The |  | Spreadsheet
+| *getSpreadsheetByDataFilter Request* (common) | The |  | GetSpreadsheetByDataFilterRequest
+| *spreadsheetId* (common) | The spreadsheet to apply the updates to |  | String
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
index 552f177..6614b0a 100644
--- a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
@@ -146,6 +146,44 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
+
+
+
+
+=== Query API Parameters (2 APIs):
+
+The Google Sheets Stream endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the  path parameter:
+
+----
+google-sheets-stream:apiName
+----
+
+
+==== : data
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchClearValuesRequest* (consumer) | The |  | BatchClearValuesRequest
+| *batchGetValuesByDataFilter Request* (consumer) | The |  | BatchGetValuesByDataFilterRequest
+| *batchUpdateValuesByDataFilter Request* (consumer) | The |  | BatchUpdateValuesByDataFilterRequest
+| *batchUpdateValuesRequest* (consumer) | The |  | BatchUpdateValuesRequest
+| *clearValuesRequest* (consumer) | The |  | ClearValuesRequest
+| *content* (consumer) | The |  | BatchClearValuesByDataFilterRequest
+| *range* (consumer) | The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table. |  | String
+| *spreadsheetId* (consumer) | The ID of the spreadsheet to update |  | String
+| *values* (consumer) | The |  | ValueRange
+|===
+
+==== : spreadsheets
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *batchUpdateSpreadsheetRequest* (consumer) | The |  | BatchUpdateSpreadsheetRequest
+| *content* (consumer) | The |  | Spreadsheet
+| *getSpreadsheetByDataFilter Request* (consumer) | The |  | GetSpreadsheetByDataFilterRequest
+| *spreadsheetId* (consumer) | The spreadsheet to apply the updates to |  | String
+|===
 // endpoint options: END
 
 
diff --git a/docs/components/modules/ROOT/pages/olingo2-component.adoc b/docs/components/modules/ROOT/pages/olingo2-component.adoc
index ef1c7a0..2d85d38 100644
--- a/docs/components/modules/ROOT/pages/olingo2-component.adoc
+++ b/docs/components/modules/ROOT/pages/olingo2-component.adoc
@@ -150,6 +150,32 @@ with the following path and query parameters:
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Olingo2 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+olingo2:apiName/methodName
+----
+
+
+==== apiName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *data* (common) |  |  | Object
+| *edm* (common) |  |  | Edm
+| *endpointHttpHeaders* (common) |  |  | Map
+| *keyPredicate* (common) |  |  | String
+| *queryParams* (common) |  |  | Map
+| *resourcePath* (common) |  |  | String
+| *responseHandler* (common) |  |  | Olingo2ResponseHandler
+|===
 // endpoint options: END
 
 == Producer Endpoints
diff --git a/docs/components/modules/ROOT/pages/olingo4-component.adoc b/docs/components/modules/ROOT/pages/olingo4-component.adoc
index 315718b..b9eb52b 100644
--- a/docs/components/modules/ROOT/pages/olingo4-component.adoc
+++ b/docs/components/modules/ROOT/pages/olingo4-component.adoc
@@ -147,6 +147,32 @@ with the following path and query parameters:
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Olingo4 endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+olingo4:apiName/methodName
+----
+
+
+==== apiName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *data* (common) |  |  | Object
+| *edm* (common) |  |  | Edm
+| *endpointHttpHeaders* (common) |  |  | Map
+| *keyPredicate* (common) |  |  | String
+| *queryParams* (common) |  |  | Map
+| *resourcePath* (common) |  |  | String
+| *responseHandler* (common) |  |  | Olingo4ResponseHandler
+|===
 // endpoint options: END
 
 == Producer Endpoints
diff --git a/docs/components/modules/ROOT/pages/twilio-component.adoc b/docs/components/modules/ROOT/pages/twilio-component.adoc
index be58b55..2baab59 100644
--- a/docs/components/modules/ROOT/pages/twilio-component.adoc
+++ b/docs/components/modules/ROOT/pages/twilio-component.adoc
@@ -100,76 +100,506 @@ with the following path and query parameters:
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 |===
-// endpoint options: END
 
 
 
-== URI format
 
-[source,java]
--------------------------------------------------
-    twilio://endpoint-prefix/endpoint?[options]
--------------------------------------------------
+=== Query API Parameters (56 APIs):
+
+The Twilio endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the apiName path parameter:
+
+----
+twilio:apiName/methodName
+----
+
 
-Endpoint prefix can be one of:
-
-* account
-* address
-* address-dependent-phone-number
-* application
-* available-phone-number-country
-* available-phone-number-country-local
-* available-phone-number-country-mobile
-* available-phone-number-country-toll-free
-* call
-* call-feedback
-* call-feedback-summary
-* call-notification
-* call-recording
-* conference
-* conference-participant
-* connect-app
-* incoming-phone-number
-* incoming-phone-number-local
-* incoming-phone-number-mobile
-* incoming-phone-number-toll-free
-* key
-* message
-* message-feedback
-* message-media
-* new-key
-* new-signing-key
-* notification
-* outgoing-caller-id
-* queue
-* queue-member
-* recording
-* recording-add-on-result
-* recording-add-on-result-payload
-* recording-transcription
-* short-code
-* signing-key
-* sip-credential-list
-* sip-credential-list-credential
-* sip-domain
-* sip-domain-credential-list-mapping
-* sip-domain-ip-access-control-list-mapping
-* sip-ip-access-control-list
-* sip-ip-access-control-list-ip-address
-* token
-* transcription
-* usage-record
-* usage-record-all-time
-* usage-record-daily
-* usage-record-last-month
-* usage-record-monthly
-* usage-record-this-month
-* usage-record-today
-* usage-record-yearly
-* usage-record-yesterday
-* usage-trigger
-* validation-request
+==== apiName: account
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathSid* (common) | Fetch by unique Account Sid |  | String
+|===
+
+==== apiName: address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *city* (common) | The city of the new address |  | String
+| *customerName* (common) | The name to associate with the new address |  | String
+| *isoCountry* (common) | The ISO country code of the new address |  | String
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Address resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *postalCode* (common) | The postal code of the new address |  | String
+| *region* (common) | The state or region of the new address |  | String
+| *street* (common) | The number and street address of the new address |  | String
+|===
 
+==== apiName: address-dependent-phone-number
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+| *pathAddressSid* (common) | The SID of the Address resource associated with the phone number |  | String
+|===
+
+==== apiName: application
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: available-phone-number-country
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the available phone number Country resource |  | String
+| *pathCountryCode* (common) | The ISO country code of the country to fetch available phone number information about |  | String
+|===
+
+==== apiName: available-phone-number-country-local
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: available-phone-number-country-mobile
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: available-phone-number-country-toll-free
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account requesting the AvailablePhoneNumber resources |  | String
+| *pathCountryCode* (common) | The ISO Country code of the country from which to read phone numbers |  | String
+|===
+
+==== apiName: call
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *applicationSid* (common) | The SID of the Application resource that will handle the call |  | String
+| *from* (common) | Twilio number from which to originate the call |  | Endpoint
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+| *to* (common) | Phone number, SIP address, or client identifier to call |  | Endpoint
+| *twiml* (common) | TwiML instructions for the call |  | Twiml
+| *url* (common) | The absolute URL that returns TwiML for this call |  | URI
+|===
+
+==== apiName: call-feedback
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathCallSid* (common) | The call sid that uniquely identifies the call |  | String
+| *qualityScore* (common) | The call quality expressed as an integer from 1 to 5 |  | Integer
+|===
+
+==== apiName: call-feedback-summary
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *endDate* (common) | Only include feedback given on or before this date |  | LocalDate
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathSid* (common) | A string that uniquely identifies this feedback summary resource |  | String
+| *startDate* (common) | Only include feedback given on or after this date |  | LocalDate
+|===
+
+==== apiName: call-notification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathCallSid* (common) | The Call SID of the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: call-recording
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathCallSid* (common) | The SID of the Call to associate the resource with |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *status* (common) | The new status of the recording |  | Status
+|===
+
+==== apiName: conference
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: conference-participant
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *from* (common) | The phone number, Client identifier, or username portion of SIP address that made this call. |  | PhoneNumber
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathCallSid* (common) | The Call SID or URL encoded label of the participant to delete |  | String
+| *pathConferenceSid* (common) | The SID of the participant's conference |  | String
+| *to* (common) | The phone number, SIP address or Client identifier that received this call. |  | PhoneNumber
+|===
+
+==== apiName: connect-app
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: incoming-phone-number
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *areaCode* (common) | The desired area code for the new phone number |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-local
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-mobile
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: incoming-phone-number-toll-free
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *phoneNumber* (common) | The phone number to purchase in E.164 format |  | PhoneNumber
+|===
+
+==== apiName: key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: message
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *body* (common) | The text of the message you want to send. Can be up to 1,600 characters in length. |  | String
+| *from* (common) | The phone number that initiated the message |  | PhoneNumber
+| *mediaUrl* (common) | The URL of the media to send with the message |  | List
+| *messagingServiceSid* (common) | The SID of the Messaging Service you want to associate with the message |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *to* (common) | The destination phone number |  | PhoneNumber
+|===
+
+==== apiName: message-feedback
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathMessageSid* (common) | The SID of the Message resource for which the feedback was provided |  | String
+|===
+
+==== apiName: message-media
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to delete |  | String
+| *pathMessageSid* (common) | The SID of the Message resource that this Media resource belongs to |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: new-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Key resource |  | String
+|===
+
+==== apiName: new-signing-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will be responsible for the new Key resource |  | String
+|===
+
+==== apiName: notification
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource to fetch |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: outgoing-caller-id
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: queue
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A string to describe this resource |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: queue-member
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathCallSid* (common) | The Call SID of the resource(s) to fetch |  | String
+| *pathQueueSid* (common) | The SID of the Queue in which to find the members |  | String
+| *url* (common) | The absolute URL of the Queue resource |  | URI
+|===
+
+==== apiName: recording
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: recording-add-on-result
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathReferenceSid* (common) | The SID of the recording to which the result to delete belongs |  | String
+| *pathSid* (common) | The unique string that identifies the resource to delete |  | String
+|===
+
+==== apiName: recording-add-on-result-payload
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathAddOnResultSid* (common) | The SID of the AddOnResult to which the payloads to delete belongs |  | String
+| *pathReferenceSid* (common) | The SID of the recording to which the AddOnResult resource that contains the payloads to delete belongs |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: recording-transcription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathRecordingSid* (common) | The SID of the recording that created the transcription to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: short-code
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resource(s) to fetch |  | String
+| *pathSid* (common) | The unique string that identifies this resource |  | String
+|===
+
+==== apiName: signing-key
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The account_sid |  | String
+| *pathSid* (common) | The sid |  | String
+|===
+
+==== apiName: sip-credential-list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | Human readable descriptive text |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathSid* (common) | Delete by unique credential list Sid |  | String
+|===
+
+==== apiName: sip-credential-list-credential
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *password* (common) | The password will not be returned in the response |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathCredentialListSid* (common) | The unique id that identifies the credential list to include the created credential |  | String
+| *pathSid* (common) | The unique id that identifies the resource to delete |  | String
+| *username* (common) | The username for this credential |  | String
+|===
+
+==== apiName: sip-domain
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *domainName* (common) | The unique address on Twilio to route SIP traffic |  | String
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: sip-domain-credential-list-mapping
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *credentialListSid* (common) | A string that identifies the CredentialList resource to map to the SIP domain |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathDomainSid* (common) | A string that identifies the SIP Domain for which the CredentialList resource will be mapped |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: sip-domain-ip-access-control-list-mapping
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *ipAccessControlListSid* (common) | The unique id of the IP access control list to map to the SIP domain |  | String
+| *pathAccountSid* (common) | The unique id of the Account that is responsible for this resource |  | String
+| *pathDomainSid* (common) | A string that uniquely identifies the SIP Domain |  | String
+| *pathSid* (common) | A 34 character string that uniquely identifies the resource to delete. |  | String
+|===
+
+==== apiName: sip-ip-access-control-list
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A human readable description of this resource |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: sip-ip-access-control-list-ip-address
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *friendlyName* (common) | A human readable descriptive text for this resource, up to 64 characters long. |  | String
+| *ipAddress* (common) | An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today. |  | String
+| *pathAccountSid* (common) | The unique sid that identifies this account |  | String
+| *pathIpAccessControlListSid* (common) | The IpAccessControlList Sid with which to associate the created IpAddress resource |  | String
+| *pathSid* (common) | A string that identifies the resource to delete |  | String
+|===
+
+==== apiName: token
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+|===
+
+==== apiName: transcription
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to delete |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+|===
+
+==== apiName: usage-record
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-all-time
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-daily
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-last-month
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-monthly
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-this-month
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-today
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-yearly
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-record-yesterday
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account that created the resources to read |  | String
+|===
+
+==== apiName: usage-trigger
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *callbackUrl* (common) | The URL we call when the trigger fires |  | URI
+| *pathAccountSid* (common) | The SID of the Account that will create the resource |  | String
+| *pathSid* (common) | The unique string that identifies the resource |  | String
+| *triggerValue* (common) | The usage value at which the trigger should fire |  | String
+| *usageCategory* (common) | The usage category the trigger watches |  | UsageCategory
+|===
+
+==== apiName: validation-request
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pathAccountSid* (common) | The SID of the Account responsible for the new Caller ID |  | String
+| *phoneNumber* (common) | The phone number to verify in E.164 format |  | PhoneNumber
+|===
+// endpoint options: END
 
 == Producer Endpoints:
 
diff --git a/docs/components/modules/ROOT/pages/zendesk-component.adoc b/docs/components/modules/ROOT/pages/zendesk-component.adoc
index 596afea..4a85d13 100644
--- a/docs/components/modules/ROOT/pages/zendesk-component.adoc
+++ b/docs/components/modules/ROOT/pages/zendesk-component.adoc
@@ -106,6 +106,140 @@ with the following path and query parameters:
 | *token* (security) | The security token. |  | String
 | *username* (security) | The user name. |  | String
 |===
+
+
+
+
+=== Query API Parameters (1 APIs):
+
+The Zendesk endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the methodName path parameter:
+
+----
+zendesk:methodName
+----
+
+
+==== methodName: DEFAULT
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *article* (common) |  |  | Article
+| *articleAttachments* (common) |  |  | ArticleAttachments
+| *articleId* (common) |  |  | Long
+| *articleId0* (common) |  |  | Long
+| *attachment* (common) |  |  | Attachment
+| *attachments* (common) |  |  | List
+| *audit* (common) |  |  | Audit
+| *auditId* (common) |  |  | Long
+| *automation* (common) |  |  | Automation
+| *automationId* (common) |  |  | Long
+| *automationId0* (common) |  |  | Long
+| *category* (common) |  |  | Category
+| *categoryId* (common) |  |  | Long
+| *category_id* (common) |  |  | Long
+| *comment* (common) |  |  | Comment
+| *commentId* (common) |  |  | Long
+| *content* (common) |  |  | byte[]
+| *contentType* (common) |  |  | String
+| *email* (common) |  |  | String
+| *endTime* (common) |  |  | Date
+| *externalId* (common) |  |  | String
+| *field* (common) |  |  | Field
+| *file* (common) |  |  | File
+| *fileName* (common) |  |  | String
+| *forum* (common) |  |  | Forum
+| *forum_id* (common) |  |  | Long
+| *group* (common) |  |  | Group
+| *groupMembership* (common) |  |  | GroupMembership
+| *group_id* (common) |  |  | Long
+| *group_membership_id* (common) |  |  | Long
+| *id* (common) |  |  | Long
+| *idArticle* (common) |  |  | String
+| *identity* (common) |  |  | Identity
+| *identityId* (common) |  |  | Long
+| *ids* (common) |  |  | long[]
+| *includeArchived* (common) |  |  | Boolean
+| *inline* (common) |  |  | Boolean
+| *installationId* (common) |  |  | Integer
+| *item* (common) |  |  | DynamicContentItem
+| *itemId* (common) |  |  | Long
+| *json* (common) |  |  | String
+| *labels* (common) |  |  | List
+| *locale* (common) |  |  | String
+| *macro* (common) |  |  | Macro
+| *macroId* (common) |  |  | Long
+| *macroId0* (common) |  |  | Long
+| *monitorId* (common) |  |  | Long
+| *name* (common) |  |  | String
+| *newPassword* (common) |  |  | String
+| *notifySubscribers* (common) |  |  | Boolean
+| *oldPassword* (common) |  |  | String
+| *order* (common) |  |  | SortOrder
+| *organization* (common) |  |  | Organization
+| *organizationId* (common) |  |  | Long
+| *organizationList* (common) |  |  | List
+| *organizationMembership* (common) |  |  | OrganizationMembership
+| *organizationMembershipList* (common) |  |  | List
+| *organizationMemberships* (common) |  |  | OrganizationMembership[]
+| *organization_id* (common) |  |  | Long
+| *organization_membership_id* (common) |  |  | Long
+| *organizations* (common) |  |  | Organization[]
+| *page* (common) |  |  | Integer
+| *parameters* (common) |  |  | String
+| *params* (common) |  |  | Map
+| *password* (common) |  |  | String
+| *permissionGroup* (common) |  |  | PermissionGroup
+| *query* (common) |  |  | String
+| *request* (common) |  |  | Request
+| *requestId* (common) |  |  | Long
+| *role* (common) |  |  | String
+| *roles* (common) |  |  | String[]
+| *satisfactionRating* (common) |  |  | SatisfactionRating
+| *schedule* (common) |  |  | Schedule
+| *scheduleId* (common) |  |  | Long
+| *searchTerm* (common) |  |  | String
+| *section* (common) |  |  | Section
+| *sectionId* (common) |  |  | Long
+| *sortBy* (common) |  |  | String
+| *sortOrder* (common) |  |  | SortOrder
+| *startTime* (common) |  |  | Date
+| *status* (common) |  |  | JobStatus
+| *statuses* (common) |  |  | List
+| *suspendedTicket* (common) |  |  | SuspendedTicket
+| *tags* (common) |  |  | String[]
+| *target* (common) |  |  | Target
+| *targetId* (common) |  |  | Long
+| *ticket* (common) |  |  | Ticket
+| *ticketForm* (common) |  |  | TicketForm
+| *ticketId* (common) |  |  | Long
+| *ticketId0* (common) |  |  | Long
+| *ticketImport* (common) |  |  | TicketImport
+| *ticketList* (common) |  |  | List
+| *tickets* (common) |  |  | Ticket[]
+| *token* (common) |  |  | String
+| *topic* (common) |  |  | Topic
+| *translation* (common) |  |  | Translation
+| *translationId* (common) |  |  | Long
+| *trigger* (common) |  |  | Trigger
+| *triggerId* (common) |  |  | Long
+| *triggerId0* (common) |  |  | Long
+| *tweetId* (common) |  |  | Long
+| *type* (common) |  |  | Class
+| *unixEpochTime* (common) |  |  | Long
+| *upload* (common) |  |  | Upload
+| *user* (common) |  |  | User
+| *userId* (common) |  |  | Long
+| *userId0* (common) |  |  | Long
+| *userIdThatWillBeMerged* (common) |  |  | Long
+| *userIdThatWillRemain* (common) |  |  | Long
+| *userList* (common) |  |  | List
+| *userSegment* (common) |  |  | UserSegment
+| *user_id* (common) |  |  | Long
+| *users* (common) |  |  | User[]
+| *usersList* (common) |  |  | List
+| *variant* (common) |  |  | DynamicContentItemVariant
+|===
 // endpoint options: END
 
 
diff --git a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/ComponentModel.java b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/ComponentModel.java
index 7dc1c73..4e1b24b 100644
--- a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/ComponentModel.java
+++ b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/ComponentModel.java
@@ -17,9 +17,9 @@
 package org.apache.camel.tooling.model;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 public class ComponentModel extends ArtifactModel<ComponentModel.ComponentOptionModel> {
@@ -37,7 +37,7 @@ public class ComponentModel extends ArtifactModel<ComponentModel.ComponentOption
     protected boolean lenientProperties;
     protected String verifiers;
     protected final List<EndpointOptionModel> endpointOptions = new ArrayList<>();
-    protected final Map<String, List<ApiOptionModel>> apiOptions = new LinkedHashMap<>();
+    protected final Map<String, List<ApiOptionModel>> apiOptions = new TreeMap<>(); // lets sort by API names
 
     public ComponentModel() {
     }
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
index 1967e2b..4a8de34 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
@@ -29,3 +29,25 @@ The @{title} endpoint has no query parameters.
 @foreach{row : endpointParameterOptions}| *@{row.getShortName(30)}* (@{row.shortGroup}) @{row.description.?contains("\n") ? "a" : ""}| @{util.escape(row.description)} | @{row.getShortDefaultValue(20)} | @{row.getShortJavaType()}
 @end{}|===
 @end{}
+
+@if{!apiOptions.isEmpty()}
+
+=== Query API Parameters (@{apiOptions.size()} APIs):
+
+The @{title} endpoint is an API based component and has conditional parameters based on which API method in use.
+The API method is located in the endpoint URI as the @{apiPropertyQualifier} path parameter:
+
+----
+@{syntax}
+----
+
+@foreach{api : apiOptions.entrySet()}
+==== @{apiPropertyQualifier}: @{api.key}
+[width="100%",cols="2,5,^1,2",options="header"]
+|===@comment{ Render table cells. If description contains newline, prefix cell with `a`, so the content is rendered with formatting. }
+| Name | Description | Default | Type
+@foreach{row : api.value}| *@{row.getShortName(30)}* (@{row.shortGroup}) @{row.description.?contains("\n") ? "a" : ""}| @{util.escape(row.description)} | @{row.getShortDefaultValue(20)} | @{row.getShortJavaType()}
+@end{}|===
+@end{}
+
+@end{}