This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 6220c1d87a6 Regen
6220c1d87a6 is described below
commit 6220c1d87a6a40b63fef40814af659f965e44b19
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Jun 12 20:54:31 2022 +0200
Regen
---
.../springboot/catalog/components/couchbase.json | 3 ++-
.../springboot/catalog/components/couchdb.json | 3 ++-
.../camel/springboot/catalog/components/cql.json | 2 +-
.../catalog/components/google-drive.json | 8 +++----
.../src/main/docs/google-drive.json | 12 +++++------
.../GoogleDriveComponentConfiguration.java | 25 +++++++++++-----------
6 files changed, 28 insertions(+), 25 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
index 6543a2ae8fa..5460520703b 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
@@ -31,7 +31,8 @@
"CCB_ID": { "kind": "header", "displayName": "", "group": "common",
"label": "", "required": false, "javaType": "String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
document id", "constantName":
"org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_ID" },
"CCB_TTL": { "kind": "header", "displayName": "", "group": "producer",
"label": "producer", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The expiry for the document in seconds", "constantName":
"org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_TTL" },
"CCB_DDN": { "kind": "header", "displayName": "", "group": "consumer",
"label": "consumer", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The design document name", "constantName":
"org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_DESIGN_DOCUMENT_NAME"
},
- "CCB_VN": { "kind": "header", "displayName": "", "group": "consumer",
"label": "consumer", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The view name", "constantName":
"org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_VIEWNAME" }
+ "CCB_VN": { "kind": "header", "displayName": "", "group": "consumer",
"label": "consumer", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The view name", "constantName":
"org.apache.camel.component.couchbase.CouchbaseConstants#HEADER_VIEWNAME" },
+ "CamelCqlResumeQuery": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The resume action to execute when resuming.",
"constantName":
"org.apache.camel.component.couchbase.CouchbaseConstants#COUCHBASE_RESUME_ACTION"
}
},
"properties": {
"protocol": { "kind": "path", "displayName": "Protocol", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The protocol to use" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchdb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchdb.json
index 92e9327650f..04e65a88d6b 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchdb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchdb.json
@@ -31,7 +31,8 @@
"CouchDbSeq": { "kind": "header", "displayName": "", "group": "consumer",
"label": "consumer", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The couchdb changeset sequence number of the update \/ delete
message", "constantName":
"org.apache.camel.component.couchdb.CouchDbConstants#HEADER_SEQ" },
"CouchDbId": { "kind": "header", "displayName": "", "group": "common",
"label": "", "required": false, "javaType": "String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
couchdb document id", "constantName":
"org.apache.camel.component.couchdb.CouchDbConstants#HEADER_DOC_ID" },
"CouchDbRev": { "kind": "header", "displayName": "", "group": "common",
"label": "", "required": false, "javaType": "String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
couchdb document revision", "constantName":
"org.apache.camel.component.couchdb.CouchDbConstants#HEADER_DOC_REV" },
- "CouchDbMethod": { "kind": "header", "displayName": "", "group": "common",
"label": "", "required": false, "javaType": "String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
method (delete \/ update)", "constantName":
"org.apache.camel.component.couchdb.CouchDbConstants#HEADER_METHOD" }
+ "CouchDbMethod": { "kind": "header", "displayName": "", "group": "common",
"label": "", "required": false, "javaType": "String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
method (delete \/ update)", "constantName":
"org.apache.camel.component.couchdb.CouchDbConstants#HEADER_METHOD" },
+ "CamelCouchDbResumeAction": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The resume action to execute when resuming.",
"constantName":
"org.apache.camel.component.couchdb.CouchDbConstants#COUCHDB_RESUME_ACTION" }
},
"properties": {
"protocol": { "kind": "path", "displayName": "Protocol", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "http", "https" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
protocol to use for communicating with the database." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
index 0755c55eaf5..9ea00dfe4f0 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
@@ -28,7 +28,7 @@
},
"headers": {
"CamelCqlQuery": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The CQL query to execute.", "constantName":
"org.apache.camel.component.cassandra.CassandraConstants#CQL_QUERY" },
- "CamelCqlResumeQuery": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The resume action to execute when resuming.",
"constantName":
"org.apache.camel.component.cassandra.CassandraConstants#CASSANDRA_RESUME_ACTION"
}
+ "CamelCqlResumeAction": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The resume action to execute when resuming.",
"constantName":
"org.apache.camel.component.cassandra.CassandraConstants#CASSANDRA_RESUME_ACTION"
}
},
"properties": {
"beanRef": { "kind": "path", "displayName": "Bean Ref", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "beanRef is defined using bean:id" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
index 605f29dbd1e..093f3907c45 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
@@ -34,8 +34,8 @@
"clientFactory": { "kind": "property", "displayName": "Client Factory",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.apache.camel.component.google.drive.GoogleDriveClientFactory",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use the GoogleCalendarClientFactory as factory for creating the client. Will by
default use BatchGoogleDriveClientFactory" },
"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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "OAuth 2 access token.
This typically expires after an hour so refreshToken is recommended for long
term usage." },
"clientSecret": { "kind": "property", "displayName": "Client Secret",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "Client secret of the
drive 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.drive.GoogleDriveConfiguration",
"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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "OAuth 2 refresh token.
Using this, the Google Calendar 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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "OAuth 2 refresh token.
Using this, the Google Calendar 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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "Service account key in
json format to authenticate an application as a service account. Accep [...]
},
"properties": {
"apiName": { "kind": "path", "displayName": "Api Name", "group": "common",
"label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.google.drive.internal.GoogleDriveApiName", "enum":
[ "DRIVE_ABOUT", "DRIVE_APPS", "DRIVE_CHANGES", "DRIVE_CHANNELS",
"DRIVE_CHILDREN", "DRIVE_COMMENTS", "DRIVE_FILES", "DRIVE_PARENTS",
"DRIVE_PERMISSIONS", "DRIVE_PROPERTIES", "DRIVE_DRIVES", "DRIVE_TEAMDRIVES",
"DRIVE_REPLIES", "DRIVE_REVISIONS" ], "deprecated": false, "de [...]
@@ -68,8 +68,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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "OAuth 2 access token.
This typically expires after an hour so refreshToken is recommended for long
term us [...]
"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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "Client secret of the
drive 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.drive.GoogleDriveConfiguration",
"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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "OAuth 2 refresh token.
Using this, the Google Calendar 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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "OAuth 2 refresh token.
Using this, the Google Calendar 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.drive.GoogleDriveConfiguration",
"configurationField": "configuration", "description": "Service account key in
json format to authenticate an application as a service account. Acce [...]
},
"apis": {
"drive-apps": { "consumerOnly": false, "producerOnly": false,
"description": "The apps collection of methods", "methods": { "get": {
"description": "Gets a specific app", "signatures": [
"com.google.api.services.drive.Drive$Apps$Get get(String appId)" ] } } },
diff --git
a/components-starter/camel-google-drive-starter/src/main/docs/google-drive.json
b/components-starter/camel-google-drive-starter/src/main/docs/google-drive.json
index e4aefeb7f0d..4e9deee0cb4 100644
---
a/components-starter/camel-google-drive-starter/src/main/docs/google-drive.json
+++
b/components-starter/camel-google-drive-starter/src/main/docs/google-drive.json
@@ -80,12 +80,6 @@
"description": "Whether to enable auto configuration of the google-drive
component. This is enabled by default.",
"sourceType":
"org.apache.camel.component.google.drive.springboot.GoogleDriveComponentConfiguration"
},
- {
- "name": "camel.component.google-drive.key-resource",
- "type": "java.lang.String",
- "description": "Sets .json file with credentials for Service account",
- "sourceType":
"org.apache.camel.component.google.drive.springboot.GoogleDriveComponentConfiguration"
- },
{
"name": "camel.component.google-drive.lazy-start-producer",
"type": "java.lang.Boolean",
@@ -104,6 +98,12 @@
"type": "java.util.List<java.lang.String>",
"description": "Specifies the level of permissions you want a drive
application to have to a user account. See
https:\/\/developers.google.com\/drive\/web\/scopes for more info.",
"sourceType":
"org.apache.camel.component.google.drive.springboot.GoogleDriveComponentConfiguration"
+ },
+ {
+ "name": "camel.component.google-drive.service-account-key",
+ "type": "java.lang.String",
+ "description": "Service account key in json format to authenticate an
application as a service account. Accept base64 adding the prefix base64:",
+ "sourceType":
"org.apache.camel.component.google.drive.springboot.GoogleDriveComponentConfiguration"
}
],
"hints": []
diff --git
a/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java
b/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java
index dfa944e2ad8..d5e15363826 100644
---
a/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java
+++
b/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentConfiguration.java
@@ -106,16 +106,17 @@ public class GoogleDriveComponentConfiguration
* Client secret of the drive 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;
+ /**
+ * Service account key in json format to authenticate an application as a
+ * service account. Accept base64 adding the prefix base64:
+ */
+ private String serviceAccountKey;
public String getApplicationName() {
return applicationName;
@@ -205,14 +206,6 @@ public class GoogleDriveComponentConfiguration
this.clientSecret = clientSecret;
}
- public String getKeyResource() {
- return keyResource;
- }
-
- public void setKeyResource(String keyResource) {
- this.keyResource = keyResource;
- }
-
public String getRefreshToken() {
return refreshToken;
}
@@ -220,4 +213,12 @@ public class GoogleDriveComponentConfiguration
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
