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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 92c33500535 [create-pull-request] automated change
92c33500535 is described below
commit 92c33500535b5c5bb6b50dead52915fa09d10ccf
Author: oscerd <osc...@users.noreply.github.com>
AuthorDate: Sat Jul 16 01:16:08 2022 +0000
[create-pull-request] automated change
---
.../catalog/components/google-mail-stream.json | 8 ++++----
.../catalog/components/google-sheets-stream.json | 8 ++++----
.../catalog/components/google-sheets.json | 8 ++++----
.../src/main/docs/google-mail.json | 12 +++++------
.../GoogleMailStreamComponentConfiguration.java | 24 +++++++++++-----------
.../src/main/docs/google-sheets.json | 24 +++++++++++-----------
.../GoogleSheetsComponentConfiguration.java | 24 +++++++++++-----------
.../GoogleSheetsStreamComponentConfiguration.java | 24 +++++++++++-----------
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++
9 files changed, 71 insertions(+), 66 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
index 7bc5bbc4d58..b76b5e5d73a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
index 750f4453b5e..1b311db6ea0 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets.json
index ae3e026c792..a0f0df56168 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-starter/camel-google-mail-starter/src/main/docs/google-mail.json
b/components-starter/camel-google-mail-starter/src/main/docs/google-mail.json
index 7afbe2e8e5f..e4ebff978ca 100644
---
a/components-starter/camel-google-mail-starter/src/main/docs/google-mail.json
+++
b/components-starter/camel-google-mail-starter/src/main/docs/google-mail.json
@@ -91,12 +91,6 @@
"description": "Whether to enable auto configuration of the
google-mail-stream component. This is enabled by default.",
"sourceType":
"org.apache.camel.component.google.mail.stream.springboot.GoogleMailStreamComponentConfiguration"
},
- {
- "name": "camel.component.google-mail-stream.key-resource",
- "type": "java.lang.String",
- "description": "Sets .json file with credentials for Service account",
- "sourceType":
"org.apache.camel.component.google.mail.stream.springboot.GoogleMailStreamComponentConfiguration"
- },
{
"name": "camel.component.google-mail-stream.labels",
"type": "java.lang.String",
@@ -136,6 +130,12 @@
"description": "GMail scopes",
"sourceType":
"org.apache.camel.component.google.mail.stream.springboot.GoogleMailStreamComponentConfiguration"
},
+ {
+ "name": "camel.component.google-mail-stream.service-account-key",
+ "type": "java.lang.String",
+ "description": "Sets .json file with credentials for Service account",
+ "sourceType":
"org.apache.camel.component.google.mail.stream.springboot.GoogleMailStreamComponentConfiguration"
+ },
{
"name": "camel.component.google-mail.access-token",
"type": "java.lang.String",
diff --git
a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
index 0537d763cf9..7b29443ac9a 100644
---
a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
+++
b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
@@ -108,16 +108,16 @@ public class GoogleMailStreamComponentConfiguration
* Client secret of the mail application
*/
private String clientSecret;
- /**
- * Sets .json file with credentials for Service account
- */
- private String keyResource;
/**
* 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.
*/
private String refreshToken;
+ /**
+ * Sets .json file with credentials for Service account
+ */
+ private String serviceAccountKey;
public String getApplicationName() {
return applicationName;
@@ -231,14 +231,6 @@ public class GoogleMailStreamComponentConfiguration
this.clientSecret = clientSecret;
}
- public String getKeyResource() {
- return keyResource;
- }
-
- public void setKeyResource(String keyResource) {
- this.keyResource = keyResource;
- }
-
public String getRefreshToken() {
return refreshToken;
}
@@ -246,4 +238,12 @@ public class GoogleMailStreamComponentConfiguration
public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}
+
+ public String getServiceAccountKey() {
+ return serviceAccountKey;
+ }
+
+ public void setServiceAccountKey(String serviceAccountKey) {
+ this.serviceAccountKey = serviceAccountKey;
+ }
}
\ No newline at end of file
diff --git
a/components-starter/camel-google-sheets-starter/src/main/docs/google-sheets.json
b/components-starter/camel-google-sheets-starter/src/main/docs/google-sheets.json
index 4d326abbdec..3fdc5828b29 100644
---
a/components-starter/camel-google-sheets-starter/src/main/docs/google-sheets.json
+++
b/components-starter/camel-google-sheets-starter/src/main/docs/google-sheets.json
@@ -98,12 +98,6 @@
"sourceType":
"org.apache.camel.component.google.sheets.stream.springboot.GoogleSheetsStreamComponentConfiguration",
"defaultValue": false
},
- {
- "name": "camel.component.google-sheets-stream.key-resource",
- "type": "java.lang.String",
- "description": "Sets .json file with credentials for Service account",
- "sourceType":
"org.apache.camel.component.google.sheets.stream.springboot.GoogleSheetsStreamComponentConfiguration"
- },
{
"name": "camel.component.google-sheets-stream.major-dimension",
"type": "java.lang.String",
@@ -135,6 +129,12 @@
"description": "Specifies the level of permissions you want a sheets
application to have to a user account. See
https:\/\/developers.google.com\/identity\/protocols\/googlescopes for more
info.",
"sourceType":
"org.apache.camel.component.google.sheets.stream.springboot.GoogleSheetsStreamComponentConfiguration"
},
+ {
+ "name": "camel.component.google-sheets-stream.service-account-key",
+ "type": "java.lang.String",
+ "description": "Sets .json file with credentials for Service account",
+ "sourceType":
"org.apache.camel.component.google.sheets.stream.springboot.GoogleSheetsStreamComponentConfiguration"
+ },
{
"name": "camel.component.google-sheets-stream.split-results",
"type": "java.lang.Boolean",
@@ -216,12 +216,6 @@
"description": "Whether to enable auto configuration of the
google-sheets component. This is enabled by default.",
"sourceType":
"org.apache.camel.component.google.sheets.springboot.GoogleSheetsComponentConfiguration"
},
- {
- "name": "camel.component.google-sheets.key-resource",
- "type": "java.lang.String",
- "description": "Sets .json file with credentials for Service account",
- "sourceType":
"org.apache.camel.component.google.sheets.springboot.GoogleSheetsComponentConfiguration"
- },
{
"name": "camel.component.google-sheets.lazy-start-producer",
"type": "java.lang.Boolean",
@@ -241,6 +235,12 @@
"description": "Sheets scopes",
"sourceType":
"org.apache.camel.component.google.sheets.springboot.GoogleSheetsComponentConfiguration"
},
+ {
+ "name": "camel.component.google-sheets.service-account-key",
+ "type": "java.lang.String",
+ "description": "Sets .json file with credentials for Service account",
+ "sourceType":
"org.apache.camel.component.google.sheets.springboot.GoogleSheetsComponentConfiguration"
+ },
{
"name": "camel.component.google-sheets.split-result",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
index baab961d60e..2c08cd8cb12 100644
---
a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
+++
b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
@@ -111,16 +111,16 @@ public class GoogleSheetsComponentConfiguration
* Client secret of the sheets application
*/
private String clientSecret;
- /**
- * Sets .json file with credentials for Service account
- */
- private String keyResource;
/**
* 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.
*/
private String refreshToken;
+ /**
+ * Sets .json file with credentials for Service account
+ */
+ private String serviceAccountKey;
public String getApplicationName() {
return applicationName;
@@ -218,14 +218,6 @@ public class GoogleSheetsComponentConfiguration
this.clientSecret = clientSecret;
}
- public String getKeyResource() {
- return keyResource;
- }
-
- public void setKeyResource(String keyResource) {
- this.keyResource = keyResource;
- }
-
public String getRefreshToken() {
return refreshToken;
}
@@ -233,4 +225,12 @@ public class GoogleSheetsComponentConfiguration
public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}
+
+ public String getServiceAccountKey() {
+ return serviceAccountKey;
+ }
+
+ public void setServiceAccountKey(String serviceAccountKey) {
+ this.serviceAccountKey = serviceAccountKey;
+ }
}
\ No newline at end of file
diff --git
a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
index b4dfc4c6a74..3007ec5e0a9 100644
---
a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
+++
b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
@@ -125,16 +125,16 @@ public class GoogleSheetsStreamComponentConfiguration
* Client secret of the sheets application
*/
private String clientSecret;
- /**
- * Sets .json file with credentials for Service account
- */
- private String keyResource;
/**
* 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.
*/
private String refreshToken;
+ /**
+ * Sets .json file with credentials for Service account
+ */
+ private String serviceAccountKey;
public String getApplicationName() {
return applicationName;
@@ -264,14 +264,6 @@ public class GoogleSheetsStreamComponentConfiguration
this.clientSecret = clientSecret;
}
- public String getKeyResource() {
- return keyResource;
- }
-
- public void setKeyResource(String keyResource) {
- this.keyResource = keyResource;
- }
-
public String getRefreshToken() {
return refreshToken;
}
@@ -279,4 +271,12 @@ public class GoogleSheetsStreamComponentConfiguration
public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
}
+
+ public String getServiceAccountKey() {
+ return serviceAccountKey;
+ }
+
+ public void setServiceAccountKey(String serviceAccountKey) {
+ this.serviceAccountKey = serviceAccountKey;
+ }
}
\ No newline at end of file
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 05451e37466..dd2e1c24c9a 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -3012,6 +3012,11 @@
<artifactId>camel-huaweicloud-smn</artifactId>
<version>3.19.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-hyperledger-aries</artifactId>
+ <version>3.19.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ical</artifactId>
