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.git
The following commit(s) were added to refs/heads/main by this push: new 5222d7021a5 Regen 5222d7021a5 is described below commit 5222d7021a5ed2730b4e94f959aad4fb4c97bb8e Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sun Jun 12 19:20:42 2022 +0200 Regen --- .../camel/catalog/components/google-drive.json | 8 +-- .../apache/camel/catalog/schemas/camel-spring.xsd | 8 --- .../dsl/GoogleDriveComponentBuilderFactory.java | 27 ++++---- .../dsl/GoogleDriveEndpointBuilderFactory.java | 72 ++++++++++++---------- 4 files changed, 56 insertions(+), 59 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-drive.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-drive.json index 9b319634b94..e4f3daffdcd 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-drive.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/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/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 6095aaa734a..7148e8b0b05 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -10515,14 +10515,6 @@ Sets the resume strategy to use. ]]></xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="intermittent" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Sets whether the offsets will be intermittently present or whether they must be -present in every exchange. Default value: false - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> </xs:extension> </xs:complexContent> </xs:complexType> diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java index 2002338955f..56bf57014e1 100644 --- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java +++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java @@ -244,35 +244,36 @@ public interface GoogleDriveComponentBuilderFactory { 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 GoogleDriveComponentBuilder keyResource( - java.lang.String keyResource) { - doSetProperty("keyResource", keyResource); + default GoogleDriveComponentBuilder 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. + * Service account key in json format to authenticate an application as + * a service account. Accept base64 adding the prefix base64:. * * 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 GoogleDriveComponentBuilder refreshToken( - java.lang.String refreshToken) { - doSetProperty("refreshToken", refreshToken); + default GoogleDriveComponentBuilder serviceAccountKey( + java.lang.String serviceAccountKey) { + doSetProperty("serviceAccountKey", serviceAccountKey); return this; } } @@ -310,8 +311,8 @@ public interface GoogleDriveComponentBuilderFactory { case "clientFactory": ((GoogleDriveComponent) component).setClientFactory((org.apache.camel.component.google.drive.GoogleDriveClientFactory) value); return true; case "accessToken": getOrCreateConfiguration((GoogleDriveComponent) component).setAccessToken((java.lang.String) value); return true; case "clientSecret": getOrCreateConfiguration((GoogleDriveComponent) component).setClientSecret((java.lang.String) value); return true; - case "keyResource": getOrCreateConfiguration((GoogleDriveComponent) component).setKeyResource((java.lang.String) value); return true; case "refreshToken": getOrCreateConfiguration((GoogleDriveComponent) component).setRefreshToken((java.lang.String) value); return true; + case "serviceAccountKey": getOrCreateConfiguration((GoogleDriveComponent) 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/GoogleDriveEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java index f90912db87c..efdb64fe25f 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java @@ -764,35 +764,36 @@ public interface GoogleDriveEndpointBuilderFactory { 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 GoogleDriveEndpointConsumerBuilder keyResource( - String keyResource) { - doSetProperty("keyResource", keyResource); + default GoogleDriveEndpointConsumerBuilder 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. + * Service account key in json format to authenticate an application as + * a service account. Accept base64 adding the prefix base64:. * * 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 GoogleDriveEndpointConsumerBuilder refreshToken( - String refreshToken) { - doSetProperty("refreshToken", refreshToken); + default GoogleDriveEndpointConsumerBuilder serviceAccountKey( + String serviceAccountKey) { + doSetProperty("serviceAccountKey", serviceAccountKey); return this; } } @@ -1133,35 +1134,36 @@ public interface GoogleDriveEndpointBuilderFactory { 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 GoogleDriveEndpointProducerBuilder keyResource( - String keyResource) { - doSetProperty("keyResource", keyResource); + default GoogleDriveEndpointProducerBuilder 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. + * Service account key in json format to authenticate an application as + * a service account. Accept base64 adding the prefix base64:. * * 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 GoogleDriveEndpointProducerBuilder refreshToken( - String refreshToken) { - doSetProperty("refreshToken", refreshToken); + default GoogleDriveEndpointProducerBuilder serviceAccountKey( + String serviceAccountKey) { + doSetProperty("serviceAccountKey", serviceAccountKey); return this; } } @@ -1342,33 +1344,35 @@ public interface GoogleDriveEndpointBuilderFactory { 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 GoogleDriveEndpointBuilder keyResource(String keyResource) { - doSetProperty("keyResource", keyResource); + default GoogleDriveEndpointBuilder 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. + * Service account key in json format to authenticate an application as + * a service account. Accept base64 adding the prefix base64:. * * 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 GoogleDriveEndpointBuilder refreshToken(String refreshToken) { - doSetProperty("refreshToken", refreshToken); + default GoogleDriveEndpointBuilder serviceAccountKey( + String serviceAccountKey) { + doSetProperty("serviceAccountKey", serviceAccountKey); return this; } }