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 d48c736 CAMEL-15549: Polished d48c736 is described below commit d48c736b7f5416b81345c5c4cb8a8d7525dbdb25 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Sep 21 09:37:36 2020 +0200 CAMEL-15549: Polished --- .../camel/catalog/docs/braintree-component.adoc | 3 +- .../docs/google-calendar-stream-component.adoc | 2 +- .../catalog/docs/google-mail-stream-component.adoc | 2 +- .../docs/google-sheets-stream-component.adoc | 18 ++--- .../camel/catalog/docs/twilio-component.adoc | 2 +- .../camel/component/as2/AS2Configuration.java | 27 ------- .../apache/camel/component/as2/AS2Endpoint.java | 1 - .../camel/component/braintree/braintree.json | 1 - .../src/main/docs/braintree-component.adoc | 3 +- .../braintree/BraintreeConfiguration.java | 7 +- .../org/apache/camel/component/fhir/fhir.json | 8 +- .../camel/component/fhir/FhirConfiguration.java | 27 +------ .../calendar/stream/google-calendar-stream.json | 2 +- .../docs/google-calendar-stream-component.adoc | 2 +- .../calendar/GoogleCalendarConfiguration.java | 10 --- .../stream/GoogleCalendarStreamConfiguration.java | 2 + .../google/mail/stream/google-mail-stream.json | 2 +- .../main/docs/google-mail-stream-component.adoc | 2 +- .../mail/stream/GoogleMailStreamConfiguration.java | 2 + .../google/sheets/stream/google-sheets-stream.json | 22 +++--- .../main/docs/google-sheets-stream-component.adoc | 18 ++--- .../google/sheets/GoogleSheetsComponent.java | 4 - .../google/sheets/GoogleSheetsConfiguration.java | 6 -- .../sheets/stream/GoogleSheetsStreamComponent.java | 7 +- .../stream/GoogleSheetsStreamConfiguration.java | 23 ++---- .../org/apache/camel/component/twilio/twilio.json | 2 +- .../src/main/docs/twilio-component.adoc | 2 +- .../camel/component/twilio/TwilioComponent.java | 14 +--- .../component/twilio/TwilioConfiguration.java | 1 - .../camel/component/zendesk/ZendeskComponent.java | 36 +-------- .../component/zendesk/ZendeskConfiguration.java | 29 -------- .../GoogleSheetsStreamComponentBuilderFactory.java | 85 +++++++++++----------- .../dsl/TwilioComponentBuilderFactory.java | 30 ++++---- .../builder/endpoint/StaticEndpointBuilders.java | 18 ++--- .../dsl/BraintreeEndpointBuilderFactory.java | 6 -- ...GoogleCalendarStreamEndpointBuilderFactory.java | 4 +- .../GoogleMailStreamEndpointBuilderFactory.java | 4 +- .../GoogleSheetsStreamEndpointBuilderFactory.java | 82 ++++++++++----------- .../modules/ROOT/pages/braintree-component.adoc | 3 +- .../pages/google-calendar-stream-component.adoc | 2 +- .../ROOT/pages/google-mail-stream-component.adoc | 2 +- .../ROOT/pages/google-sheets-stream-component.adoc | 18 ++--- .../modules/ROOT/pages/twilio-component.adoc | 2 +- 43 files changed, 186 insertions(+), 357 deletions(-) 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 a550812..ca98d51 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 @@ -70,14 +70,13 @@ braintree:apiName/methodName with the following path and query parameters: -=== Path Parameters (2 parameters): +=== Path Parameters (1 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type | *apiName* | *Required* What kind of operation to perform. There are 17 enums and the value can be one of: ADD_ON, ADDRESS, CLIENT_TOKEN, CREDIT_CARD_VERIFICATION, CUSTOMER, DISCOUNT, DISPUTE, DOCUMENT_UPLOAD, MERCHANT_ACCOUNT, PAYMENT_METHOD, PAYMENT_METHOD_NONCE, PLAN, REPORT, SETTLEMENT_BATCH_SUMMARY, SUBSCRIPTION, TRANSACTION, WEBHOOK_NOTIFICATION | | BraintreeApiName -| *methodName* | What sub operation to use for the selected operation | | String |=== 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 0ad4545..33d8bc9 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 @@ -96,7 +96,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *index* | Specifies an index for the endpoint | | String +| *index* | *Required* Specifies an index for the endpoint | | String |=== 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 9562078..eea698f 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 @@ -94,7 +94,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *index* | Currently not in use | | String +| *index* | *Required* Currently not in use | | String |=== 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 57054d1..f75bb09 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 @@ -59,23 +59,23 @@ The Google Sheets Stream component supports 17 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String | *applicationName* (consumer) | Google sheets application name. Example would be camel-google-sheets/1.0 | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *clientId* (consumer) | Client ID of the sheets application | | String -| *clientSecret* (consumer) | Client secret of the sheets application | | String | *configuration* (consumer) | To use the shared configuration | | GoogleSheetsStreamConfiguration | *includeGridData* (consumer) | True if grid data should be returned. | false | boolean | *majorDimension* (consumer) | Specifies the major dimension that results should use.. There are 3 enums and the value can be one of: ROWS, COLUMNS, DIMENSION_UNSPECIFIED | ROWS | String -| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 0 | int +| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | | int | *range* (consumer) | Specifies the range of rows and columns in a sheet to get data from. | | String -| *refreshToken* (consumer) | 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 | *scopes* (consumer) | Specifies the level of permissions you want a sheets application to have to a user account. See \https://developers.google.com/identity/protocols/googlescopes for more info. | | List | *splitResults* (consumer) | True if value range result should be split into rows or columns to process each of them individually. When true each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used as exchange junk size. | false | boolean | *spreadsheetId* (consumer) | Specifies the spreadsheet identifier that is used to identify the target to obtain. | | String | *valueRenderOption* (consumer) | Determines how values should be rendered in the output. There are 3 enums and the value can be one of: FORMATTED_VALUE, UNFORMATTED_VALUE, FORMULA | FORMATTED_VALUE | String | *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *clientFactory* (advanced) | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory | | GoogleSheetsClientFactory +| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String +| *clientSecret* (security) | Client secret of the sheets 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 |=== // component options: END @@ -97,7 +97,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *apiName* | Sets the apiName. | | String +| *apiName* | *Required* Sets the apiName. | | String |=== @@ -107,16 +107,13 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String | *applicationName* (consumer) | Google sheets application name. Example would be camel-google-sheets/1.0 | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *clientId* (consumer) | Client ID of the sheets application | | String -| *clientSecret* (consumer) | Client secret of the sheets application | | String | *includeGridData* (consumer) | True if grid data should be returned. | false | boolean | *majorDimension* (consumer) | Specifies the major dimension that results should use.. There are 3 enums and the value can be one of: ROWS, COLUMNS, DIMENSION_UNSPECIFIED | ROWS | String -| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 0 | int +| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | | int | *range* (consumer) | Specifies the range of rows and columns in a sheet to get data from. | | String -| *refreshToken* (consumer) | 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 | *scopes* (consumer) | Specifies the level of permissions you want a sheets application to have to a user account. See \https://developers.google.com/identity/protocols/googlescopes for more info. | | List | *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean | *splitResults* (consumer) | True if value range result should be split into rows or columns to process each of them individually. When true each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used as exchange junk size. | false | boolean @@ -141,6 +138,9 @@ with the following path and query parameters: | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean | *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 +| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String +| *clientSecret* (security) | Client secret of the sheets 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 |=== 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 f966d76..fc020b7 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 @@ -37,10 +37,10 @@ The Twilio component supports 8 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *configuration* (common) | To use the shared configuration | | TwilioConfiguration | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean -| *configuration* (advanced) | To use the shared configuration | | TwilioConfiguration | *restClient* (advanced) | To use the shared REST client | | TwilioRestClient | *accountSid* (security) | The account SID to use. | | String | *password* (security) | Auth token for the account. | | String diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java index 7d1f505..aa25a8e 100644 --- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java +++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java @@ -42,86 +42,59 @@ public class AS2Configuration { @UriPath @Metadata(required = true, enums = "client,server") private AS2ApiName apiName; - @UriPath @Metadata(required = true) private String methodName; - @UriParam(defaultValue = "1.1", enums = "1.0,1.1") private String as2Version = "1.1"; - @UriParam(defaultValue = "Camel AS2 Client Endpoint") private String userAgent = "Camel AS2 Client Endpoint"; - @UriParam(defaultValue = "Camel AS2 Server Endpoint") private String server = "Camel AS2 Server Endpoint"; - @UriParam(defaultValue = "camel.apache.org") private String serverFqdn = "camel.apache.org"; - @UriParam private String targetHostname; - @UriParam private Integer targetPortNumber = 80; - @UriParam(defaultValue = "camel.apache.org") private String clientFqdn = "camel.apache.org"; - @UriParam private Integer serverPortNumber; - @UriParam(defaultValue = "/") private String requestUri = "/"; - @UriParam private ContentType ediMessageType; - @UriParam private String ediMessageTransferEncoding; - @UriParam private AS2MessageStructure as2MessageStructure; - @UriParam private String subject; - @UriParam private String from; - @UriParam private String as2From; - @UriParam private String as2To; - @UriParam private AS2SignatureAlgorithm signingAlgorithm; - @UriParam private Certificate[] signingCertificateChain; - @UriParam private PrivateKey signingPrivateKey; - @UriParam private AS2CompressionAlgorithm compressionAlgorithm; - @UriParam private String dispositionNotificationTo; - @UriParam private String[] signedReceiptMicAlgorithms; - @UriParam private AS2EncryptionAlgorithm encryptingAlgorithm; - @UriParam private Certificate[] encryptingCertificateChain; - @UriParam private PrivateKey decryptingPrivateKey; - @UriParam private String mdnMessageTemplate; diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java index 8bdcf174..2f3b6dc 100644 --- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java +++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java @@ -64,7 +64,6 @@ public class AS2Endpoint extends AbstractApiEndpoint<AS2ApiName, AS2Configuratio private Object apiProxy; private AS2ClientConnection as2ClientConnection; - private AS2ServerConnection as2ServerConnection; public AS2Endpoint(String uri, AS2Component component, 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 f509123..5d70b9b 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 @@ -29,7 +29,6 @@ }, "properties": { "apiName": { "kind": "path", "displayName": "Api Name", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.braintree.internal.BraintreeApiName", "enum": [ "ADD_ON", "ADDRESS", "CLIENT_TOKEN", "CREDIT_CARD_VERIFICATION", "CUSTOMER", "DISCOUNT", "DISPUTE", "DOCUMENT_UPLOAD", "MERCHANT_ACCOUNT", "PAYMENT_METHOD", "PAYMENT_METHOD_NONCE", "PLAN", "REPORT", "SETTLEMENT_BATCH_SUMMARY", "SUBSCRIPTION", "TRANSACTION", "WEBHOOK_NOTIFIC [...] - "methodName": { "kind": "path", "displayName": "Method Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "What sub operation to use for the selected operation" }, "environment": { "kind": "parameter", "displayName": "Environment", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The environment Either SANDBOX or PRODUCTION" }, "inBody": { "kind": "parameter", "displayName": "In Body", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of a parameter to be passed in the exchange In Body" }, "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the [...] diff --git a/components/camel-braintree/src/main/docs/braintree-component.adoc b/components/camel-braintree/src/main/docs/braintree-component.adoc index a550812..ca98d51 100644 --- a/components/camel-braintree/src/main/docs/braintree-component.adoc +++ b/components/camel-braintree/src/main/docs/braintree-component.adoc @@ -70,14 +70,13 @@ braintree:apiName/methodName with the following path and query parameters: -=== Path Parameters (2 parameters): +=== Path Parameters (1 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type | *apiName* | *Required* What kind of operation to perform. There are 17 enums and the value can be one of: ADD_ON, ADDRESS, CLIENT_TOKEN, CREDIT_CARD_VERIFICATION, CUSTOMER, DISCOUNT, DISPUTE, DOCUMENT_UPLOAD, MERCHANT_ACCOUNT, PAYMENT_METHOD, PAYMENT_METHOD_NONCE, PLAN, REPORT, SETTLEMENT_BATCH_SUMMARY, SUBSCRIPTION, TRANSACTION, WEBHOOK_NOTIFICATION | | BraintreeApiName -| *methodName* | What sub operation to use for the selected operation | | String |=== diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java index f082a8e..07a49b3 100644 --- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java +++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java @@ -46,33 +46,28 @@ public class BraintreeConfiguration { @UriPath @Metadata(required = true) private BraintreeApiName apiName; - @UriPath + @Metadata(required = true) private String methodName; - @UriParam private String environment; @UriParam private String merchantId; - @UriParam(label = "security", secret = true) private String publicKey; @UriParam(label = "security", secret = true) private String privateKey; @UriParam(label = "security", secret = true) private String accessToken; - @UriParam(label = "proxy") private String proxyHost; @UriParam(label = "proxy") private Integer proxyPort; - @UriParam(label = "logging", enums = "OFF,SEVERE,WARNING,INFO,CONFIG,FINE,FINER,FINEST,ALL") private String httpLogLevel; @UriParam(label = "logging", defaultValue = "Braintree") private String httpLogName; @UriParam(label = "logging", defaultValue = "true") private boolean logHandlerEnabled = true; - @UriParam(label = "advanced") private Integer httpReadTimeout; 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 5897291..d81ad43 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 @@ -44,9 +44,9 @@ "summary": { "kind": "property", "displayName": "Summary", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "COUNT", "TEXT", "DATA", "TRUE", "FALSE" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "Request that the server modify the response using the _summary param" }, "validationMode": { "kind": "property", "displayName": "Validation Mode", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "NEVER", "ONCE" ], "deprecated": false, "secret": false, "defaultValue": "ONCE", "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "When should Camel validate the FHIR Server's conformance statement" }, "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy host" }, - "proxyPassword": { "kind": "property", "displayName": "Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy password" }, + "proxyPassword": { "kind": "property", "displayName": "Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy password" }, "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy port" }, - "proxyUser": { "kind": "property", "displayName": "Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy username" }, + "proxyUser": { "kind": "property", "displayName": "Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy username" }, "accessToken": { "kind": "property", "displayName": "Access Token", "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": "OAuth access token" }, "password": { "kind": "property", "displayName": "Password", "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" }, "username": { "kind": "property", "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" } @@ -80,9 +80,9 @@ "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }, "validationMode": { "kind": "parameter", "displayName": "Validation Mode", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "NEVER", "ONCE" ], "deprecated": false, "secret": false, "defaultValue": "ONCE", "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "When should Camel validate the FHIR Server's conformance statement" }, "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy host" }, - "proxyPassword": { "kind": "parameter", "displayName": "Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy password" }, + "proxyPassword": { "kind": "parameter", "displayName": "Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy password" }, "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy port" }, - "proxyUser": { "kind": "parameter", "displayName": "Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy username" }, + "proxyUser": { "kind": "parameter", "displayName": "Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy username" }, "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." }, "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." }, "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option [...] diff --git a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java index 025de4d..5906961 100644 --- a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java +++ b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java @@ -44,81 +44,58 @@ public class FhirConfiguration { @UriPath @Metadata(required = true) private String methodName; - @UriParam(description = "The FHIR server base URL") private String serverUrl; - @UriParam(description = "The FHIR Version to use", defaultValue = "R4", javaType = "java.lang.String") private FhirVersionEnum fhirVersion = FhirVersionEnum.R4; - @UriParam(description = "Pretty print all request") private boolean prettyPrint; - @UriParam(description = "Encoding to use for all request", enums = "JSON, XML", javaType = "java.lang.String") private EncodingEnum encoding; - @UriParam(description = "Username to use for basic authentication", label = "security", secret = true) private String username; - @UriParam(description = "Username to use for basic authentication", label = "security", secret = true) private String password; - @UriParam(description = "OAuth access token", label = "security", secret = true) private String accessToken; - @UriParam(description = "Will log every requests and responses") private boolean log; - @UriParam(description = "Compresses outgoing (POST/PUT) contents to the GZIP format", label = "advanced") private boolean compress; - @UriParam(description = "Request that the server modify the response using the <code>_summary</code> param", label = "advanced", javaType = "java.lang.String") private SummaryEnum summary; - @UriParam(description = "HTTP session cookie to add to every request", label = "advanced") private String sessionCookie; - @UriParam(description = "FhirContext is an expensive object to create. To avoid creating multiple instances," + " it can be set directly.", label = "advanced") private FhirContext fhirContext; - @UriParam(description = "Force conformance check", label = "advanced") private boolean forceConformanceCheck; - @UriParam(description = "When should Camel validate the FHIR Server's conformance statement", defaultValue = "ONCE", label = "advanced", javaType = "java.lang.String") private ServerValidationModeEnum validationMode; - @UriParam(description = "When this option is set, model classes will not be scanned for children until the" + " child list for the given type is actually accessed.", defaultValue = "false", label = "advanced") private boolean deferModelScanning; - @UriParam(description = "How long to try and establish the initial TCP connection (in ms)", label = "advanced", defaultValue = "10000") private Integer connectionTimeout; - @UriParam(description = "How long to block for individual read/write operations (in ms)", label = "advanced", defaultValue = "10000") private Integer socketTimeout; - @UriParam(label = "proxy", description = "The proxy host") private String proxyHost; - @UriParam(label = "proxy", description = "The proxy port") private Integer proxyPort; - - @UriParam(label = "proxy", description = "The proxy username") + @UriParam(label = "proxy", description = "The proxy username", secret = true) private String proxyUser; - - @UriParam(label = "proxy", description = "The proxy password") + @UriParam(label = "proxy", description = "The proxy password", secret = true) private String proxyPassword; - @UriParam(label = "advanced", description = "To use the custom client") private IGenericClient client; - @UriParam(label = "advanced", description = "To use the custom client factory") private IRestfulClientFactory clientFactory; 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 95df1dc..2eeb3d3 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 @@ -39,7 +39,7 @@ "refreshToken": { "kind": "property", "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.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the [...] }, "properties": { - "index": { "kind": "path", "displayName": "Index", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Specifies an index for the endpoint" }, + "index": { "kind": "path", "displayName": "Index", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Specifies an index for the endpoint" }, "applicationName": { "kind": "parameter", "displayName": "Application Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Google Calendar application name. Example would be camel-google-calendar\/1.0" }, "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...] "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "primary", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "The calendarId to be used" }, 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 0ad4545..33d8bc9 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 @@ -96,7 +96,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *index* | Specifies an index for the endpoint | | String +| *index* | *Required* Specifies an index for the endpoint | | String |=== diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java index 26c6118..3c95201 100644 --- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java +++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java @@ -34,35 +34,25 @@ public class GoogleCalendarConfiguration { @UriPath @Metadata(required = true) private GoogleCalendarApiName apiName; - @UriPath(enums = "calendarImport,clear,delete,get,insert,instances,list,move,patch,query,quickAdd,stop,update,watch") @Metadata(required = true) private String methodName; - @UriParam(defaultValue = CalendarScopes.CALENDAR) private String scopes = CalendarScopes.CALENDAR; - @UriParam private String clientId; - @UriParam private String emailAddress; - @UriParam(label = "security", secret = true) private String clientSecret; - @UriParam(label = "security", secret = true) private String accessToken; - @UriParam(label = "security", secret = true) private String refreshToken; - @UriParam private String applicationName; - @UriParam private String p12FileName; - @UriParam private String user; diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java index 5c85d2e..2471572 100644 --- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java +++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java @@ -21,6 +21,7 @@ import java.util.List; import com.google.api.services.calendar.CalendarScopes; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; import org.apache.camel.spi.UriPath; @@ -33,6 +34,7 @@ public class GoogleCalendarStreamConfiguration implements Cloneable { private static final List<String> DEFAULT_SCOPES = Collections.singletonList(CalendarScopes.CALENDAR); @UriPath + @Metadata(required = true) private String index; @UriParam private List<String> scopes = DEFAULT_SCOPES; 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 19170c1..2623c87 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 @@ -37,7 +37,7 @@ "refreshToken": { "kind": "property", "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.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current [...] }, "properties": { - "index": { "kind": "path", "displayName": "Index", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Currently not in use" }, + "index": { "kind": "path", "displayName": "Index", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Currently not in use" }, "applicationName": { "kind": "parameter", "displayName": "Application Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Google mail application name. Example would be camel-google-mail\/1.0" }, "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...] "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Client ID of the mail application" }, 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 9562078..eea698f 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 @@ -94,7 +94,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *index* | Currently not in use | | String +| *index* | *Required* Currently not in use | | String |=== diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java index a0e848a..d0af6c4 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java @@ -17,6 +17,7 @@ package org.apache.camel.component.google.mail.stream; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; import org.apache.camel.spi.UriPath; @@ -27,6 +28,7 @@ import org.apache.camel.spi.UriPath; @UriParams public class GoogleMailStreamConfiguration implements Cloneable { @UriPath + @Metadata(required = true) private String index; @UriParam private String clientId; 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 e1c4c65..4d15fbe 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 @@ -23,36 +23,33 @@ "verifiers": "parameters,connectivity" }, "componentProperties": { - "accessToken": { "kind": "property", "displayName": "Access Token", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." }, "applicationName": { "kind": "property", "displayName": "Application Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Google sheets application name. Example would be camel-google-sheets\/1.0" }, "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...] "clientId": { "kind": "property", "displayName": "Client Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client ID of the sheets application" }, - "clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" }, "configuration": { "kind": "property", "displayName": "Configuration", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "deprecated": false, "secret": false, "description": "To use the shared configuration" }, "includeGridData": { "kind": "property", "displayName": "Include Grid Data", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "True if grid data should be returned." }, "majorDimension": { "kind": "property", "displayName": "Major Dimension", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "ROWS", "COLUMNS", "DIMENSION_UNSPECIFIED" ], "deprecated": false, "secret": false, "defaultValue": "ROWS", "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specifies the major dimension tha [...] - "maxResults": { "kind": "property", "displayName": "Max Results", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specify the maximum number of returned results. This will limit the number of rows in a returned value range dat [...] + "maxResults": { "kind": "property", "displayName": "Max Results", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number o [...] "range": { "kind": "property", "displayName": "Range", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specifies the range of rows and columns in a sheet to get data from." }, - "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current on [...] "scopes": { "kind": "property", "displayName": "Scopes", "group": "consumer", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specifies the level of permissions you want a sheets application to have to a user account. See https:\/\/developer [...] "splitResults": { "kind": "property", "displayName": "Split Results", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "True if value range result should be split into rows or columns to process each of them individually. [...] "spreadsheetId": { "kind": "property", "displayName": "Spreadsheet Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specifies the spreadsheet identifier that is used to identify the target to obtain." }, "valueRenderOption": { "kind": "property", "displayName": "Value Render Option", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "FORMATTED_VALUE", "UNFORMATTED_VALUE", "FORMULA" ], "deprecated": false, "secret": false, "defaultValue": "FORMATTED_VALUE", "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Determin [...] "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }, - "clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsClientFactory", "deprecated": false, "secret": false, "description": "To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory" } + "clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsClientFactory", "deprecated": false, "secret": false, "description": "To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory" }, + "accessToken": { "kind": "property", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." }, + "clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" }, + "refreshToken": { "kind": "property", "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.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the cur [...] }, "properties": { - "apiName": { "kind": "path", "displayName": "Api Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets the apiName." }, - "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." }, + "apiName": { "kind": "path", "displayName": "Api Name", "group": "consumer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets the apiName." }, "applicationName": { "kind": "parameter", "displayName": "Application Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Google sheets application name. Example would be camel-google-sheets\/1.0" }, "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...] "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client ID of the sheets application" }, - "clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" }, "includeGridData": { "kind": "parameter", "displayName": "Include Grid Data", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "True if grid data should be returned." }, "majorDimension": { "kind": "parameter", "displayName": "Major Dimension", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "ROWS", "COLUMNS", "DIMENSION_UNSPECIFIED" ], "deprecated": false, "secret": false, "defaultValue": "ROWS", "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specifies the major dimension th [...] - "maxResults": { "kind": "parameter", "displayName": "Max Results", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specify the maximum number of returned results. This will limit the number of rows in a returned value range da [...] + "maxResults": { "kind": "parameter", "displayName": "Max Results", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number [...] "range": { "kind": "parameter", "displayName": "Range", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specifies the range of rows and columns in a sheet to get data from." }, - "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current o [...] "scopes": { "kind": "parameter", "displayName": "Scopes", "group": "consumer", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Specifies the level of permissions you want a sheets application to have to a user account. See https:\/\/develope [...] "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." }, "splitResults": { "kind": "parameter", "displayName": "Split Results", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "True if value range result should be split into rows or columns to process each of them individually. [...] @@ -76,7 +73,10 @@ "schedulerProperties": { "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." }, "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." }, "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." }, - "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." } + "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." }, + "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." }, + "clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" }, + "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.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the cu [...] }, "apis": { "data": { "consumerOnly": true, "producerOnly": false, "description": "The values collection of methods", "methods": { "append": { "description": "Appends values to a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$Values$Append append(String spreadsheetId, String range, com.google.api.services.sheets.v4.model.ValueRange content)" ] }, "batchClear": { "description": "Clears one or more ranges of values from a spreadsheet", "signatures": [ "com.goo [...] 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 57054d1..f75bb09 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 @@ -59,23 +59,23 @@ The Google Sheets Stream component supports 17 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String | *applicationName* (consumer) | Google sheets application name. Example would be camel-google-sheets/1.0 | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *clientId* (consumer) | Client ID of the sheets application | | String -| *clientSecret* (consumer) | Client secret of the sheets application | | String | *configuration* (consumer) | To use the shared configuration | | GoogleSheetsStreamConfiguration | *includeGridData* (consumer) | True if grid data should be returned. | false | boolean | *majorDimension* (consumer) | Specifies the major dimension that results should use.. There are 3 enums and the value can be one of: ROWS, COLUMNS, DIMENSION_UNSPECIFIED | ROWS | String -| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 0 | int +| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | | int | *range* (consumer) | Specifies the range of rows and columns in a sheet to get data from. | | String -| *refreshToken* (consumer) | 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 | *scopes* (consumer) | Specifies the level of permissions you want a sheets application to have to a user account. See \https://developers.google.com/identity/protocols/googlescopes for more info. | | List | *splitResults* (consumer) | True if value range result should be split into rows or columns to process each of them individually. When true each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used as exchange junk size. | false | boolean | *spreadsheetId* (consumer) | Specifies the spreadsheet identifier that is used to identify the target to obtain. | | String | *valueRenderOption* (consumer) | Determines how values should be rendered in the output. There are 3 enums and the value can be one of: FORMATTED_VALUE, UNFORMATTED_VALUE, FORMULA | FORMATTED_VALUE | String | *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *clientFactory* (advanced) | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory | | GoogleSheetsClientFactory +| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String +| *clientSecret* (security) | Client secret of the sheets 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 |=== // component options: END @@ -97,7 +97,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *apiName* | Sets the apiName. | | String +| *apiName* | *Required* Sets the apiName. | | String |=== @@ -107,16 +107,13 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String | *applicationName* (consumer) | Google sheets application name. Example would be camel-google-sheets/1.0 | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *clientId* (consumer) | Client ID of the sheets application | | String -| *clientSecret* (consumer) | Client secret of the sheets application | | String | *includeGridData* (consumer) | True if grid data should be returned. | false | boolean | *majorDimension* (consumer) | Specifies the major dimension that results should use.. There are 3 enums and the value can be one of: ROWS, COLUMNS, DIMENSION_UNSPECIFIED | ROWS | String -| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 0 | int +| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | | int | *range* (consumer) | Specifies the range of rows and columns in a sheet to get data from. | | String -| *refreshToken* (consumer) | 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 | *scopes* (consumer) | Specifies the level of permissions you want a sheets application to have to a user account. See \https://developers.google.com/identity/protocols/googlescopes for more info. | | List | *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean | *splitResults* (consumer) | True if value range result should be split into rows or columns to process each of them individually. When true each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used as exchange junk size. | false | boolean @@ -141,6 +138,9 @@ with the following path and query parameters: | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean | *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 +| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String +| *clientSecret* (security) | Client secret of the sheets 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 |=== diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java index ba985d8..c6d5eac 100644 --- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java +++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java @@ -25,9 +25,6 @@ import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.component.AbstractApiComponent; -/** - * Represents the component that manages {@link GoogleSheetsEndpoint}. - */ @Metadata(label = "verifiers", enums = "parameters,connectivity") @Component("google-sheets") public class GoogleSheetsComponent @@ -35,7 +32,6 @@ public class GoogleSheetsComponent @Metadata GoogleSheetsConfiguration configuration; - @Metadata(label = "advanced") private Sheets client; @Metadata(label = "advanced") diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java index 3906b84..a897771 100644 --- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java +++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java @@ -34,23 +34,17 @@ public class GoogleSheetsConfiguration extends AbstractApiConfiguration { @UriPath @Metadata(required = true) private GoogleSheetsApiName apiName; - @UriPath(enums = "create,get,update,append,batchUpdate,clear") @Metadata(required = true) private String methodName; - @UriParam private String clientId; - @UriParam(label = "security", secret = true) private String clientSecret; - @UriParam(label = "security", secret = true) private String accessToken; - @UriParam(label = "security", secret = true) private String refreshToken; - @UriParam private String applicationName; diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java index 0a9fe22..43dbaa4 100644 --- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java +++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java @@ -28,19 +28,16 @@ import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -/** - * Represents the component that manages {@link GoogleSheetsStreamEndpoint}. - */ @Metadata(label = "verifiers", enums = "parameters,connectivity") @Component("google-sheets-stream") public class GoogleSheetsStreamComponent extends DefaultComponent { + @Metadata + private GoogleSheetsStreamConfiguration configuration; @Metadata(label = "advanced") private Sheets client; @Metadata(label = "advanced") private GoogleSheetsClientFactory clientFactory; - @Metadata - private GoogleSheetsStreamConfiguration configuration; public GoogleSheetsStreamComponent() { this(null); diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java index cb4fa4e..f651861 100644 --- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java +++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java @@ -21,6 +21,7 @@ import java.util.List; import com.google.api.services.sheets.v4.SheetsScopes; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; import org.apache.camel.spi.UriPath; @@ -34,44 +35,32 @@ public class GoogleSheetsStreamConfiguration implements Cloneable { private static final List<String> DEFAULT_SCOPES = Collections.singletonList(SheetsScopes.SPREADSHEETS); @UriPath + @Metadata(required = true) private String apiName; - @UriParam private List<String> scopes = DEFAULT_SCOPES; - @UriParam private String clientId; - - @UriParam + @UriParam(label = "security", secret = true) private String clientSecret; - - @UriParam + @UriParam(label = "security", secret = true) private String accessToken; - - @UriParam + @UriParam(label = "security", secret = true) private String refreshToken; - @UriParam private String applicationName; - @UriParam private String spreadsheetId; - - @UriParam(defaultValue = "0") + @UriParam private int maxResults; - @UriParam private String range; - @UriParam private boolean includeGridData; - @UriParam private boolean splitResults; - @UriParam(enums = "ROWS,COLUMNS,DIMENSION_UNSPECIFIED", defaultValue = "ROWS") private String majorDimension = "ROWS"; - @UriParam(enums = "FORMATTED_VALUE,UNFORMATTED_VALUE,FORMULA", defaultValue = "FORMATTED_VALUE") private String valueRenderOption = "FORMATTED_VALUE"; 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 bc1817f..e35d0f9 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 @@ -23,10 +23,10 @@ "lenientProperties": false }, "componentProperties": { + "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.twilio.TwilioConfiguration", "deprecated": false, "secret": false, "description": "To use the shared configuration" }, "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...] "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...] "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }, - "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.twilio.TwilioConfiguration", "deprecated": false, "secret": false, "description": "To use the shared configuration" }, "restClient": { "kind": "property", "displayName": "Rest Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.twilio.http.TwilioRestClient", "deprecated": false, "secret": false, "description": "To use the shared REST client" }, "accountSid": { "kind": "property", "displayName": "Account Sid", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "The account SID to use." }, "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Auth token for the account." }, diff --git a/components/camel-twilio/src/main/docs/twilio-component.adoc b/components/camel-twilio/src/main/docs/twilio-component.adoc index f966d76..fc020b7 100644 --- a/components/camel-twilio/src/main/docs/twilio-component.adoc +++ b/components/camel-twilio/src/main/docs/twilio-component.adoc @@ -37,10 +37,10 @@ The Twilio component supports 8 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *configuration* (common) | To use the shared configuration | | TwilioConfiguration | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean -| *configuration* (advanced) | To use the shared configuration | | TwilioConfiguration | *restClient* (advanced) | To use the shared REST client | | TwilioRestClient | *accountSid* (security) | The account SID to use. | | String | *password* (security) | Auth token for the account. | | String diff --git a/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioComponent.java b/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioComponent.java index 466118f..a606379 100644 --- a/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioComponent.java +++ b/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioComponent.java @@ -26,26 +26,19 @@ import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.component.AbstractApiComponent; import org.apache.camel.util.ObjectHelper; -/** - * Represents the component that manages {@link TwilioEndpoint}. - */ @Component("twilio") public class TwilioComponent extends AbstractApiComponent<TwilioApiName, TwilioConfiguration, TwilioApiCollection> { - @Metadata(label = "advanced") + @Metadata private TwilioConfiguration configuration = new TwilioConfiguration(); - - @Metadata(label = "advanced") - private TwilioRestClient restClient; - @Metadata(label = "common,security", secret = true) private String username; - @Metadata(label = "common,security", secret = true) private String password; - @Metadata(label = "common,security", secret = true) private String accountSid; + @Metadata(label = "advanced") + private TwilioRestClient restClient; public TwilioComponent() { super(TwilioEndpoint.class, TwilioApiName.class, TwilioApiCollection.getCollection()); @@ -80,7 +73,6 @@ public class TwilioComponent extends AbstractApiComponent<TwilioApiName, TwilioC if (ObjectHelper.isEmpty(accountSid)) { accountSid = username; } - restClient = new TwilioRestClient.Builder(username, password) .accountSid(accountSid) .build(); diff --git a/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioConfiguration.java b/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioConfiguration.java index 9d1e042..d846709 100644 --- a/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioConfiguration.java +++ b/components/camel-twilio/src/main/java/org/apache/camel/component/twilio/TwilioConfiguration.java @@ -33,7 +33,6 @@ public class TwilioConfiguration implements Cloneable { @UriPath @Metadata(required = true) private TwilioApiName apiName; - @UriPath(enums = "create,delete,fetch,read,update") @Metadata(required = true) private String methodName; diff --git a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java index f4689ca..f6808f1 100644 --- a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java +++ b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskComponent.java @@ -28,9 +28,6 @@ import org.apache.camel.support.component.AbstractApiComponent; import org.apache.camel.util.IOHelper; import org.zendesk.client.v2.Zendesk; -/** - * The Zendesk Component. - */ @Component("zendesk") public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, ZendeskConfiguration, ZendeskApiCollection> { @@ -77,22 +74,21 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende } /** - * To use a shared {@link Zendesk} instance. - * - * @return the shared Zendesk instance + * To use a shared Zendesk instance. */ public Zendesk getZendesk() { return zendesk; } + /** + * To use a shared Zendesk instance. + */ public void setZendesk(Zendesk zendesk) { this.zendesk = zendesk; } /** * The server URL to connect. - * - * @return server URL */ public String getServerUrl() { return serverUrl; @@ -100,8 +96,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The server URL to connect. - * - * @param url server URL */ public void setServerUrl(String url) { this.serverUrl = url; @@ -109,8 +103,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The user name. - * - * @return user name */ public String getUsername() { return username; @@ -118,8 +110,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The user name. - * - * @param user user name */ public void setUsername(String user) { this.username = user; @@ -127,8 +117,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The security token. - * - * @return security token */ public String getToken() { return token; @@ -136,8 +124,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The security token. - * - * @param token security token */ public void setToken(String token) { this.token = token; @@ -145,8 +131,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The OAuth token. - * - * @return OAuth token */ public String getOauthToken() { return oauthToken; @@ -154,8 +138,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The OAuth token. - * - * @param token OAuth token */ public void setOauthToken(String token) { this.oauthToken = token; @@ -163,8 +145,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The password. - * - * @return password */ public String getPassword() { return password; @@ -172,8 +152,6 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende /** * The password. - * - * @param password password */ public void setPassword(String password) { this.password = password; @@ -217,10 +195,4 @@ public class ZendeskComponent extends AbstractApiComponent<ZendeskApiName, Zende super.doStop(); } - @Override - public void doShutdown() throws Exception { - IOHelper.close(zendesk); - super.doShutdown(); - } - } diff --git a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java index 39dd6bc..6670462 100644 --- a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java +++ b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskConfiguration.java @@ -34,26 +34,19 @@ public class ZendeskConfiguration { @UriPath @Metadata(required = true) private ZendeskApiMethod methodName; - @UriParam private String serverUrl; - @UriParam(label = "security", secret = true) private String username; - @UriParam(label = "security", secret = true) private String oauthToken; - @UriParam(label = "security", secret = true) private String token; - @UriParam(label = "security", secret = true) private String password; /** * What operation to use - * - * @return the methodName */ public ZendeskApiMethod getMethodName() { return methodName; @@ -61,8 +54,6 @@ public class ZendeskConfiguration { /** * What operation to use - * - * @param methodName the methodName to set */ public void setMethodName(ZendeskApiMethod methodName) { this.methodName = methodName; @@ -70,8 +61,6 @@ public class ZendeskConfiguration { /** * The server URL to connect. - * - * @return server URL */ public String getServerUrl() { return serverUrl; @@ -79,8 +68,6 @@ public class ZendeskConfiguration { /** * The server URL to connect. - * - * @param url server URL */ public void setServerUrl(String url) { this.serverUrl = url; @@ -88,8 +75,6 @@ public class ZendeskConfiguration { /** * The user name. - * - * @return user name */ public String getUsername() { return username; @@ -97,8 +82,6 @@ public class ZendeskConfiguration { /** * The user name. - * - * @param user user name */ public void setUsername(String user) { this.username = user; @@ -106,8 +89,6 @@ public class ZendeskConfiguration { /** * The security token. - * - * @return security token */ public String getToken() { return token; @@ -115,8 +96,6 @@ public class ZendeskConfiguration { /** * The security token. - * - * @param token security token */ public void setToken(String token) { this.token = token; @@ -124,8 +103,6 @@ public class ZendeskConfiguration { /** * The OAuth token. - * - * @return OAuth token */ public String getOauthToken() { return oauthToken; @@ -133,8 +110,6 @@ public class ZendeskConfiguration { /** * The OAuth token. - * - * @param token OAuth token */ public void setOauthToken(String token) { this.oauthToken = token; @@ -142,8 +117,6 @@ public class ZendeskConfiguration { /** * The password. - * - * @return password */ public String getPassword() { return password; @@ -151,8 +124,6 @@ public class ZendeskConfiguration { /** * The password. - * - * @param password password */ public void setPassword(String password) { this.password = password; diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java index 732b68f..5decc87 100644 --- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java +++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java @@ -49,19 +49,6 @@ public interface GoogleSheetsStreamComponentBuilderFactory { extends ComponentBuilder<GoogleSheetsStreamComponent> { /** - * OAuth 2 access token. This typically expires after an hour so - * refreshToken is recommended for long term usage. - * - * The option is a: <code>java.lang.String</code> type. - * - * Group: consumer - */ - default GoogleSheetsStreamComponentBuilder accessToken( - java.lang.String accessToken) { - doSetProperty("accessToken", accessToken); - return this; - } - /** * Google sheets application name. Example would be * camel-google-sheets/1.0. * @@ -106,18 +93,6 @@ public interface GoogleSheetsStreamComponentBuilderFactory { return this; } /** - * Client secret of the sheets application. - * - * The option is a: <code>java.lang.String</code> type. - * - * Group: consumer - */ - default GoogleSheetsStreamComponentBuilder clientSecret( - java.lang.String clientSecret) { - doSetProperty("clientSecret", clientSecret); - return this; - } - /** * To use the shared configuration. * * The option is a: @@ -163,7 +138,6 @@ public interface GoogleSheetsStreamComponentBuilderFactory { * * The option is a: <code>int</code> type. * - * Default: 0 * Group: consumer */ default GoogleSheetsStreamComponentBuilder maxResults(int maxResults) { @@ -182,20 +156,6 @@ public interface GoogleSheetsStreamComponentBuilderFactory { return this; } /** - * 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. - * - * The option is a: <code>java.lang.String</code> type. - * - * Group: consumer - */ - default GoogleSheetsStreamComponentBuilder refreshToken( - java.lang.String refreshToken) { - doSetProperty("refreshToken", refreshToken); - return this; - } - /** * Specifies the level of permissions you want a sheets application to * have to a user account. See * https://developers.google.com/identity/protocols/googlescopes for @@ -281,6 +241,45 @@ public interface GoogleSheetsStreamComponentBuilderFactory { doSetProperty("clientFactory", clientFactory); return this; } + /** + * OAuth 2 access token. This typically expires after an hour so + * refreshToken is recommended for long term usage. + * + * The option is a: <code>java.lang.String</code> type. + * + * Group: security + */ + default GoogleSheetsStreamComponentBuilder accessToken( + java.lang.String accessToken) { + doSetProperty("accessToken", accessToken); + return this; + } + /** + * Client secret of the sheets application. + * + * The option is a: <code>java.lang.String</code> type. + * + * Group: security + */ + default GoogleSheetsStreamComponentBuilder clientSecret( + java.lang.String clientSecret) { + doSetProperty("clientSecret", clientSecret); + return this; + } + /** + * 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. + * + * The option is a: <code>java.lang.String</code> type. + * + * Group: security + */ + default GoogleSheetsStreamComponentBuilder refreshToken( + java.lang.String refreshToken) { + doSetProperty("refreshToken", refreshToken); + return this; + } } class GoogleSheetsStreamComponentBuilderImpl @@ -305,23 +304,23 @@ public interface GoogleSheetsStreamComponentBuilderFactory { String name, Object value) { switch (name) { - case "accessToken": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setAccessToken((java.lang.String) value); return true; case "applicationName": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setApplicationName((java.lang.String) value); return true; case "bridgeErrorHandler": ((GoogleSheetsStreamComponent) component).setBridgeErrorHandler((boolean) value); return true; case "clientId": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setClientId((java.lang.String) value); return true; - case "clientSecret": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setClientSecret((java.lang.String) value); return true; case "configuration": ((GoogleSheetsStreamComponent) component).setConfiguration((org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration) value); return true; case "includeGridData": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setIncludeGridData((boolean) value); return true; case "majorDimension": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setMajorDimension((java.lang.String) value); return true; case "maxResults": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setMaxResults((int) value); return true; case "range": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setRange((java.lang.String) value); return true; - case "refreshToken": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setRefreshToken((java.lang.String) value); return true; case "scopes": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setScopes((java.util.List) value); return true; case "splitResults": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setSplitResults((boolean) value); return true; case "spreadsheetId": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setSpreadsheetId((java.lang.String) value); return true; case "valueRenderOption": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setValueRenderOption((java.lang.String) value); return true; case "basicPropertyBinding": ((GoogleSheetsStreamComponent) component).setBasicPropertyBinding((boolean) value); return true; case "clientFactory": ((GoogleSheetsStreamComponent) component).setClientFactory((org.apache.camel.component.google.sheets.GoogleSheetsClientFactory) value); return true; + case "accessToken": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setAccessToken((java.lang.String) value); return true; + case "clientSecret": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setClientSecret((java.lang.String) value); return true; + case "refreshToken": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setRefreshToken((java.lang.String) value); return true; default: return false; } } diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwilioComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwilioComponentBuilderFactory.java index ee7ae4b..e7e2318 100644 --- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwilioComponentBuilderFactory.java +++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwilioComponentBuilderFactory.java @@ -49,6 +49,20 @@ public interface TwilioComponentBuilderFactory { extends ComponentBuilder<TwilioComponent> { /** + * To use the shared configuration. + * + * The option is a: + * <code>org.apache.camel.component.twilio.TwilioConfiguration</code> + * type. + * + * Group: common + */ + default TwilioComponentBuilder configuration( + org.apache.camel.component.twilio.TwilioConfiguration configuration) { + doSetProperty("configuration", configuration); + return this; + } + /** * Allows for bridging the consumer to the Camel routing Error Handler, * which mean any exceptions occurred while the consumer is trying to * pickup incoming messages, or the likes, will now be processed as a @@ -104,20 +118,6 @@ public interface TwilioComponentBuilderFactory { return this; } /** - * To use the shared configuration. - * - * The option is a: - * <code>org.apache.camel.component.twilio.TwilioConfiguration</code> - * type. - * - * Group: advanced - */ - default TwilioComponentBuilder configuration( - org.apache.camel.component.twilio.TwilioConfiguration configuration) { - doSetProperty("configuration", configuration); - return this; - } - /** * To use the shared REST client. * * The option is a: <code>com.twilio.http.TwilioRestClient</code> type. @@ -179,10 +179,10 @@ public interface TwilioComponentBuilderFactory { String name, Object value) { switch (name) { + case "configuration": ((TwilioComponent) component).setConfiguration((org.apache.camel.component.twilio.TwilioConfiguration) value); return true; case "bridgeErrorHandler": ((TwilioComponent) component).setBridgeErrorHandler((boolean) value); return true; case "lazyStartProducer": ((TwilioComponent) component).setLazyStartProducer((boolean) value); return true; case "basicPropertyBinding": ((TwilioComponent) component).setBasicPropertyBinding((boolean) value); return true; - case "configuration": ((TwilioComponent) component).setConfiguration((org.apache.camel.component.twilio.TwilioConfiguration) value); return true; case "restClient": ((TwilioComponent) component).setRestClient((com.twilio.http.TwilioRestClient) value); return true; case "accountSid": ((TwilioComponent) component).setAccountSid((java.lang.String) value); return true; case "password": ((TwilioComponent) component).setPassword((java.lang.String) value); return true; diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index 1bacdf9..d1f402d 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -2957,9 +2957,6 @@ public class StaticEndpointBuilders { * PLAN, REPORT, SETTLEMENT_BATCH_SUMMARY, SUBSCRIPTION, TRANSACTION, * WEBHOOK_NOTIFICATION * - * Path parameter: methodName - * What sub operation to use for the selected operation - * * @param path apiName/methodName */ public static org.apache.camel.builder.endpoint.dsl.BraintreeEndpointBuilderFactory.BraintreeEndpointBuilder braintree( @@ -2984,9 +2981,6 @@ public class StaticEndpointBuilders { * PLAN, REPORT, SETTLEMENT_BATCH_SUMMARY, SUBSCRIPTION, TRANSACTION, * WEBHOOK_NOTIFICATION * - * Path parameter: methodName - * What sub operation to use for the selected operation - * * @param componentName to use a custom component name for the endpoint * instead of the default name * @param path apiName/methodName @@ -5979,7 +5973,7 @@ public class StaticEndpointBuilders { * * Syntax: <code>google-calendar-stream:index</code> * - * Path parameter: index + * Path parameter: index (required) * Specifies an index for the endpoint * * @param path index @@ -5998,7 +5992,7 @@ public class StaticEndpointBuilders { * * Syntax: <code>google-calendar-stream:index</code> * - * Path parameter: index + * Path parameter: index (required) * Specifies an index for the endpoint * * @param componentName to use a custom component name for the endpoint @@ -6138,7 +6132,7 @@ public class StaticEndpointBuilders { * * Syntax: <code>google-mail-stream:index</code> * - * Path parameter: index + * Path parameter: index (required) * Currently not in use * * @param path index @@ -6157,7 +6151,7 @@ public class StaticEndpointBuilders { * * Syntax: <code>google-mail-stream:index</code> * - * Path parameter: index + * Path parameter: index (required) * Currently not in use * * @param componentName to use a custom component name for the endpoint @@ -6279,7 +6273,7 @@ public class StaticEndpointBuilders { * * Syntax: <code>google-sheets-stream:apiName</code> * - * Path parameter: apiName + * Path parameter: apiName (required) * Sets the apiName. * * @param path apiName @@ -6298,7 +6292,7 @@ public class StaticEndpointBuilders { * * Syntax: <code>google-sheets-stream:apiName</code> * - * Path parameter: apiName + * Path parameter: apiName (required) * Sets the apiName. * * @param componentName to use a custom component name for the endpoint diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java index 77a59cf..5c122fb 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java @@ -347,9 +347,6 @@ public interface BraintreeEndpointBuilderFactory { * PAYMENT_METHOD_NONCE, PLAN, REPORT, SETTLEMENT_BATCH_SUMMARY, * SUBSCRIPTION, TRANSACTION, WEBHOOK_NOTIFICATION * - * Path parameter: methodName - * What sub operation to use for the selected operation - * * @param path apiName/methodName */ default BraintreeEndpointBuilder braintree(String path) { @@ -373,9 +370,6 @@ public interface BraintreeEndpointBuilderFactory { * PAYMENT_METHOD_NONCE, PLAN, REPORT, SETTLEMENT_BATCH_SUMMARY, * SUBSCRIPTION, TRANSACTION, WEBHOOK_NOTIFICATION * - * Path parameter: methodName - * What sub operation to use for the selected operation - * * @param componentName to use a custom component name for the endpoint * instead of the default name * @param path apiName/methodName diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java index 0151a80..87720b7 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java @@ -864,7 +864,7 @@ public interface GoogleCalendarStreamEndpointBuilderFactory { * * Syntax: <code>google-calendar-stream:index</code> * - * Path parameter: index + * Path parameter: index (required) * Specifies an index for the endpoint * * @param path index @@ -883,7 +883,7 @@ public interface GoogleCalendarStreamEndpointBuilderFactory { * * Syntax: <code>google-calendar-stream:index</code> * - * Path parameter: index + * Path parameter: index (required) * Specifies an index for the endpoint * * @param componentName to use a custom component name for the endpoint diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java index 624ea28..8460e61 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java @@ -797,7 +797,7 @@ public interface GoogleMailStreamEndpointBuilderFactory { * * Syntax: <code>google-mail-stream:index</code> * - * Path parameter: index + * Path parameter: index (required) * Currently not in use * * @param path index @@ -815,7 +815,7 @@ public interface GoogleMailStreamEndpointBuilderFactory { * * Syntax: <code>google-mail-stream:index</code> * - * Path parameter: index + * Path parameter: index (required) * Currently not in use * * @param componentName to use a custom component name for the endpoint diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java index 70a1770..26fe242 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java @@ -48,18 +48,6 @@ public interface GoogleSheetsStreamEndpointBuilderFactory { return (AdvancedGoogleSheetsStreamEndpointBuilder) this; } /** - * OAuth 2 access token. This typically expires after an hour so - * refreshToken is recommended for long term usage. - * - * The option is a: <code>java.lang.String</code> type. - * - * Group: consumer - */ - default GoogleSheetsStreamEndpointBuilder accessToken(String accessToken) { - doSetProperty("accessToken", accessToken); - return this; - } - /** * Google sheets application name. Example would be * camel-google-sheets/1.0. * @@ -122,18 +110,6 @@ public interface GoogleSheetsStreamEndpointBuilderFactory { return this; } /** - * Client secret of the sheets application. - * - * The option is a: <code>java.lang.String</code> type. - * - * Group: consumer - */ - default GoogleSheetsStreamEndpointBuilder clientSecret( - String clientSecret) { - doSetProperty("clientSecret", clientSecret); - return this; - } - /** * True if grid data should be returned. * * The option is a: <code>boolean</code> type. @@ -179,7 +155,6 @@ public interface GoogleSheetsStreamEndpointBuilderFactory { * * The option is a: <code>int</code> type. * - * Default: 0 * Group: consumer */ default GoogleSheetsStreamEndpointBuilder maxResults(int maxResults) { @@ -193,7 +168,6 @@ public interface GoogleSheetsStreamEndpointBuilderFactory { * * The option will be converted to a <code>int</code> type. * - * Default: 0 * Group: consumer */ default GoogleSheetsStreamEndpointBuilder maxResults(String maxResults) { @@ -212,20 +186,6 @@ public interface GoogleSheetsStreamEndpointBuilderFactory { return this; } /** - * 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. - * - * The option is a: <code>java.lang.String</code> type. - * - * Group: consumer - */ - default GoogleSheetsStreamEndpointBuilder refreshToken( - String refreshToken) { - doSetProperty("refreshToken", refreshToken); - return this; - } - /** * Specifies the level of permissions you want a sheets application to * have to a user account. See * https://developers.google.com/identity/protocols/googlescopes for @@ -728,6 +688,44 @@ public interface GoogleSheetsStreamEndpointBuilderFactory { doSetProperty("useFixedDelay", useFixedDelay); return this; } + /** + * OAuth 2 access token. This typically expires after an hour so + * refreshToken is recommended for long term usage. + * + * The option is a: <code>java.lang.String</code> type. + * + * Group: security + */ + default GoogleSheetsStreamEndpointBuilder accessToken(String accessToken) { + doSetProperty("accessToken", accessToken); + return this; + } + /** + * Client secret of the sheets application. + * + * The option is a: <code>java.lang.String</code> type. + * + * Group: security + */ + default GoogleSheetsStreamEndpointBuilder clientSecret( + String clientSecret) { + doSetProperty("clientSecret", clientSecret); + return this; + } + /** + * 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. + * + * The option is a: <code>java.lang.String</code> type. + * + * Group: security + */ + default GoogleSheetsStreamEndpointBuilder refreshToken( + String refreshToken) { + doSetProperty("refreshToken", refreshToken); + return this; + } } /** @@ -897,7 +895,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory { * * Syntax: <code>google-sheets-stream:apiName</code> * - * Path parameter: apiName + * Path parameter: apiName (required) * Sets the apiName. * * @param path apiName @@ -915,7 +913,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory { * * Syntax: <code>google-sheets-stream:apiName</code> * - * Path parameter: apiName + * Path parameter: apiName (required) * Sets the apiName. * * @param componentName to use a custom component name for the endpoint diff --git a/docs/components/modules/ROOT/pages/braintree-component.adoc b/docs/components/modules/ROOT/pages/braintree-component.adoc index 5dfcfec..e947299 100644 --- a/docs/components/modules/ROOT/pages/braintree-component.adoc +++ b/docs/components/modules/ROOT/pages/braintree-component.adoc @@ -72,14 +72,13 @@ braintree:apiName/methodName with the following path and query parameters: -=== Path Parameters (2 parameters): +=== Path Parameters (1 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type | *apiName* | *Required* What kind of operation to perform. There are 17 enums and the value can be one of: ADD_ON, ADDRESS, CLIENT_TOKEN, CREDIT_CARD_VERIFICATION, CUSTOMER, DISCOUNT, DISPUTE, DOCUMENT_UPLOAD, MERCHANT_ACCOUNT, PAYMENT_METHOD, PAYMENT_METHOD_NONCE, PLAN, REPORT, SETTLEMENT_BATCH_SUMMARY, SUBSCRIPTION, TRANSACTION, WEBHOOK_NOTIFICATION | | BraintreeApiName -| *methodName* | What sub operation to use for the selected operation | | String |=== 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 9b3df2b..73af126 100644 --- a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc +++ b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc @@ -98,7 +98,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *index* | Specifies an index for the endpoint | | String +| *index* | *Required* Specifies an index for the endpoint | | String |=== 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 7f1aa5e..3ee1ee8 100644 --- a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc +++ b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc @@ -96,7 +96,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *index* | Currently not in use | | String +| *index* | *Required* Currently not in use | | String |=== 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 3763a27..bf0f7e5 100644 --- a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc +++ b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc @@ -61,23 +61,23 @@ The Google Sheets Stream component supports 17 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String | *applicationName* (consumer) | Google sheets application name. Example would be camel-google-sheets/1.0 | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *clientId* (consumer) | Client ID of the sheets application | | String -| *clientSecret* (consumer) | Client secret of the sheets application | | String | *configuration* (consumer) | To use the shared configuration | | GoogleSheetsStreamConfiguration | *includeGridData* (consumer) | True if grid data should be returned. | false | boolean | *majorDimension* (consumer) | Specifies the major dimension that results should use.. There are 3 enums and the value can be one of: ROWS, COLUMNS, DIMENSION_UNSPECIFIED | ROWS | String -| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 0 | int +| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | | int | *range* (consumer) | Specifies the range of rows and columns in a sheet to get data from. | | String -| *refreshToken* (consumer) | 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 | *scopes* (consumer) | Specifies the level of permissions you want a sheets application to have to a user account. See \https://developers.google.com/identity/protocols/googlescopes for more info. | | List | *splitResults* (consumer) | True if value range result should be split into rows or columns to process each of them individually. When true each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used as exchange junk size. | false | boolean | *spreadsheetId* (consumer) | Specifies the spreadsheet identifier that is used to identify the target to obtain. | | String | *valueRenderOption* (consumer) | Determines how values should be rendered in the output. There are 3 enums and the value can be one of: FORMATTED_VALUE, UNFORMATTED_VALUE, FORMULA | FORMATTED_VALUE | String | *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *clientFactory* (advanced) | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory | | GoogleSheetsClientFactory +| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String +| *clientSecret* (security) | Client secret of the sheets 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 |=== // component options: END @@ -99,7 +99,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *apiName* | Sets the apiName. | | String +| *apiName* | *Required* Sets the apiName. | | String |=== @@ -109,16 +109,13 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String | *applicationName* (consumer) | Google sheets application name. Example would be camel-google-sheets/1.0 | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *clientId* (consumer) | Client ID of the sheets application | | String -| *clientSecret* (consumer) | Client secret of the sheets application | | String | *includeGridData* (consumer) | True if grid data should be returned. | false | boolean | *majorDimension* (consumer) | Specifies the major dimension that results should use.. There are 3 enums and the value can be one of: ROWS, COLUMNS, DIMENSION_UNSPECIFIED | ROWS | String -| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 0 | int +| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | | int | *range* (consumer) | Specifies the range of rows and columns in a sheet to get data from. | | String -| *refreshToken* (consumer) | 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 | *scopes* (consumer) | Specifies the level of permissions you want a sheets application to have to a user account. See \https://developers.google.com/identity/protocols/googlescopes for more info. | | List | *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean | *splitResults* (consumer) | True if value range result should be split into rows or columns to process each of them individually. When true each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used as exchange junk size. | false | boolean @@ -143,6 +140,9 @@ with the following path and query parameters: | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean | *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 +| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String +| *clientSecret* (security) | Client secret of the sheets 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 |=== diff --git a/docs/components/modules/ROOT/pages/twilio-component.adoc b/docs/components/modules/ROOT/pages/twilio-component.adoc index fad193d..52178af 100644 --- a/docs/components/modules/ROOT/pages/twilio-component.adoc +++ b/docs/components/modules/ROOT/pages/twilio-component.adoc @@ -39,10 +39,10 @@ The Twilio component supports 8 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *configuration* (common) | To use the shared configuration | | TwilioConfiguration | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean -| *configuration* (advanced) | To use the shared configuration | | TwilioConfiguration | *restClient* (advanced) | To use the shared REST client | | TwilioRestClient | *accountSid* (security) | The account SID to use. | | String | *password* (security) | Auth token for the account. | | String