You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/07/15 07:56:34 UTC
[camel] branch main updated: CAMEL-18170 - Renaming keyResource -> serviceAccountKey
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 7d2edf6bd3e CAMEL-18170 - Renaming keyResource -> serviceAccountKey
7d2edf6bd3e is described below
commit 7d2edf6bd3ea78363943a6ac887b505e8c459c12
Author: Vladimir V. Bychkov <gi...@bychkov.name>
AuthorDate: Wed Jul 13 16:59:08 2022 +0200
CAMEL-18170 - Renaming keyResource -> serviceAccountKey
---
.../catalog/components/google-mail-stream.json | 8 +--
.../catalog/components/google-sheets-stream.json | 8 +--
.../camel/catalog/components/google-sheets.json | 8 +--
.../src/main/docs/google-calendar-component.adoc | 2 +-
.../docs/google-calendar-stream-component.adoc | 2 +-
.../calendar/BatchGoogleCalendarClientFactory.java | 2 +-
.../google/calendar/GoogleCalendarComponent.java | 2 +-
.../stream/GoogleCalendarStreamComponent.java | 2 +-
.../src/main/docs/google-drive-component.adoc | 2 +-
.../drive/BatchGoogleDriveClientFactory.java | 2 +-
.../google/drive/GoogleDriveComponent.java | 2 +-
.../GoogleMailStreamComponentConfigurer.java | 12 ++--
.../stream/GoogleMailStreamEndpointConfigurer.java | 12 ++--
.../stream/GoogleMailStreamEndpointUriFactory.java | 2 +-
.../google/mail/stream/google-mail-stream.json | 8 +--
.../src/main/docs/google-mail-component.adoc | 2 +-
.../main/docs/google-mail-stream-component.adoc | 2 +-
.../google/mail/BatchGoogleMailClientFactory.java | 2 +-
.../component/google/mail/GoogleMailComponent.java | 2 +-
.../mail/stream/GoogleMailStreamComponent.java | 4 +-
.../mail/stream/GoogleMailStreamConfiguration.java | 12 ++--
.../sheets/GoogleSheetsComponentConfigurer.java | 14 ++---
.../GoogleSheetsConfigurationConfigurer.java | 14 ++---
.../sheets/GoogleSheetsEndpointConfigurer.java | 14 ++---
.../sheets/GoogleSheetsEndpointUriFactory.java | 2 +-
...preadsheetsEndpointConfigurationConfigurer.java | 14 ++---
...heetsValuesEndpointConfigurationConfigurer.java | 14 ++---
.../GoogleSheetsStreamComponentConfigurer.java | 12 ++--
.../GoogleSheetsStreamEndpointConfigurer.java | 12 ++--
.../GoogleSheetsStreamEndpointUriFactory.java | 2 +-
.../component/google/sheets/google-sheets.json | 8 +--
.../google/sheets/stream/google-sheets-stream.json | 8 +--
.../src/main/docs/google-sheets-component.adoc | 2 +-
.../main/docs/google-sheets-stream-component.adoc | 2 +-
.../sheets/BatchGoogleSheetsClientFactory.java | 14 +++--
.../google/sheets/GoogleSheetsClientFactory.java | 2 +-
.../google/sheets/GoogleSheetsComponent.java | 6 +-
.../google/sheets/GoogleSheetsConfiguration.java | 12 ++--
.../sheets/stream/GoogleSheetsStreamComponent.java | 6 +-
.../stream/GoogleSheetsStreamConfiguration.java | 12 ++--
.../sheets/AbstractGoogleSheetsTestSupport.java | 2 +-
.../src/test/resources/test-options.properties | 2 +-
.../GoogleMailStreamComponentBuilderFactory.java | 26 ++++----
.../dsl/GoogleSheetsComponentBuilderFactory.java | 26 ++++----
.../GoogleSheetsStreamComponentBuilderFactory.java | 26 ++++----
.../GoogleMailStreamEndpointBuilderFactory.java | 57 +++++++++---------
.../dsl/GoogleSheetsEndpointBuilderFactory.java | 69 +++++++++++-----------
.../GoogleSheetsStreamEndpointBuilderFactory.java | 59 +++++++++---------
48 files changed, 270 insertions(+), 265 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail-stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail-stream.json
index 00e1f55324b..13d305c29e4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail-stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail-stream.json
@@ -36,8 +36,8 @@
"configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The configuration" },
"accessToken": { "kind": "property", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for lo [...]
"clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the mail application" },
- "keyResource": { "kind": "property", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 [...]
+ "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 [...]
+ "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
},
"headers": {
"CamelGoogleMailStreamTo": { "kind": "header", "displayName": "", "group": "consumer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The recipient of the message", "constantName": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants#MAIL_TO" },
@@ -78,7 +78,7 @@
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for l [...]
"clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the mail application" },
- "keyResource": { "kind": "parameter", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 [...]
+ "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 [...]
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
index 9b69d31d0f7..a575c6c27c8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
@@ -39,8 +39,8 @@
"clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsClientFactory", "deprecated": false, "autowired": 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, "autowired": 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 fo [...]
"clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" },
- "keyResource": { "kind": "property", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 accessTo [...]
+ "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 accessTo [...]
+ "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
},
"headers": {
"CamelGoogleSheetsSpreadsheetId": { "kind": "header", "displayName": "", "group": "consumer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Specifies the spreadsheet identifier that is used to identify the target to obtain.", "constantName": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants#SPREADSHEET_ID" },
@@ -83,7 +83,7 @@
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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, "autowired": 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 f [...]
"clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" },
- "keyResource": { "kind": "parameter", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 accessT [...]
+ "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 accessT [...]
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
index f842e211395..9a32db32717 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
@@ -36,8 +36,8 @@
"clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsClientFactory", "deprecated": false, "autowired": 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, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term u [...]
"clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" },
- "keyResource": { "kind": "property", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever th [...]
+ "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever th [...]
+ "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
},
"properties": {
"apiName": { "kind": "path", "displayName": "Api Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName", "enum": [ "SPREADSHEETS", "DATA" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "What kind of op [...]
@@ -70,8 +70,8 @@
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term [...]
"clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" },
- "keyResource": { "kind": "parameter", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever t [...]
+ "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever t [...]
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
},
"apis": {
"data": { "consumerOnly": false, "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.go [...]
diff --git a/components/camel-google/camel-google-calendar/src/main/docs/google-calendar-component.adoc b/components/camel-google/camel-google-calendar/src/main/docs/google-calendar-component.adoc
index 6cadb57447f..54fb51f9b4d 100644
--- a/components/camel-google/camel-google-calendar/src/main/docs/google-calendar-component.adoc
+++ b/components/camel-google/camel-google-calendar/src/main/docs/google-calendar-component.adoc
@@ -30,7 +30,7 @@ generating a long-lived refreshToken is
the https://developers.google.com/oauthplayground[OAuth playground].
In the case of a https://developers.google.com/identity/protocols/oauth2#serviceaccount[service account],
-credentials comprise of a JSON-file (keyResource). You can also use
+credentials comprise of a JSON-file (serviceAccountKey). You can also use
https://developers.google.com/identity/protocols/oauth2/service-account#delegatingauthority[delegation domain-wide authority]
(delegate) and one, several, or all possible
https://developers.google.com/calendar/api/guides/auth[Calendar API Auth Scopes] (scopes).
diff --git a/components/camel-google/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index ca267e8314a..53e2e85f496 100644
--- a/components/camel-google/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -30,7 +30,7 @@ generating a long-lived refreshToken is
the https://developers.google.com/oauthplayground[OAuth playground].
In the case of a https://developers.google.com/identity/protocols/oauth2#serviceaccount[service account],
-credentials comprise of a JSON-file (keyResource). You can also use
+credentials comprise of a JSON-file (serviceAccountKey). You can also use
https://developers.google.com/identity/protocols/oauth2/service-account#delegatingauthority[delegation domain-wide authority]
(delegate) and one, several, or all possible
https://developers.google.com/calendar/api/guides/auth[Calendar API Auth Scopes] (scopes).
diff --git a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
index 6490afcc74c..857c62d56d7 100644
--- a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
+++ b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
@@ -105,7 +105,7 @@ public class BatchGoogleCalendarClientFactory implements GoogleCalendarClientFac
CamelContext camelContext, String serviceAccountKey, Collection<String> scopes, String applicationName,
String delegate) {
if (serviceAccountKey == null) {
- throw new IllegalArgumentException("keyResource is required to create Google Calendar client.");
+ throw new IllegalArgumentException("serviceAccountKey is required to create Google Calendar client.");
}
try {
Credential credential = authorizeServiceAccount(camelContext, serviceAccountKey, delegate, scopes);
diff --git a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index 6d5e0a3c904..1bba4e43e09 100644
--- a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++ b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -61,7 +61,7 @@ public class GoogleCalendarComponent
config.getApplicationName(), config.getDelegate());
} else {
throw new IllegalArgumentException(
- "(clientId and clientSecret) or keyResource are required to create Google Calendar client");
+ "(clientId and clientSecret) or serviceAccountKey are required to create Google Calendar client");
}
}
return client;
diff --git a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
index 03198914c7c..ee47ca2b8a0 100644
--- a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
+++ b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
@@ -58,7 +58,7 @@ public class GoogleCalendarStreamComponent extends DefaultComponent {
config.getApplicationName(), config.getDelegate());
} else {
throw new IllegalArgumentException(
- "(clientId and clientSecret) or keyResource are required to create Gmail client");
+ "(clientId and clientSecret) or serviceAccountKey are required to create Gmail client");
}
}
return client;
diff --git a/components/camel-google/camel-google-drive/src/main/docs/google-drive-component.adoc b/components/camel-google/camel-google-drive/src/main/docs/google-drive-component.adoc
index 260cef0acce..f0aab61d035 100644
--- a/components/camel-google/camel-google-drive/src/main/docs/google-drive-component.adoc
+++ b/components/camel-google/camel-google-drive/src/main/docs/google-drive-component.adoc
@@ -29,7 +29,7 @@ generating a long-lived refreshToken is the
https://developers.google.com/oauthplayground[OAuth playground].
In the case of a https://developers.google.com/identity/protocols/oauth2#serviceaccount[service account],
-credentials comprise of a JSON-file (keyResource). You can also use
+credentials comprise of a JSON-file (serviceAccountKey). You can also use
https://developers.google.com/identity/protocols/oauth2/service-account#delegatingauthority[delegation domain-wide authority]
(delegate) and one, several, or all possible
https://developers.google.com/drive/api/v2/about-auth[Drive API (V2) Auth Scopes] (scopes).
diff --git a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
index 364053b6773..93b94ae95e7 100644
--- a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
+++ b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/BatchGoogleDriveClientFactory.java
@@ -94,7 +94,7 @@ public class BatchGoogleDriveClientFactory implements GoogleDriveClientFactory {
CamelContext camelContext, String serviceAccountKey, Collection<String> scopes, String applicationName,
String delegate) {
if (serviceAccountKey == null) {
- throw new IllegalArgumentException("keyResource is required to create Gmail client.");
+ throw new IllegalArgumentException("serviceAccountKey is required to create Gmail client.");
}
try {
Credential credential = authorizeServiceAccount(camelContext, serviceAccountKey, delegate, scopes);
diff --git a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index f04a0191433..0df93d55628 100644
--- a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -62,7 +62,7 @@ public class GoogleDriveComponent
config.getScopes(), config.getApplicationName(), config.getDelegate());
} else {
throw new IllegalArgumentException(
- "(clientId and clientSecret) or keyResource are required to create Google Drive client");
+ "(clientId and clientSecret) or serviceAccountKey are required to create Google Drive client");
}
}
return client;
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentConfigurer.java
index b07a0ae4830..d8bda0b35d7 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponentConfigurer.java
@@ -44,8 +44,6 @@ public class GoogleMailStreamComponentConfigurer extends PropertyConfigurerSuppo
case "clientSecret": getOrCreateConfiguration(target).setClientSecret(property(camelContext, java.lang.String.class, value)); return true;
case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration.class, value)); return true;
case "delegate": getOrCreateConfiguration(target).setDelegate(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "keyResource": getOrCreateConfiguration(target).setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "labels": getOrCreateConfiguration(target).setLabels(property(camelContext, java.lang.String.class, value)); return true;
case "markasread":
case "markAsRead": getOrCreateConfiguration(target).setMarkAsRead(property(camelContext, boolean.class, value)); return true;
@@ -55,6 +53,8 @@ public class GoogleMailStreamComponentConfigurer extends PropertyConfigurerSuppo
case "refreshtoken":
case "refreshToken": getOrCreateConfiguration(target).setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes": getOrCreateConfiguration(target).setScopes(property(camelContext, java.util.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey": getOrCreateConfiguration(target).setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
}
}
@@ -78,8 +78,6 @@ public class GoogleMailStreamComponentConfigurer extends PropertyConfigurerSuppo
case "clientSecret": return java.lang.String.class;
case "configuration": return org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration.class;
case "delegate": return java.lang.String.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "labels": return java.lang.String.class;
case "markasread":
case "markAsRead": return boolean.class;
@@ -89,6 +87,8 @@ public class GoogleMailStreamComponentConfigurer extends PropertyConfigurerSuppo
case "refreshtoken":
case "refreshToken": return java.lang.String.class;
case "scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
default: return null;
}
}
@@ -113,8 +113,6 @@ public class GoogleMailStreamComponentConfigurer extends PropertyConfigurerSuppo
case "clientSecret": return getOrCreateConfiguration(target).getClientSecret();
case "configuration": return target.getConfiguration();
case "delegate": return getOrCreateConfiguration(target).getDelegate();
- case "keyresource":
- case "keyResource": return getOrCreateConfiguration(target).getKeyResource();
case "labels": return getOrCreateConfiguration(target).getLabels();
case "markasread":
case "markAsRead": return getOrCreateConfiguration(target).isMarkAsRead();
@@ -124,6 +122,8 @@ public class GoogleMailStreamComponentConfigurer extends PropertyConfigurerSuppo
case "refreshtoken":
case "refreshToken": return getOrCreateConfiguration(target).getRefreshToken();
case "scopes": return getOrCreateConfiguration(target).getScopes();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return getOrCreateConfiguration(target).getServiceAccountKey();
default: return null;
}
}
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointConfigurer.java
index f4557283a89..d7670d382b4 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointConfigurer.java
@@ -46,8 +46,6 @@ public class GoogleMailStreamEndpointConfigurer extends PropertyConfigurerSuppor
case "greedy": target.setGreedy(property(camelContext, boolean.class, value)); return true;
case "initialdelay":
case "initialDelay": target.setInitialDelay(property(camelContext, long.class, value)); return true;
- case "keyresource":
- case "keyResource": target.getConfiguration().setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "labels": target.getConfiguration().setLabels(property(camelContext, java.lang.String.class, value)); return true;
case "markasread":
case "markAsRead": target.getConfiguration().setMarkAsRead(property(camelContext, boolean.class, value)); return true;
@@ -70,6 +68,8 @@ public class GoogleMailStreamEndpointConfigurer extends PropertyConfigurerSuppor
case "scopes": target.getConfiguration().setScopes(property(camelContext, java.util.List.class, value)); return true;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": target.setSendEmptyMessageWhenIdle(property(camelContext, boolean.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey": target.getConfiguration().setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "startscheduler":
case "startScheduler": target.setStartScheduler(property(camelContext, boolean.class, value)); return true;
case "timeunit":
@@ -108,8 +108,6 @@ public class GoogleMailStreamEndpointConfigurer extends PropertyConfigurerSuppor
case "greedy": return boolean.class;
case "initialdelay":
case "initialDelay": return long.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "labels": return java.lang.String.class;
case "markasread":
case "markAsRead": return boolean.class;
@@ -132,6 +130,8 @@ public class GoogleMailStreamEndpointConfigurer extends PropertyConfigurerSuppor
case "scopes": return java.util.List.class;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return boolean.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
case "startscheduler":
case "startScheduler": return boolean.class;
case "timeunit":
@@ -171,8 +171,6 @@ public class GoogleMailStreamEndpointConfigurer extends PropertyConfigurerSuppor
case "greedy": return target.isGreedy();
case "initialdelay":
case "initialDelay": return target.getInitialDelay();
- case "keyresource":
- case "keyResource": return target.getConfiguration().getKeyResource();
case "labels": return target.getConfiguration().getLabels();
case "markasread":
case "markAsRead": return target.getConfiguration().isMarkAsRead();
@@ -195,6 +193,8 @@ public class GoogleMailStreamEndpointConfigurer extends PropertyConfigurerSuppor
case "scopes": return target.getConfiguration().getScopes();
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return target.isSendEmptyMessageWhenIdle();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return target.getConfiguration().getServiceAccountKey();
case "startscheduler":
case "startScheduler": return target.isStartScheduler();
case "timeunit":
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriFactory.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriFactory.java
index eb7343a8c71..ad66390538e 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriFactory.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriFactory.java
@@ -37,7 +37,6 @@ public class GoogleMailStreamEndpointUriFactory extends org.apache.camel.support
props.add("greedy");
props.add("index");
props.add("initialDelay");
- props.add("keyResource");
props.add("labels");
props.add("markAsRead");
props.add("maxResults");
@@ -51,6 +50,7 @@ public class GoogleMailStreamEndpointUriFactory extends org.apache.camel.support
props.add("schedulerProperties");
props.add("scopes");
props.add("sendEmptyMessageWhenIdle");
+ props.add("serviceAccountKey");
props.add("startScheduler");
props.add("timeUnit");
props.add("useFixedDelay");
diff --git a/components/camel-google/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json b/components/camel-google/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
index 00e1f55324b..13d305c29e4 100644
--- a/components/camel-google/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
+++ b/components/camel-google/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
@@ -36,8 +36,8 @@
"configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The configuration" },
"accessToken": { "kind": "property", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for lo [...]
"clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the mail application" },
- "keyResource": { "kind": "property", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 [...]
+ "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 [...]
+ "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
},
"headers": {
"CamelGoogleMailStreamTo": { "kind": "header", "displayName": "", "group": "consumer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The recipient of the message", "constantName": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConstants#MAIL_TO" },
@@ -78,7 +78,7 @@
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for l [...]
"clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the mail application" },
- "keyResource": { "kind": "parameter", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 [...]
+ "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 [...]
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
}
}
diff --git a/components/camel-google/camel-google-mail/src/main/docs/google-mail-component.adoc b/components/camel-google/camel-google-mail/src/main/docs/google-mail-component.adoc
index 2468f838beb..d031d54ccac 100644
--- a/components/camel-google/camel-google-mail/src/main/docs/google-mail-component.adoc
+++ b/components/camel-google/camel-google-mail/src/main/docs/google-mail-component.adoc
@@ -30,7 +30,7 @@ generating a long-lived refreshToken is
the https://developers.google.com/oauthplayground[OAuth playground].
In the case of a https://developers.google.com/identity/protocols/oauth2#serviceaccount[service account],
-credentials comprise of a JSON-file (keyResource). You can also use
+credentials comprise of a JSON-file (serviceAccountKey). You can also use
https://developers.google.com/identity/protocols/oauth2/service-account#delegatingauthority[delegation domain-wide authority]
(delegate) and one, several, or all possible
https://developers.google.com/gmail/api/auth/scopes[GMail API Auth Scopes] (scopes).
diff --git a/components/camel-google/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
index 0f6896f45e2..1f86ea09e8a 100644
--- a/components/camel-google/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+++ b/components/camel-google/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
@@ -30,7 +30,7 @@ generating a long-lived refreshToken is
the https://developers.google.com/oauthplayground[OAuth playground].
In the case of a https://developers.google.com/identity/protocols/oauth2#serviceaccount[service account],
-credentials comprise of a JSON-file (keyResource). You can also use
+credentials comprise of a JSON-file (serviceAccountKey). You can also use
https://developers.google.com/identity/protocols/oauth2/service-account#delegatingauthority[delegation domain-wide authority]
(delegate) and one, several, or all possible
https://developers.google.com/gmail/api/auth/scopes[GMail API Auth Scopes] (scopes).
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
index 866939818d4..c78fa98a2ff 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
@@ -74,7 +74,7 @@ public class BatchGoogleMailClientFactory implements GoogleMailClientFactory {
CamelContext camelContext, String serviceAccountKey, Collection<String> scopes, String applicationName,
String delegate) {
if (serviceAccountKey == null) {
- throw new IllegalArgumentException("keyResource is required to create Gmail client.");
+ throw new IllegalArgumentException("serviceAccountKey is required to create Gmail client.");
}
try {
Credential credential = authorizeServiceAccount(camelContext, serviceAccountKey, delegate, scopes);
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index fb6bbb16a74..94580189c31 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -63,7 +63,7 @@ public class GoogleMailComponent
config.getScopes(), config.getApplicationName(), config.getDelegate());
} else {
throw new IllegalArgumentException(
- "(clientId and clientSecret) or keyResource are required to create Gmail client");
+ "(clientId and clientSecret) or serviceAccountKey are required to create Gmail client");
}
}
return client;
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponent.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponent.java
index 90f119bdce7..839e29540d0 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponent.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamComponent.java
@@ -57,8 +57,8 @@ public class GoogleMailStreamComponent extends DefaultComponent {
googleMailConfiguration.getClientSecret(), googleMailConfiguration.getScopes(),
googleMailConfiguration.getApplicationName(), googleMailConfiguration.getRefreshToken(),
googleMailConfiguration.getAccessToken());
- } else if (googleMailConfiguration.getKeyResource() != null) {
- client = getClientFactory().makeClient(getCamelContext(), googleMailConfiguration.getKeyResource(),
+ } else if (googleMailConfiguration.getServiceAccountKey() != null) {
+ client = getClientFactory().makeClient(getCamelContext(), googleMailConfiguration.getServiceAccountKey(),
googleMailConfiguration.getScopes(), googleMailConfiguration.getApplicationName(),
googleMailConfiguration.getDelegate());
}
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java
index eba2ebfd3d5..26bec1dd8f0 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java
@@ -52,7 +52,7 @@ public class GoogleMailStreamConfiguration implements Cloneable {
private boolean markAsRead = true;
/* Service account */
@UriParam(label = "security")
- private String keyResource;
+ private String serviceAccountKey;
@UriParam
private String delegate;
@UriParam
@@ -169,17 +169,17 @@ public class GoogleMailStreamConfiguration implements Cloneable {
this.markAsRead = markAsRead;
}
- public String getKeyResource() {
- return keyResource;
+ public String getServiceAccountKey() {
+ return serviceAccountKey;
}
/**
* Sets "*.json" file with credentials for Service account
*
- * @param keyResource String file, classpath, or http url
+ * @param serviceAccountKey String file, classpath, or http url
*/
- public void setKeyResource(String keyResource) {
- this.keyResource = keyResource;
+ public void setServiceAccountKey(String serviceAccountKey) {
+ this.serviceAccountKey = serviceAccountKey;
}
public String getDelegate() {
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsComponentConfigurer.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsComponentConfigurer.java
index b3d7eb021c8..49406f36e39 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsComponentConfigurer.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsComponentConfigurer.java
@@ -32,8 +32,8 @@ public class GoogleSheetsComponentConfigurer extends PropertyConfigurerSupport i
map.put("clientFactory", org.apache.camel.component.google.sheets.GoogleSheetsClientFactory.class);
map.put("accessToken", java.lang.String.class);
map.put("clientSecret", java.lang.String.class);
- map.put("keyResource", java.lang.String.class);
map.put("refreshToken", java.lang.String.class);
+ map.put("serviceAccountKey", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -64,13 +64,13 @@ public class GoogleSheetsComponentConfigurer extends PropertyConfigurerSupport i
case "clientSecret": getOrCreateConfiguration(target).setClientSecret(property(camelContext, java.lang.String.class, value)); return true;
case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.google.sheets.GoogleSheetsConfiguration.class, value)); return true;
case "delegate": getOrCreateConfiguration(target).setDelegate(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "keyResource": getOrCreateConfiguration(target).setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
case "refreshtoken":
case "refreshToken": getOrCreateConfiguration(target).setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes": getOrCreateConfiguration(target).setScopes(property(camelContext, java.util.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey": getOrCreateConfiguration(target).setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "splitresult":
case "splitResult": getOrCreateConfiguration(target).setSplitResult(property(camelContext, boolean.class, value)); return true;
default: return false;
@@ -101,13 +101,13 @@ public class GoogleSheetsComponentConfigurer extends PropertyConfigurerSupport i
case "clientSecret": return java.lang.String.class;
case "configuration": return org.apache.camel.component.google.sheets.GoogleSheetsConfiguration.class;
case "delegate": return java.lang.String.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
case "refreshtoken":
case "refreshToken": return java.lang.String.class;
case "scopes": return java.util.Collection.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
case "splitresult":
case "splitResult": return boolean.class;
default: return null;
@@ -134,13 +134,13 @@ public class GoogleSheetsComponentConfigurer extends PropertyConfigurerSupport i
case "clientSecret": return getOrCreateConfiguration(target).getClientSecret();
case "configuration": return target.getConfiguration();
case "delegate": return getOrCreateConfiguration(target).getDelegate();
- case "keyresource":
- case "keyResource": return getOrCreateConfiguration(target).getKeyResource();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
case "refreshtoken":
case "refreshToken": return getOrCreateConfiguration(target).getRefreshToken();
case "scopes": return getOrCreateConfiguration(target).getScopes();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return getOrCreateConfiguration(target).getServiceAccountKey();
case "splitresult":
case "splitResult": return getOrCreateConfiguration(target).isSplitResult();
default: return null;
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsConfigurationConfigurer.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsConfigurationConfigurer.java
index 4eed880b23b..60f37868870 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsConfigurationConfigurer.java
@@ -26,10 +26,10 @@ public class GoogleSheetsConfigurationConfigurer extends org.apache.camel.suppor
map.put("ClientId", java.lang.String.class);
map.put("ClientSecret", java.lang.String.class);
map.put("Delegate", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("SplitResult", boolean.class);
ALL_OPTIONS = map;
}
@@ -50,14 +50,14 @@ public class GoogleSheetsConfigurationConfigurer extends org.apache.camel.suppor
case "ClientSecret": target.setClientSecret(property(camelContext, java.lang.String.class, value)); return true;
case "delegate":
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "methodname":
case "MethodName": target.setMethodName(property(camelContext, java.lang.String.class, value)); return true;
case "refreshtoken":
case "RefreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext, java.util.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "splitresult":
case "SplitResult": target.setSplitResult(property(camelContext, boolean.class, value)); return true;
default: return false;
@@ -84,14 +84,14 @@ public class GoogleSheetsConfigurationConfigurer extends org.apache.camel.suppor
case "ClientSecret": return java.lang.String.class;
case "delegate":
case "Delegate": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "refreshtoken":
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "splitresult":
case "SplitResult": return boolean.class;
default: return null;
@@ -114,14 +114,14 @@ public class GoogleSheetsConfigurationConfigurer extends org.apache.camel.suppor
case "ClientSecret": return target.getClientSecret();
case "delegate":
case "Delegate": return target.getDelegate();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "refreshtoken":
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "splitresult":
case "SplitResult": return target.isSplitResult();
default: return null;
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointConfigurer.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointConfigurer.java
index 8fbb3a58670..1ca70ae9ba6 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointConfigurer.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointConfigurer.java
@@ -50,8 +50,8 @@ public class GoogleSheetsEndpointConfigurer extends PropertyConfigurerSupport im
map.put("useFixedDelay", boolean.class);
map.put("accessToken", java.lang.String.class);
map.put("clientSecret", java.lang.String.class);
- map.put("keyResource", java.lang.String.class);
map.put("refreshToken", java.lang.String.class);
+ map.put("serviceAccountKey", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -86,8 +86,6 @@ public class GoogleSheetsEndpointConfigurer extends PropertyConfigurerSupport im
case "inBody": target.setInBody(property(camelContext, java.lang.String.class, value)); return true;
case "initialdelay":
case "initialDelay": target.setInitialDelay(property(camelContext, long.class, value)); return true;
- case "keyresource":
- case "keyResource": target.getConfiguration().setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
case "pollstrategy":
@@ -106,6 +104,8 @@ public class GoogleSheetsEndpointConfigurer extends PropertyConfigurerSupport im
case "scopes": target.getConfiguration().setScopes(property(camelContext, java.util.Collection.class, value)); return true;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": target.setSendEmptyMessageWhenIdle(property(camelContext, boolean.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey": target.getConfiguration().setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "splitresult":
case "splitResult": target.getConfiguration().setSplitResult(property(camelContext, boolean.class, value)); return true;
case "startscheduler":
@@ -153,8 +153,6 @@ public class GoogleSheetsEndpointConfigurer extends PropertyConfigurerSupport im
case "inBody": return java.lang.String.class;
case "initialdelay":
case "initialDelay": return long.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
case "pollstrategy":
@@ -173,6 +171,8 @@ public class GoogleSheetsEndpointConfigurer extends PropertyConfigurerSupport im
case "scopes": return java.util.Collection.class;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return boolean.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
case "splitresult":
case "splitResult": return boolean.class;
case "startscheduler":
@@ -216,8 +216,6 @@ public class GoogleSheetsEndpointConfigurer extends PropertyConfigurerSupport im
case "inBody": return target.getInBody();
case "initialdelay":
case "initialDelay": return target.getInitialDelay();
- case "keyresource":
- case "keyResource": return target.getConfiguration().getKeyResource();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
case "pollstrategy":
@@ -236,6 +234,8 @@ public class GoogleSheetsEndpointConfigurer extends PropertyConfigurerSupport im
case "scopes": return target.getConfiguration().getScopes();
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return target.isSendEmptyMessageWhenIdle();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return target.getConfiguration().getServiceAccountKey();
case "splitresult":
case "splitResult": return target.getConfiguration().isSplitResult();
case "startscheduler":
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java
index 219d5369865..a329245af44 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java
@@ -46,7 +46,6 @@ public class GoogleSheetsEndpointUriFactory extends org.apache.camel.support.com
props.add("greedy");
props.add("inBody");
props.add("initialDelay");
- props.add("keyResource");
props.add("lazyStartProducer");
props.add("methodName");
props.add("pollStrategy");
@@ -59,6 +58,7 @@ public class GoogleSheetsEndpointUriFactory extends org.apache.camel.support.com
props.add("schedulerProperties");
props.add("scopes");
props.add("sendEmptyMessageWhenIdle");
+ props.add("serviceAccountKey");
props.add("splitResult");
props.add("spreadsheetId");
props.add("startScheduler");
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfigurationConfigurer.java
index 3ba034f708c..e73bdad4cf6 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfigurationConfigurer.java
@@ -29,10 +29,10 @@ public class SheetsSpreadsheetsEndpointConfigurationConfigurer extends org.apach
map.put("Content", com.google.api.services.sheets.v4.model.Spreadsheet.class);
map.put("Delegate", java.lang.String.class);
map.put("GetSpreadsheetByDataFilterRequest", com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("SplitResult", boolean.class);
map.put("SpreadsheetId", java.lang.String.class);
ALL_OPTIONS = map;
@@ -60,14 +60,14 @@ public class SheetsSpreadsheetsEndpointConfigurationConfigurer extends org.apach
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
case "getspreadsheetbydatafilterrequest":
case "GetSpreadsheetByDataFilterRequest": target.setGetSpreadsheetByDataFilterRequest(property(camelContext, com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "methodname":
case "MethodName": target.setMethodName(property(camelContext, java.lang.String.class, value)); return true;
case "refreshtoken":
case "RefreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext, java.util.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "splitresult":
case "SplitResult": target.setSplitResult(property(camelContext, boolean.class, value)); return true;
case "spreadsheetid":
@@ -102,14 +102,14 @@ public class SheetsSpreadsheetsEndpointConfigurationConfigurer extends org.apach
case "Delegate": return java.lang.String.class;
case "getspreadsheetbydatafilterrequest":
case "GetSpreadsheetByDataFilterRequest": return com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "refreshtoken":
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "splitresult":
case "SplitResult": return boolean.class;
case "spreadsheetid":
@@ -140,14 +140,14 @@ public class SheetsSpreadsheetsEndpointConfigurationConfigurer extends org.apach
case "Delegate": return target.getDelegate();
case "getspreadsheetbydatafilterrequest":
case "GetSpreadsheetByDataFilterRequest": return target.getGetSpreadsheetByDataFilterRequest();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "refreshtoken":
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "splitresult":
case "SplitResult": return target.isSplitResult();
case "spreadsheetid":
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfigurationConfigurer.java
index 03f1140ccb2..8c0b744c346 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfigurationConfigurer.java
@@ -32,11 +32,11 @@ public class SheetsSpreadsheetsValuesEndpointConfigurationConfigurer extends org
map.put("ClientSecret", java.lang.String.class);
map.put("Content", com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest.class);
map.put("Delegate", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("Range", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("SplitResult", boolean.class);
map.put("SpreadsheetId", java.lang.String.class);
map.put("Values", com.google.api.services.sheets.v4.model.ValueRange.class);
@@ -71,8 +71,6 @@ public class SheetsSpreadsheetsValuesEndpointConfigurationConfigurer extends org
case "Content": target.setContent(property(camelContext, com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest.class, value)); return true;
case "delegate":
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "methodname":
case "MethodName": target.setMethodName(property(camelContext, java.lang.String.class, value)); return true;
case "range":
@@ -81,6 +79,8 @@ public class SheetsSpreadsheetsValuesEndpointConfigurationConfigurer extends org
case "RefreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext, java.util.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "splitresult":
case "SplitResult": target.setSplitResult(property(camelContext, boolean.class, value)); return true;
case "spreadsheetid":
@@ -123,8 +123,6 @@ public class SheetsSpreadsheetsValuesEndpointConfigurationConfigurer extends org
case "Content": return com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest.class;
case "delegate":
case "Delegate": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "range":
@@ -133,6 +131,8 @@ public class SheetsSpreadsheetsValuesEndpointConfigurationConfigurer extends org
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "splitresult":
case "SplitResult": return boolean.class;
case "spreadsheetid":
@@ -171,8 +171,6 @@ public class SheetsSpreadsheetsValuesEndpointConfigurationConfigurer extends org
case "Content": return target.getContent();
case "delegate":
case "Delegate": return target.getDelegate();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "range":
@@ -181,6 +179,8 @@ public class SheetsSpreadsheetsValuesEndpointConfigurationConfigurer extends org
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "splitresult":
case "SplitResult": return target.isSplitResult();
case "spreadsheetid":
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponentConfigurer.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponentConfigurer.java
index 4dee0455ce6..47772b9ef0b 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponentConfigurer.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponentConfigurer.java
@@ -46,8 +46,6 @@ public class GoogleSheetsStreamComponentConfigurer extends PropertyConfigurerSup
case "delegate": getOrCreateConfiguration(target).setDelegate(property(camelContext, java.lang.String.class, value)); return true;
case "includegriddata":
case "includeGridData": getOrCreateConfiguration(target).setIncludeGridData(property(camelContext, boolean.class, value)); return true;
- case "keyresource":
- case "keyResource": getOrCreateConfiguration(target).setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "majordimension":
case "majorDimension": getOrCreateConfiguration(target).setMajorDimension(property(camelContext, java.lang.String.class, value)); return true;
case "maxresults":
@@ -56,6 +54,8 @@ public class GoogleSheetsStreamComponentConfigurer extends PropertyConfigurerSup
case "refreshtoken":
case "refreshToken": getOrCreateConfiguration(target).setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes": getOrCreateConfiguration(target).setScopes(property(camelContext, java.util.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey": getOrCreateConfiguration(target).setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "splitresults":
case "splitResults": getOrCreateConfiguration(target).setSplitResults(property(camelContext, boolean.class, value)); return true;
case "valuerenderoption":
@@ -85,8 +85,6 @@ public class GoogleSheetsStreamComponentConfigurer extends PropertyConfigurerSup
case "delegate": return java.lang.String.class;
case "includegriddata":
case "includeGridData": return boolean.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "majordimension":
case "majorDimension": return java.lang.String.class;
case "maxresults":
@@ -95,6 +93,8 @@ public class GoogleSheetsStreamComponentConfigurer extends PropertyConfigurerSup
case "refreshtoken":
case "refreshToken": return java.lang.String.class;
case "scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
case "splitresults":
case "splitResults": return boolean.class;
case "valuerenderoption":
@@ -125,8 +125,6 @@ public class GoogleSheetsStreamComponentConfigurer extends PropertyConfigurerSup
case "delegate": return getOrCreateConfiguration(target).getDelegate();
case "includegriddata":
case "includeGridData": return getOrCreateConfiguration(target).isIncludeGridData();
- case "keyresource":
- case "keyResource": return getOrCreateConfiguration(target).getKeyResource();
case "majordimension":
case "majorDimension": return getOrCreateConfiguration(target).getMajorDimension();
case "maxresults":
@@ -135,6 +133,8 @@ public class GoogleSheetsStreamComponentConfigurer extends PropertyConfigurerSup
case "refreshtoken":
case "refreshToken": return getOrCreateConfiguration(target).getRefreshToken();
case "scopes": return getOrCreateConfiguration(target).getScopes();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return getOrCreateConfiguration(target).getServiceAccountKey();
case "splitresults":
case "splitResults": return getOrCreateConfiguration(target).isSplitResults();
case "valuerenderoption":
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointConfigurer.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointConfigurer.java
index de5e1b097a0..58bd5c53780 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointConfigurer.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointConfigurer.java
@@ -48,8 +48,6 @@ public class GoogleSheetsStreamEndpointConfigurer extends PropertyConfigurerSupp
case "includeGridData": target.getConfiguration().setIncludeGridData(property(camelContext, boolean.class, value)); return true;
case "initialdelay":
case "initialDelay": target.setInitialDelay(property(camelContext, long.class, value)); return true;
- case "keyresource":
- case "keyResource": target.getConfiguration().setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "majordimension":
case "majorDimension": target.getConfiguration().setMajorDimension(property(camelContext, java.lang.String.class, value)); return true;
case "maxresults":
@@ -71,6 +69,8 @@ public class GoogleSheetsStreamEndpointConfigurer extends PropertyConfigurerSupp
case "scopes": target.getConfiguration().setScopes(property(camelContext, java.util.List.class, value)); return true;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": target.setSendEmptyMessageWhenIdle(property(camelContext, boolean.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey": target.getConfiguration().setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "splitresults":
case "splitResults": target.getConfiguration().setSplitResults(property(camelContext, boolean.class, value)); return true;
case "startscheduler":
@@ -115,8 +115,6 @@ public class GoogleSheetsStreamEndpointConfigurer extends PropertyConfigurerSupp
case "includeGridData": return boolean.class;
case "initialdelay":
case "initialDelay": return long.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "majordimension":
case "majorDimension": return java.lang.String.class;
case "maxresults":
@@ -138,6 +136,8 @@ public class GoogleSheetsStreamEndpointConfigurer extends PropertyConfigurerSupp
case "scopes": return java.util.List.class;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return boolean.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
case "splitresults":
case "splitResults": return boolean.class;
case "startscheduler":
@@ -183,8 +183,6 @@ public class GoogleSheetsStreamEndpointConfigurer extends PropertyConfigurerSupp
case "includeGridData": return target.getConfiguration().isIncludeGridData();
case "initialdelay":
case "initialDelay": return target.getInitialDelay();
- case "keyresource":
- case "keyResource": return target.getConfiguration().getKeyResource();
case "majordimension":
case "majorDimension": return target.getConfiguration().getMajorDimension();
case "maxresults":
@@ -206,6 +204,8 @@ public class GoogleSheetsStreamEndpointConfigurer extends PropertyConfigurerSupp
case "scopes": return target.getConfiguration().getScopes();
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return target.isSendEmptyMessageWhenIdle();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return target.getConfiguration().getServiceAccountKey();
case "splitresults":
case "splitResults": return target.getConfiguration().isSplitResults();
case "startscheduler":
diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java
index ff5a60fbe99..f8db6e27f65 100644
--- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java
+++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java
@@ -37,7 +37,6 @@ public class GoogleSheetsStreamEndpointUriFactory extends org.apache.camel.suppo
props.add("greedy");
props.add("includeGridData");
props.add("initialDelay");
- props.add("keyResource");
props.add("majorDimension");
props.add("maxResults");
props.add("pollStrategy");
@@ -50,6 +49,7 @@ public class GoogleSheetsStreamEndpointUriFactory extends org.apache.camel.suppo
props.add("schedulerProperties");
props.add("scopes");
props.add("sendEmptyMessageWhenIdle");
+ props.add("serviceAccountKey");
props.add("splitResults");
props.add("spreadsheetId");
props.add("startScheduler");
diff --git a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
index f842e211395..9a32db32717 100644
--- a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
+++ b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
@@ -36,8 +36,8 @@
"clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsClientFactory", "deprecated": false, "autowired": 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, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term u [...]
"clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" },
- "keyResource": { "kind": "property", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever th [...]
+ "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever th [...]
+ "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
},
"properties": {
"apiName": { "kind": "path", "displayName": "Api Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName", "enum": [ "SPREADSHEETS", "DATA" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "What kind of op [...]
@@ -70,8 +70,8 @@
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term [...]
"clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" },
- "keyResource": { "kind": "parameter", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever t [...]
+ "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever t [...]
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
},
"apis": {
"data": { "consumerOnly": false, "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.go [...]
diff --git a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
index 9b69d31d0f7..a575c6c27c8 100644
--- a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
+++ b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
@@ -39,8 +39,8 @@
"clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsClientFactory", "deprecated": false, "autowired": 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, "autowired": 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 fo [...]
"clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" },
- "keyResource": { "kind": "property", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 accessTo [...]
+ "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 accessTo [...]
+ "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
},
"headers": {
"CamelGoogleSheetsSpreadsheetId": { "kind": "header", "displayName": "", "group": "consumer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Specifies the spreadsheet identifier that is used to identify the target to obtain.", "constantName": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants#SPREADSHEET_ID" },
@@ -83,7 +83,7 @@
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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, "autowired": 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 f [...]
"clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the sheets application" },
- "keyResource": { "kind": "parameter", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 accessT [...]
+ "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": 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 accessT [...]
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" }
}
}
diff --git a/components/camel-google/camel-google-sheets/src/main/docs/google-sheets-component.adoc b/components/camel-google/camel-google-sheets/src/main/docs/google-sheets-component.adoc
index 27571bf6b5c..4a17ffa7e9a 100644
--- a/components/camel-google/camel-google-sheets/src/main/docs/google-sheets-component.adoc
+++ b/components/camel-google/camel-google-sheets/src/main/docs/google-sheets-component.adoc
@@ -30,7 +30,7 @@ generating a long-lived refreshToken is
the https://developers.google.com/oauthplayground[OAuth playground].
In the case of a https://developers.google.com/identity/protocols/oauth2#serviceaccount[service account],
-credentials comprise of a JSON-file (keyResource). You can also use
+credentials comprise of a JSON-file (serviceAccountKey). You can also use
https://developers.google.com/identity/protocols/oauth2/service-account#delegatingauthority[delegation domain-wide authority]
(delegate) and one, several, or all possible
https://developers.google.com/sheets/api/guides/authorizing[Sheets API Auth Scopes] (scopes).
diff --git a/components/camel-google/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index cf969cbe7f5..2e276e40a41 100644
--- a/components/camel-google/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -30,7 +30,7 @@ generating a long-lived refreshToken is
the https://developers.google.com/oauthplayground[OAuth playground].
In the case of a https://developers.google.com/identity/protocols/oauth2#serviceaccount[service account],
-credentials comprise of a JSON-file (keyResource). You can also use
+credentials comprise of a JSON-file (serviceAccountKey). You can also use
https://developers.google.com/identity/protocols/oauth2/service-account#delegatingauthority[delegation domain-wide authority]
(delegate) and one, several, or all possible
https://developers.google.com/sheets/api/guides/authorizing[Sheets API Auth Scopes] (scopes).
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
index af17075fbd5..bfd585bdf8e 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
@@ -105,12 +105,13 @@ public class BatchGoogleSheetsClientFactory implements GoogleSheetsClientFactory
@Override
public Sheets makeClient(
- CamelContext camelContext, String keyResource, Collection<String> scopes, String applicationName, String delegate) {
- if (keyResource == null) {
- throw new IllegalArgumentException("keyResource is required to create Google Sheets client.");
+ CamelContext camelContext, String serviceAccountKey, Collection<String> scopes, String applicationName,
+ String delegate) {
+ if (serviceAccountKey == null) {
+ throw new IllegalArgumentException("serviceAccountKey is required to create Google Sheets client.");
}
try {
- Credential credential = authorizeServiceAccount(camelContext, keyResource, delegate, scopes);
+ Credential credential = authorizeServiceAccount(camelContext, serviceAccountKey, delegate, scopes);
return new Sheets.Builder(transport, jsonFactory, credential).setApplicationName(applicationName).build();
} catch (Exception e) {
throw new RuntimeCamelException("Could not create Google Sheets client.", e);
@@ -118,11 +119,12 @@ public class BatchGoogleSheetsClientFactory implements GoogleSheetsClientFactory
}
private Credential authorizeServiceAccount(
- CamelContext camelContext, String keyResource, String delegate, Collection<String> scopes) {
+ CamelContext camelContext, String serviceAccountKey, String delegate, Collection<String> scopes) {
// authorize
try {
GoogleCredential cred = GoogleCredential
- .fromStream(ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext, keyResource), transport,
+ .fromStream(ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext, serviceAccountKey),
+ transport,
jsonFactory)
.createScoped(scopes != null && scopes.size() != 0 ? scopes : null)
.createDelegated(delegate);
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java
index 3822464fe4f..9793aa9018d 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java
@@ -33,7 +33,7 @@ public interface GoogleSheetsClientFactory {
Sheets makeClient(
CamelContext camelContext,
- String keyResource,
+ String serviceAccountKey,
Collection<String> scopes,
String applicationName,
String delegate);
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
index 0f17db93e8d..913d3281125 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
@@ -59,12 +59,12 @@ public class GoogleSheetsComponent
client = getClientFactory().makeClient(config.getClientId(),
config.getClientSecret(), config.getScopes(),
config.getApplicationName(), config.getRefreshToken(), config.getAccessToken());
- } else if (config.getKeyResource() != null && !config.getKeyResource().isBlank()) {
- client = getClientFactory().makeClient(getCamelContext(), config.getKeyResource(),
+ } else if (config.getServiceAccountKey() != null && !config.getServiceAccountKey().isBlank()) {
+ client = getClientFactory().makeClient(getCamelContext(), config.getServiceAccountKey(),
config.getScopes(), config.getApplicationName(), config.getDelegate());
} else {
throw new IllegalArgumentException(
- "(clientId and clientSecret) or keyResource are required to create Google Sheets client");
+ "(clientId and clientSecret) or serviceAccountKey are required to create Google Sheets client");
}
}
return client;
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java
index 9cd8c34e575..bf0b57bf9a0 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java
@@ -53,7 +53,7 @@ public class GoogleSheetsConfiguration extends AbstractApiConfiguration {
private Collection<String> scopes;
/* Service account */
@UriParam(label = "security")
- private String keyResource;
+ private String serviceAccountKey;
@UriParam
private String delegate;
@@ -148,17 +148,17 @@ public class GoogleSheetsConfiguration extends AbstractApiConfiguration {
this.scopes = scopes;
}
- public String getKeyResource() {
- return keyResource;
+ public String getServiceAccountKey() {
+ return serviceAccountKey;
}
/**
* Sets "*.json" file with credentials for Service account
*
- * @param keyResource String file, classpath, or http url
+ * @param serviceAccountKey String file, classpath, or http url
*/
- public void setKeyResource(String keyResource) {
- this.keyResource = keyResource;
+ public void setServiceAccountKey(String serviceAccountKey) {
+ this.serviceAccountKey = serviceAccountKey;
}
public String getDelegate() {
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
index 4f3e2881d59..b8a819b0b39 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
@@ -55,12 +55,12 @@ public class GoogleSheetsStreamComponent extends DefaultComponent {
client = getClientFactory().makeClient(config.getClientId(),
config.getClientSecret(), config.getScopes(),
config.getApplicationName(), config.getRefreshToken(), config.getAccessToken());
- } else if (config.getKeyResource() != null) {
- client = getClientFactory().makeClient(getCamelContext(), config.getKeyResource(),
+ } else if (config.getServiceAccountKey() != null) {
+ client = getClientFactory().makeClient(getCamelContext(), config.getServiceAccountKey(),
config.getScopes(), config.getApplicationName(), config.getDelegate());
} else {
throw new IllegalArgumentException(
- "(clientId and clientSecret) or keyResource are required to create Gmail client");
+ "(clientId and clientSecret) or serviceAccountKey are required to create Gmail client");
}
}
return client;
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
index 94b0fc97e0a..aa37391c8a6 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
@@ -63,7 +63,7 @@ public class GoogleSheetsStreamConfiguration implements Cloneable {
private String valueRenderOption = "FORMATTED_VALUE";
/* Service account */
@UriParam(label = "security")
- private String keyResource;
+ private String serviceAccountKey;
@UriParam
private String delegate;
@@ -215,17 +215,17 @@ public class GoogleSheetsStreamConfiguration implements Cloneable {
this.splitResults = splitResults;
}
- public String getKeyResource() {
- return keyResource;
+ public String getServiceAccountKey() {
+ return serviceAccountKey;
}
/**
* Sets "*.json" file with credentials for Service account
*
- * @param keyResource String file, classpath, or http url
+ * @param serviceAccountKey String file, classpath, or http url
*/
- public void setKeyResource(String keyResource) {
- this.keyResource = keyResource;
+ public void setServiceAccountKey(String serviceAccountKey) {
+ this.serviceAccountKey = serviceAccountKey;
}
public String getDelegate() {
diff --git a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
index 3fa32e51547..52e9c006946 100644
--- a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
+++ b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
@@ -75,7 +75,7 @@ public class AbstractGoogleSheetsTestSupport extends CamelTestSupport {
return !properties.getProperty("clientId", "").isEmpty()
&& !properties.getProperty("clientSecret", "").isEmpty()
&& !properties.getProperty("accessToken", "").isEmpty()
- || !properties.getProperty("keyResource", "").isEmpty();
+ || !properties.getProperty("serviceAccountKey", "").isEmpty();
}
/**
diff --git a/components/camel-google/camel-google-sheets/src/test/resources/test-options.properties b/components/camel-google/camel-google-sheets/src/test/resources/test-options.properties
index 5d63bcf73f3..c29a60c4d27 100644
--- a/components/camel-google/camel-google-sheets/src/test/resources/test-options.properties
+++ b/components/camel-google/camel-google-sheets/src/test/resources/test-options.properties
@@ -25,6 +25,6 @@ applicationName=camel-google-sheets/1.0
accessToken=
refreshToken=
-keyResource=
+serviceAccountKey=
scopes[]=
delegate=
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailStreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailStreamComponentBuilderFactory.java
index d70c61344f6..3170c87ff11 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailStreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailStreamComponentBuilderFactory.java
@@ -277,35 +277,35 @@ public interface GoogleMailStreamComponentBuilderFactory {
return this;
}
/**
- * Sets .json file with credentials for Service account.
+ * 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
*
- * @param keyResource the value to set
+ * @param refreshToken the value to set
* @return the dsl builder
*/
- default GoogleMailStreamComponentBuilder keyResource(
- java.lang.String keyResource) {
- doSetProperty("keyResource", keyResource);
+ default GoogleMailStreamComponentBuilder refreshToken(
+ java.lang.String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
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.
+ * Sets .json file with credentials for Service account.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param refreshToken the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GoogleMailStreamComponentBuilder refreshToken(
- java.lang.String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
+ default GoogleMailStreamComponentBuilder serviceAccountKey(
+ java.lang.String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
@@ -346,8 +346,8 @@ public interface GoogleMailStreamComponentBuilderFactory {
case "configuration": ((GoogleMailStreamComponent) component).setConfiguration((org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration) value); return true;
case "accessToken": getOrCreateConfiguration((GoogleMailStreamComponent) component).setAccessToken((java.lang.String) value); return true;
case "clientSecret": getOrCreateConfiguration((GoogleMailStreamComponent) component).setClientSecret((java.lang.String) value); return true;
- case "keyResource": getOrCreateConfiguration((GoogleMailStreamComponent) component).setKeyResource((java.lang.String) value); return true;
case "refreshToken": getOrCreateConfiguration((GoogleMailStreamComponent) component).setRefreshToken((java.lang.String) value); return true;
+ case "serviceAccountKey": getOrCreateConfiguration((GoogleMailStreamComponent) component).setServiceAccountKey((java.lang.String) value); return true;
default: return false;
}
}
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
index 8bdedf039b6..d92b59162fc 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
@@ -260,35 +260,35 @@ public interface GoogleSheetsComponentBuilderFactory {
return this;
}
/**
- * Sets .json file with credentials for Service account.
+ * OAuth 2 refresh token. Using this, the Google Sheets component can
+ * obtain a new accessToken whenever the current one expires - a
+ * necessity if the application is long-lived.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param keyResource the value to set
+ * @param refreshToken the value to set
* @return the dsl builder
*/
- default GoogleSheetsComponentBuilder keyResource(
- java.lang.String keyResource) {
- doSetProperty("keyResource", keyResource);
+ default GoogleSheetsComponentBuilder refreshToken(
+ java.lang.String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
return this;
}
/**
- * OAuth 2 refresh token. Using this, the Google Sheets component can
- * obtain a new accessToken whenever the current one expires - a
- * necessity if the application is long-lived.
+ * Sets .json file with credentials for Service account.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param refreshToken the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GoogleSheetsComponentBuilder refreshToken(
- java.lang.String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
+ default GoogleSheetsComponentBuilder serviceAccountKey(
+ java.lang.String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
@@ -327,8 +327,8 @@ public interface GoogleSheetsComponentBuilderFactory {
case "clientFactory": ((GoogleSheetsComponent) component).setClientFactory((org.apache.camel.component.google.sheets.GoogleSheetsClientFactory) value); return true;
case "accessToken": getOrCreateConfiguration((GoogleSheetsComponent) component).setAccessToken((java.lang.String) value); return true;
case "clientSecret": getOrCreateConfiguration((GoogleSheetsComponent) component).setClientSecret((java.lang.String) value); return true;
- case "keyResource": getOrCreateConfiguration((GoogleSheetsComponent) component).setKeyResource((java.lang.String) value); return true;
case "refreshToken": getOrCreateConfiguration((GoogleSheetsComponent) component).setRefreshToken((java.lang.String) value); return true;
+ case "serviceAccountKey": getOrCreateConfiguration((GoogleSheetsComponent) component).setServiceAccountKey((java.lang.String) value); return true;
default: return false;
}
}
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
index e5f85a6f062..5a0b94666dd 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
@@ -320,35 +320,35 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
return this;
}
/**
- * Sets .json file with credentials for Service account.
+ * 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
*
- * @param keyResource the value to set
+ * @param refreshToken the value to set
* @return the dsl builder
*/
- default GoogleSheetsStreamComponentBuilder keyResource(
- java.lang.String keyResource) {
- doSetProperty("keyResource", keyResource);
+ default GoogleSheetsStreamComponentBuilder refreshToken(
+ java.lang.String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
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.
+ * Sets .json file with credentials for Service account.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param refreshToken the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GoogleSheetsStreamComponentBuilder refreshToken(
- java.lang.String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
+ default GoogleSheetsStreamComponentBuilder serviceAccountKey(
+ java.lang.String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
@@ -391,8 +391,8 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
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 "keyResource": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setKeyResource((java.lang.String) value); return true;
case "refreshToken": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setRefreshToken((java.lang.String) value); return true;
+ case "serviceAccountKey": getOrCreateConfiguration((GoogleSheetsStreamComponent) component).setServiceAccountKey((java.lang.String) value); return true;
default: return false;
}
}
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
index 4f1725288ad..2ffa04c29d3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
@@ -750,33 +750,34 @@ public interface GoogleMailStreamEndpointBuilderFactory {
return this;
}
/**
- * Sets .json file with credentials for Service account.
+ * 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
*
- * @param keyResource the value to set
+ * @param refreshToken the value to set
* @return the dsl builder
*/
- default GoogleMailStreamEndpointBuilder keyResource(String keyResource) {
- doSetProperty("keyResource", keyResource);
+ default GoogleMailStreamEndpointBuilder refreshToken(String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
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.
+ * Sets .json file with credentials for Service account.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param refreshToken the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GoogleMailStreamEndpointBuilder refreshToken(String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
+ default GoogleMailStreamEndpointBuilder serviceAccountKey(
+ String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
@@ -1018,9 +1019,9 @@ public interface GoogleMailStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleMailStreamTo}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleMailStreamTo}.
*/
public String googleMailStreamTo() {
return "GoogleMailStreamTo";
@@ -1031,9 +1032,9 @@ public interface GoogleMailStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleMailStreamFrom}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleMailStreamFrom}.
*/
public String googleMailStreamFrom() {
return "GoogleMailStreamFrom";
@@ -1044,9 +1045,9 @@ public interface GoogleMailStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleMailStreamCc}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleMailStreamCc}.
*/
public String googleMailStreamCc() {
return "GoogleMailStreamCc";
@@ -1057,9 +1058,9 @@ public interface GoogleMailStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleMailStreamBcc}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleMailStreamBcc}.
*/
public String googleMailStreamBcc() {
return "GoogleMailStreamBcc";
@@ -1070,9 +1071,9 @@ public interface GoogleMailStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleMailStreamSubject}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleMailStreamSubject}.
*/
public String googleMailStreamSubject() {
return "GoogleMailStreamSubject";
@@ -1083,9 +1084,9 @@ public interface GoogleMailStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleMailId}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleMailId}.
*/
public String googleMailId() {
return "GoogleMailId";
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
index 1b604084d81..80440ee012c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
@@ -720,35 +720,35 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sets .json file with credentials for Service account.
+ * OAuth 2 refresh token. Using this, the Google Sheets component can
+ * obtain a new accessToken whenever the current one expires - a
+ * necessity if the application is long-lived.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param keyResource the value to set
+ * @param refreshToken the value to set
* @return the dsl builder
*/
- default GoogleSheetsEndpointConsumerBuilder keyResource(
- String keyResource) {
- doSetProperty("keyResource", keyResource);
+ default GoogleSheetsEndpointConsumerBuilder refreshToken(
+ String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
return this;
}
/**
- * OAuth 2 refresh token. Using this, the Google Sheets component can
- * obtain a new accessToken whenever the current one expires - a
- * necessity if the application is long-lived.
+ * Sets .json file with credentials for Service account.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param refreshToken the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GoogleSheetsEndpointConsumerBuilder refreshToken(
- String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
+ default GoogleSheetsEndpointConsumerBuilder serviceAccountKey(
+ String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
@@ -1047,35 +1047,35 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sets .json file with credentials for Service account.
+ * OAuth 2 refresh token. Using this, the Google Sheets component can
+ * obtain a new accessToken whenever the current one expires - a
+ * necessity if the application is long-lived.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param keyResource the value to set
+ * @param refreshToken the value to set
* @return the dsl builder
*/
- default GoogleSheetsEndpointProducerBuilder keyResource(
- String keyResource) {
- doSetProperty("keyResource", keyResource);
+ default GoogleSheetsEndpointProducerBuilder refreshToken(
+ String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
return this;
}
/**
- * OAuth 2 refresh token. Using this, the Google Sheets component can
- * obtain a new accessToken whenever the current one expires - a
- * necessity if the application is long-lived.
+ * Sets .json file with credentials for Service account.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param refreshToken the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GoogleSheetsEndpointProducerBuilder refreshToken(
- String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
+ default GoogleSheetsEndpointProducerBuilder serviceAccountKey(
+ String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
@@ -1269,33 +1269,34 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sets .json file with credentials for Service account.
+ * OAuth 2 refresh token. Using this, the Google Sheets component can
+ * obtain a new accessToken whenever the current one expires - a
+ * necessity if the application is long-lived.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param keyResource the value to set
+ * @param refreshToken the value to set
* @return the dsl builder
*/
- default GoogleSheetsEndpointBuilder keyResource(String keyResource) {
- doSetProperty("keyResource", keyResource);
+ default GoogleSheetsEndpointBuilder refreshToken(String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
return this;
}
/**
- * OAuth 2 refresh token. Using this, the Google Sheets component can
- * obtain a new accessToken whenever the current one expires - a
- * necessity if the application is long-lived.
+ * Sets .json file with credentials for Service account.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param refreshToken the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GoogleSheetsEndpointBuilder refreshToken(String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
+ default GoogleSheetsEndpointBuilder serviceAccountKey(
+ String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
index d4190ead6cd..03bfeefcd25 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
@@ -819,34 +819,35 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
return this;
}
/**
- * Sets .json file with credentials for Service account.
+ * 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
*
- * @param keyResource the value to set
+ * @param refreshToken the value to set
* @return the dsl builder
*/
- default GoogleSheetsStreamEndpointBuilder keyResource(String keyResource) {
- doSetProperty("keyResource", keyResource);
+ default GoogleSheetsStreamEndpointBuilder refreshToken(
+ String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
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.
+ * Sets .json file with credentials for Service account.
*
* The option is a: <code>java.lang.String</code> type.
*
* Group: security
*
- * @param refreshToken the value to set
+ * @param serviceAccountKey the value to set
* @return the dsl builder
*/
- default GoogleSheetsStreamEndpointBuilder refreshToken(
- String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
+ default GoogleSheetsStreamEndpointBuilder serviceAccountKey(
+ String serviceAccountKey) {
+ doSetProperty("serviceAccountKey", serviceAccountKey);
return this;
}
}
@@ -1091,9 +1092,9 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleSheetsSpreadsheetId}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleSheetsSpreadsheetId}.
*/
public String googleSheetsSpreadsheetId() {
return "GoogleSheetsSpreadsheetId";
@@ -1104,9 +1105,9 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleSheetsSpreadsheetUrl}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleSheetsSpreadsheetUrl}.
*/
public String googleSheetsSpreadsheetUrl() {
return "GoogleSheetsSpreadsheetUrl";
@@ -1117,9 +1118,9 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleSheetsMajorDimension}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleSheetsMajorDimension}.
*/
public String googleSheetsMajorDimension() {
return "GoogleSheetsMajorDimension";
@@ -1130,9 +1131,9 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
*
* The option is a: {@code String} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleSheetsRange}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleSheetsRange}.
*/
public String googleSheetsRange() {
return "GoogleSheetsRange";
@@ -1143,9 +1144,9 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
*
* The option is a: {@code int} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleSheetsRangeIndex}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleSheetsRangeIndex}.
*/
public String googleSheetsRangeIndex() {
return "GoogleSheetsRangeIndex";
@@ -1156,9 +1157,9 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
*
* The option is a: {@code int} type.
*
- * Group: consumer
- *
- * @return the name of the header {@code GoogleSheetsValueIndex}.
+ * Group: consumer
+ *
+ * @return the name of the header {@code GoogleSheetsValueIndex}.
*/
public String googleSheetsValueIndex() {
return "GoogleSheetsValueIndex";