You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/21 05:27:12 UTC
[camel] branch master updated: CAMEL-15549: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 89f6da5 CAMEL-15549: Polished
89f6da5 is described below
commit 89f6da53e6b90ed7886f0f265a8791d3efef8bc3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 21 07:26:38 2020 +0200
CAMEL-15549: Polished
---
.../docs/google-calendar-stream-component.adoc | 14 ++--
.../calendar/CalendarAclEndpointConfiguration.java | 2 +-
.../CalendarCalendarListEndpointConfiguration.java | 2 +-
.../CalendarCalendarsEndpointConfiguration.java | 2 +-
.../CalendarChannelsEndpointConfiguration.java | 2 +-
.../CalendarColorsEndpointConfiguration.java | 2 +-
.../CalendarEventsEndpointConfiguration.java | 2 +-
.../CalendarFreebusyEndpointConfiguration.java | 2 +-
.../CalendarSettingsEndpointConfiguration.java | 2 +-
.../calendar/stream/google-calendar-stream.json | 20 ++---
.../docs/google-calendar-stream-component.adoc | 14 ++--
.../google/calendar/GoogleCalendarComponent.java | 4 -
.../google/calendar/GoogleCalendarEndpoint.java | 7 --
.../stream/GoogleCalendarStreamComponent.java | 5 +-
.../stream/GoogleCalendarStreamConfiguration.java | 19 +----
.../stream/GoogleCalendarStreamEndpoint.java | 12 +--
.../drive/DriveAboutEndpointConfiguration.java | 2 +-
.../drive/DriveAppsEndpointConfiguration.java | 2 +-
.../drive/DriveChangesEndpointConfiguration.java | 2 +-
.../drive/DriveChannelsEndpointConfiguration.java | 2 +-
.../drive/DriveChildrenEndpointConfiguration.java | 2 +-
.../drive/DriveCommentsEndpointConfiguration.java | 2 +-
.../drive/DriveFilesEndpointConfiguration.java | 2 +-
.../drive/DriveParentsEndpointConfiguration.java | 2 +-
.../DrivePermissionsEndpointConfiguration.java | 2 +-
.../DrivePropertiesEndpointConfiguration.java | 2 +-
.../drive/DriveRealtimeEndpointConfiguration.java | 2 +-
.../drive/DriveRepliesEndpointConfiguration.java | 2 +-
.../drive/DriveRevisionsEndpointConfiguration.java | 2 +-
.../GmailUsersDraftsEndpointConfiguration.java | 2 +-
.../mail/GmailUsersEndpointConfiguration.java | 2 +-
.../GmailUsersHistoryEndpointConfiguration.java | 2 +-
.../GmailUsersLabelsEndpointConfiguration.java | 2 +-
...rsMessagesAttachmentsEndpointConfiguration.java | 2 +-
.../GmailUsersMessagesEndpointConfiguration.java | 2 +-
.../GmailUsersThreadsEndpointConfiguration.java | 2 +-
.../SheetsSpreadsheetsEndpointConfiguration.java | 2 +-
...etsSpreadsheetsValuesEndpointConfiguration.java | 2 +-
...oogleCalendarStreamComponentBuilderFactory.java | 86 +++++++++++-----------
...GoogleCalendarStreamEndpointBuilderFactory.java | 78 ++++++++++----------
.../pages/google-calendar-stream-component.adoc | 14 ++--
.../maven/AbstractApiMethodGeneratorMojo.java | 1 +
.../src/main/resources/api-endpoint-config.vm | 2 +-
43 files changed, 152 insertions(+), 184 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
index 47944eb..0ad4545 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
@@ -60,21 +60,21 @@ The Google Calendar Stream component supports 15 options, which are listed below
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
| *applicationName* (consumer) | Google Calendar application name. Example would be camel-google-calendar/1.0 | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *calendarId* (consumer) | The calendarId to be used | primary | String
| *clientId* (consumer) | Client ID of the calendar application | | String
-| *clientSecret* (consumer) | Client secret of the calendar application | | String
+| *configuration* (consumer) | The configuration | | GoogleCalendarStreamConfiguration
| *considerLastUpdate* (consumer) | Take into account the lastUpdate of the last event polled as start date for the next poll | false | boolean
| *consumeFromNow* (consumer) | Consume events in the selected calendar from now on | true | boolean
| *maxResults* (consumer) | Max results to be returned | 10 | int
| *query* (consumer) | The query to execute on calendar | | String
-| *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
| *scopes* (consumer) | Specifies the level of permissions you want a calendar application to have to a user account. See \https://developers.google.com/calendar/auth for more info. | | List
| *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *clientFactory* (advanced) | The client Factory | | GoogleCalendarClientFactory
-| *configuration* (advanced) | The configuration | | GoogleCalendarStreamConfiguration
+| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
+| *clientSecret* (security) | Client secret of the calendar application | | String
+| *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
|===
// component options: END
@@ -106,17 +106,14 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
| *applicationName* (consumer) | Google Calendar application name. Example would be camel-google-calendar/1.0 | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *calendarId* (consumer) | The calendarId to be used | primary | String
| *clientId* (consumer) | Client ID of the calendar application | | String
-| *clientSecret* (consumer) | Client secret of the calendar application | | String
| *considerLastUpdate* (consumer) | Take into account the lastUpdate of the last event polled as start date for the next poll | false | boolean
| *consumeFromNow* (consumer) | Consume events in the selected calendar from now on | true | boolean
| *maxResults* (consumer) | Max results to be returned | 10 | int
| *query* (consumer) | The query to execute on calendar | | String
-| *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
| *scopes* (consumer) | Specifies the level of permissions you want a calendar application to have to a user account. See \https://developers.google.com/calendar/auth for more info. | | List
| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
@@ -138,6 +135,9 @@ with the following path and query parameters:
| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
+| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
+| *clientSecret* (security) | Client secret of the calendar application | | String
+| *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
|===
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfiguration.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfiguration.java
index 977b549..28c5730 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfiguration.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar$Acl}.
+ * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar.Acl}.
*/
@ApiParams(apiName = "acl",
description = "The acl collection of methods",
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java
index 4ecbe28..de59951 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar$CalendarList}.
+ * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar.CalendarList}.
*/
@ApiParams(apiName = "list",
description = "The calendarList collection of methods",
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfiguration.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfiguration.java
index c92e046..d6b80d2 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfiguration.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar$Calendars}.
+ * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar.Calendars}.
*/
@ApiParams(apiName = "calendars",
description = "The calendars collection of methods",
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfiguration.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfiguration.java
index b68002a..8ad7076 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfiguration.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar$Channels}.
+ * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar.Channels}.
*/
@ApiParams(apiName = "channels",
description = "The channels collection of methods",
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfiguration.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfiguration.java
index 553508c..f92df2f 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfiguration.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar$Colors}.
+ * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar.Colors}.
*/
@ApiParams(apiName = "colors",
description = "The colors collection of methods",
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
index 73c6d67..8e700b9 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar$Events}.
+ * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar.Events}.
*/
@ApiParams(apiName = "events",
description = "The events collection of methods",
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfiguration.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfiguration.java
index 8eb9faa..1ec8ee1 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfiguration.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar$Freebusy}.
+ * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar.Freebusy}.
*/
@ApiParams(apiName = "freebusy",
description = "The freebusy collection of methods",
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfiguration.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfiguration.java
index fb95c4a..95b6d67 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfiguration.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar$Settings}.
+ * Camel endpoint configuration for {@link com.google.api.services.calendar.Calendar.Settings}.
*/
@ApiParams(apiName = "settings",
description = "The settings collection of methods",
diff --git a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
index f1badb6..95df1dc 100644
--- a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
+++ b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
@@ -22,35 +22,32 @@
"lenientProperties": false
},
"componentProperties": {
- "accessToken": { "kind": "property", "displayName": "Access Token", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." },
"applicationName": { "kind": "property", "displayName": "Application Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Google Calendar application name. Example would be camel-google-calendar\/1.0" },
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...]
"calendarId": { "kind": "property", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "primary", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "The calendarId to be used" },
"clientId": { "kind": "property", "displayName": "Client Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Client ID of the calendar application" },
- "clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the calendar application" },
- "considerLastUpdate": { "kind": "property", "displayName": "Consider Last Update", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Take into account the lastUpdate of the last event polled as start date for the nex [...]
+ "configuration": { "kind": "property", "displayName": "Configuration", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "deprecated": false, "secret": false, "description": "The configuration" },
+ "considerLastUpdate": { "kind": "property", "displayName": "Consider Last Update", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Take into account the lastUpdate of the last event polled as start date for the next [...]
"consumeFromNow": { "kind": "property", "displayName": "Consume From Now", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Consume events in the selected calendar from now on" },
"maxResults": { "kind": "property", "displayName": "Max Results", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "10", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Max results to be returned" },
"query": { "kind": "property", "displayName": "Query", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "The query to execute on calendar" },
- "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the curren [...]
"scopes": { "kind": "property", "displayName": "Scopes", "group": "consumer", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Specifies the level of permissions you want a calendar application to have to a user account. See https:\/\/dev [...]
"basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.calendar.GoogleCalendarClientFactory", "deprecated": false, "secret": false, "description": "The client Factory" },
- "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "deprecated": 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, "secret": true, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." },
+ "clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the calendar application" },
+ "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the [...]
},
"properties": {
"index": { "kind": "path", "displayName": "Index", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Specifies an index for the endpoint" },
- "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." },
"applicationName": { "kind": "parameter", "displayName": "Application Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Google Calendar application name. Example would be camel-google-calendar\/1.0" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...]
"calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "primary", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "The calendarId to be used" },
"clientId": { "kind": "parameter", "displayName": "Client Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Client ID of the calendar application" },
- "clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the calendar application" },
- "considerLastUpdate": { "kind": "parameter", "displayName": "Consider Last Update", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Take into account the lastUpdate of the last event polled as start date for the ne [...]
+ "considerLastUpdate": { "kind": "parameter", "displayName": "Consider Last Update", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Take into account the lastUpdate of the last event polled as start date for the next [...]
"consumeFromNow": { "kind": "parameter", "displayName": "Consume From Now", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Consume events in the selected calendar from now on" },
"maxResults": { "kind": "parameter", "displayName": "Max Results", "group": "consumer", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "10", "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Max results to be returned" },
"query": { "kind": "parameter", "displayName": "Query", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "The query to execute on calendar" },
- "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the curre [...]
"scopes": { "kind": "parameter", "displayName": "Scopes", "group": "consumer", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Specifies the level of permissions you want a calendar application to have to a user account. See https:\/\/de [...]
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with [...]
@@ -71,7 +68,10 @@
"schedulerProperties": { "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
"startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
"timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
- "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
+ "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
+ "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." },
+ "clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "Client secret of the calendar application" },
+ "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever th [...]
},
"apis": {
"acl": { "consumerOnly": true, "producerOnly": false, "description": "The acl collection of methods", "methods": { "delete": { "description": "Deletes an access control rule", "signatures": [ "com.google.api.services.calendar.Calendar$Acl$Delete delete(String calendarId, String ruleId)" ] }, "get": { "description": "Returns an access control rule", "signatures": [ "com.google.api.services.calendar.Calendar$Acl$Get get(String calendarId, String ruleId)" ] }, "insert": { "description": [...]
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index 47944eb..0ad4545 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -60,21 +60,21 @@ The Google Calendar Stream component supports 15 options, which are listed below
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
| *applicationName* (consumer) | Google Calendar application name. Example would be camel-google-calendar/1.0 | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *calendarId* (consumer) | The calendarId to be used | primary | String
| *clientId* (consumer) | Client ID of the calendar application | | String
-| *clientSecret* (consumer) | Client secret of the calendar application | | String
+| *configuration* (consumer) | The configuration | | GoogleCalendarStreamConfiguration
| *considerLastUpdate* (consumer) | Take into account the lastUpdate of the last event polled as start date for the next poll | false | boolean
| *consumeFromNow* (consumer) | Consume events in the selected calendar from now on | true | boolean
| *maxResults* (consumer) | Max results to be returned | 10 | int
| *query* (consumer) | The query to execute on calendar | | String
-| *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
| *scopes* (consumer) | Specifies the level of permissions you want a calendar application to have to a user account. See \https://developers.google.com/calendar/auth for more info. | | List
| *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *clientFactory* (advanced) | The client Factory | | GoogleCalendarClientFactory
-| *configuration* (advanced) | The configuration | | GoogleCalendarStreamConfiguration
+| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
+| *clientSecret* (security) | Client secret of the calendar application | | String
+| *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
|===
// component options: END
@@ -106,17 +106,14 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
| *applicationName* (consumer) | Google Calendar application name. Example would be camel-google-calendar/1.0 | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *calendarId* (consumer) | The calendarId to be used | primary | String
| *clientId* (consumer) | Client ID of the calendar application | | String
-| *clientSecret* (consumer) | Client secret of the calendar application | | String
| *considerLastUpdate* (consumer) | Take into account the lastUpdate of the last event polled as start date for the next poll | false | boolean
| *consumeFromNow* (consumer) | Consume events in the selected calendar from now on | true | boolean
| *maxResults* (consumer) | Max results to be returned | 10 | int
| *query* (consumer) | The query to execute on calendar | | String
-| *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
| *scopes* (consumer) | Specifies the level of permissions you want a calendar application to have to a user account. See \https://developers.google.com/calendar/auth for more info. | | List
| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
@@ -138,6 +135,9 @@ with the following path and query parameters:
| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
+| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
+| *clientSecret* (security) | Client secret of the calendar application | | String
+| *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
|===
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index 69ec52d..6a0641b 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -28,16 +28,12 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.component.AbstractApiComponent;
-/**
- * Represents the component that manages {@link GoogleCalendarEndpoint}.
- */
@Component("google-calendar")
public class GoogleCalendarComponent
extends AbstractApiComponent<GoogleCalendarApiName, GoogleCalendarConfiguration, GoogleCalendarApiCollection> {
@Metadata
GoogleCalendarConfiguration configuration;
-
@Metadata(label = "advanced")
private Calendar client;
@Metadata(label = "advanced")
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index 8368f9d..4cb22fb 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -122,11 +122,4 @@ public class GoogleCalendarEndpoint extends AbstractApiEndpoint<GoogleCalendarAp
return apiProxy;
}
- public GoogleCalendarClientFactory getClientFactory() {
- return ((GoogleCalendarComponent) getComponent()).getClientFactory();
- }
-
- public void setClientFactory(GoogleCalendarClientFactory clientFactory) {
- ((GoogleCalendarComponent) getComponent()).setClientFactory(clientFactory);
- }
}
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
index b1c2d7e..118972e 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
@@ -27,9 +27,6 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-/**
- * Represents the component that manages {@link GoogleCalendarStreamEndpoint}.
- */
@Component("google-calendar-stream")
public class GoogleCalendarStreamComponent extends DefaultComponent {
@@ -37,7 +34,7 @@ public class GoogleCalendarStreamComponent extends DefaultComponent {
private Calendar client;
@Metadata(label = "advanced")
private GoogleCalendarClientFactory clientFactory;
- @Metadata(label = "advanced")
+ @Metadata
private GoogleCalendarStreamConfiguration configuration;
public GoogleCalendarStreamComponent() {
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
index 594828e..5c85d2e 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
@@ -34,38 +34,27 @@ public class GoogleCalendarStreamConfiguration implements Cloneable {
@UriPath
private String index;
-
@UriParam
private List<String> scopes = DEFAULT_SCOPES;
-
@UriParam
private String clientId;
-
- @UriParam
+ @UriParam(label = "security", secret = true)
private String clientSecret;
-
- @UriParam
+ @UriParam(label = "security", secret = true)
private String accessToken;
-
- @UriParam
+ @UriParam(label = "security", secret = true)
private String refreshToken;
-
@UriParam
private String applicationName;
-
@UriParam
private String query;
-
@UriParam(defaultValue = "10")
private int maxResults = 10;
-
@UriParam(defaultValue = "primary")
private String calendarId = "primary";
-
@UriParam(defaultValue = "true")
private boolean consumeFromNow = true;
-
- @UriParam(defaultValue = "false")
+ @UriParam
private boolean considerLastUpdate;
public String getClientId() {
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java
index 46aa627..37f9bc5 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.google.calendar.stream;
import com.google.api.services.calendar.Calendar;
import com.google.api.services.calendar.model.Event;
+import org.apache.camel.Category;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.component.google.calendar.GoogleCalendarClientFactory;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.ScheduledPollEndpoint;
@@ -37,7 +37,7 @@ import org.apache.camel.support.ScheduledPollEndpoint;
title = "Google Calendar Stream",
syntax = "google-calendar-stream:index",
consumerOnly = true,
- label = "api,cloud")
+ category = { Category.API, Category.CLOUD })
public class GoogleCalendarStreamEndpoint extends ScheduledPollEndpoint {
@UriParam
@@ -65,14 +65,6 @@ public class GoogleCalendarStreamEndpoint extends ScheduledPollEndpoint {
return ((GoogleCalendarStreamComponent) getComponent()).getClient(configuration);
}
- public GoogleCalendarClientFactory getClientFactory() {
- return ((GoogleCalendarStreamComponent) getComponent()).getClientFactory();
- }
-
- public void setClientFactory(GoogleCalendarClientFactory clientFactory) {
- ((GoogleCalendarStreamComponent) getComponent()).setClientFactory(clientFactory);
- }
-
public GoogleCalendarStreamConfiguration getConfiguration() {
return configuration;
}
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAboutEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAboutEndpointConfiguration.java
index d0b8b0e..8ced490 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAboutEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAboutEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$About}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.About}.
*/
@ApiParams(apiName = "drive-about",
description = "The about collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAppsEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAppsEndpointConfiguration.java
index ac909d4..68a7915 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAppsEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveAppsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Apps}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Apps}.
*/
@ApiParams(apiName = "drive-apps",
description = "The apps collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java
index 2692cd4..81cb529 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Changes}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Changes}.
*/
@ApiParams(apiName = "drive-changes",
description = "The changes collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChannelsEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChannelsEndpointConfiguration.java
index dbb2f60..7a5bf5e 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChannelsEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChannelsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Channels}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Channels}.
*/
@ApiParams(apiName = "drive-channels",
description = "The channels collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChildrenEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChildrenEndpointConfiguration.java
index 56b3df8..48d035c 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChildrenEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChildrenEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Children}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Children}.
*/
@ApiParams(apiName = "drive-children",
description = "The children collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveCommentsEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveCommentsEndpointConfiguration.java
index dfd0fde..e7ba6ed 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveCommentsEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveCommentsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Comments}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Comments}.
*/
@ApiParams(apiName = "drive-comments",
description = "The comments collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java
index 1fecf08..8412bb9 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Files}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Files}.
*/
@ApiParams(apiName = "drive-files",
description = "The files collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveParentsEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveParentsEndpointConfiguration.java
index e0e6e89..80f6e26 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveParentsEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveParentsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Parents}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Parents}.
*/
@ApiParams(apiName = "drive-parents",
description = "The parents collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java
index dcec4ef..d88d3eb 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Permissions}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Permissions}.
*/
@ApiParams(apiName = "drive-permissions",
description = "The permissions collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java
index 052e586..a439617 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Properties}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Properties}.
*/
@ApiParams(apiName = "drive-properties",
description = "The properties collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfiguration.java
index 9ae3b08..e807b9c 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Realtime}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Realtime}.
*/
@ApiParams(apiName = "drive-realtime",
description = "The realtime collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRepliesEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRepliesEndpointConfiguration.java
index 8c56250..d54aef1 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRepliesEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRepliesEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Replies}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Replies}.
*/
@ApiParams(apiName = "drive-replies",
description = "The replies collection of methods",
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java
index 68643b3..98cb0e4 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.drive.Drive$Revisions}.
+ * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Revisions}.
*/
@ApiParams(apiName = "drive-revisions",
description = "The revisions collection of methods",
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfiguration.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfiguration.java
index 1e9ce86..393be99 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfiguration.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail$Users$Drafts}.
+ * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail.Users.Drafts}.
*/
@ApiParams(apiName = "drafts",
description = "The drafts collection of methods",
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfiguration.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfiguration.java
index d5b175b..d1faf64 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfiguration.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail$Users}.
+ * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail.Users}.
*/
@ApiParams(apiName = "users",
description = "The users collection of methods",
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfiguration.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfiguration.java
index fa65606..00969e2 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfiguration.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail$Users$History}.
+ * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail.Users.History}.
*/
@ApiParams(apiName = "history",
description = "The history collection of methods",
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfiguration.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfiguration.java
index 30749c1..ee23663 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfiguration.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail$Users$Labels}.
+ * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail.Users.Labels}.
*/
@ApiParams(apiName = "labels",
description = "The labels collection of methods",
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfiguration.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfiguration.java
index a0cdb39..bfd11a2 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfiguration.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail$Users$Messages$Attachments}.
+ * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail.Users.Messages.Attachments}.
*/
@ApiParams(apiName = "attachments",
description = "The attachments collection of methods",
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfiguration.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfiguration.java
index 06f222f..e7d0535 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfiguration.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail$Users$Messages}.
+ * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail.Users.Messages}.
*/
@ApiParams(apiName = "messages",
description = "The messages collection of methods",
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfiguration.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfiguration.java
index 3701527..13cebf4 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfiguration.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail$Users$Threads}.
+ * Camel endpoint configuration for {@link com.google.api.services.gmail.Gmail.Users.Threads}.
*/
@ApiParams(apiName = "threads",
description = "The threads collection of methods",
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
index 209587d..4632054 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.sheets.v4.Sheets$Spreadsheets}.
+ * Camel endpoint configuration for {@link com.google.api.services.sheets.v4.Sheets.Spreadsheets}.
*/
@ApiParams(apiName = "spreadsheets",
description = "The spreadsheets collection of methods",
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
index 5c65495..b4108bf 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java
@@ -12,7 +12,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link com.google.api.services.sheets.v4.Sheets$Spreadsheets$Values}.
+ * Camel endpoint configuration for {@link com.google.api.services.sheets.v4.Sheets.Spreadsheets.Values}.
*/
@ApiParams(apiName = "data",
description = "The values collection of methods",
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
index 6108fee..3483925 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
@@ -49,19 +49,6 @@ public interface GoogleCalendarStreamComponentBuilderFactory {
extends
ComponentBuilder<GoogleCalendarStreamComponent> {
/**
- * OAuth 2 access token. This typically expires after an hour so
- * refreshToken is recommended for long term usage.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: consumer
- */
- default GoogleCalendarStreamComponentBuilder accessToken(
- java.lang.String accessToken) {
- doSetProperty("accessToken", accessToken);
- return this;
- }
- /**
* Google Calendar application name. Example would be
* camel-google-calendar/1.0.
*
@@ -119,15 +106,16 @@ public interface GoogleCalendarStreamComponentBuilderFactory {
return this;
}
/**
- * Client secret of the calendar application.
+ * The configuration.
*
- * The option is a: <code>java.lang.String</code> type.
+ * The option is a:
+ * <code>org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration</code> type.
*
* Group: consumer
*/
- default GoogleCalendarStreamComponentBuilder clientSecret(
- java.lang.String clientSecret) {
- doSetProperty("clientSecret", clientSecret);
+ default GoogleCalendarStreamComponentBuilder configuration(
+ org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration configuration) {
+ doSetProperty("configuration", configuration);
return this;
}
/**
@@ -182,20 +170,6 @@ public interface GoogleCalendarStreamComponentBuilderFactory {
return this;
}
/**
- * OAuth 2 refresh token. Using this, the Google Calendar component can
- * obtain a new accessToken whenever the current one expires - a
- * necessity if the application is long-lived.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: consumer
- */
- default GoogleCalendarStreamComponentBuilder refreshToken(
- java.lang.String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
- return this;
- }
- /**
* Specifies the level of permissions you want a calendar application to
* have to a user account. See
* https://developers.google.com/calendar/auth for more info.
@@ -238,16 +212,42 @@ public interface GoogleCalendarStreamComponentBuilderFactory {
return this;
}
/**
- * The configuration.
+ * OAuth 2 access token. This typically expires after an hour so
+ * refreshToken is recommended for long term usage.
*
- * The option is a:
- * <code>org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration</code> type.
+ * The option is a: <code>java.lang.String</code> type.
*
- * Group: advanced
+ * Group: security
*/
- default GoogleCalendarStreamComponentBuilder configuration(
- org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration configuration) {
- doSetProperty("configuration", configuration);
+ default GoogleCalendarStreamComponentBuilder accessToken(
+ java.lang.String accessToken) {
+ doSetProperty("accessToken", accessToken);
+ return this;
+ }
+ /**
+ * Client secret of the calendar application.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
+ */
+ default GoogleCalendarStreamComponentBuilder clientSecret(
+ java.lang.String clientSecret) {
+ doSetProperty("clientSecret", clientSecret);
+ return this;
+ }
+ /**
+ * OAuth 2 refresh token. Using this, the Google Calendar component can
+ * obtain a new accessToken whenever the current one expires - a
+ * necessity if the application is long-lived.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
+ */
+ default GoogleCalendarStreamComponentBuilder refreshToken(
+ java.lang.String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
return this;
}
}
@@ -274,21 +274,21 @@ public interface GoogleCalendarStreamComponentBuilderFactory {
String name,
Object value) {
switch (name) {
- case "accessToken": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setAccessToken((java.lang.String) value); return true;
case "applicationName": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setApplicationName((java.lang.String) value); return true;
case "bridgeErrorHandler": ((GoogleCalendarStreamComponent) component).setBridgeErrorHandler((boolean) value); return true;
case "calendarId": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setCalendarId((java.lang.String) value); return true;
case "clientId": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setClientId((java.lang.String) value); return true;
- case "clientSecret": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setClientSecret((java.lang.String) value); return true;
+ case "configuration": ((GoogleCalendarStreamComponent) component).setConfiguration((org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration) value); return true;
case "considerLastUpdate": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setConsiderLastUpdate((boolean) value); return true;
case "consumeFromNow": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setConsumeFromNow((boolean) value); return true;
case "maxResults": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setMaxResults((int) value); return true;
case "query": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setQuery((java.lang.String) value); return true;
- case "refreshToken": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setRefreshToken((java.lang.String) value); return true;
case "scopes": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setScopes((java.util.List) value); return true;
case "basicPropertyBinding": ((GoogleCalendarStreamComponent) component).setBasicPropertyBinding((boolean) value); return true;
case "clientFactory": ((GoogleCalendarStreamComponent) component).setClientFactory((org.apache.camel.component.google.calendar.GoogleCalendarClientFactory) value); return true;
- case "configuration": ((GoogleCalendarStreamComponent) component).setConfiguration((org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration) value); return true;
+ case "accessToken": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setAccessToken((java.lang.String) value); return true;
+ case "clientSecret": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setClientSecret((java.lang.String) value); return true;
+ case "refreshToken": getOrCreateConfiguration((GoogleCalendarStreamComponent) component).setRefreshToken((java.lang.String) value); return true;
default: return false;
}
}
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
index 3973095..0151a80 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
@@ -48,19 +48,6 @@ public interface GoogleCalendarStreamEndpointBuilderFactory {
return (AdvancedGoogleCalendarStreamEndpointBuilder) this;
}
/**
- * OAuth 2 access token. This typically expires after an hour so
- * refreshToken is recommended for long term usage.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: consumer
- */
- default GoogleCalendarStreamEndpointBuilder accessToken(
- String accessToken) {
- doSetProperty("accessToken", accessToken);
- return this;
- }
- /**
* Google Calendar application name. Example would be
* camel-google-calendar/1.0.
*
@@ -135,18 +122,6 @@ public interface GoogleCalendarStreamEndpointBuilderFactory {
return this;
}
/**
- * Client secret of the calendar application.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: consumer
- */
- default GoogleCalendarStreamEndpointBuilder clientSecret(
- String clientSecret) {
- doSetProperty("clientSecret", clientSecret);
- return this;
- }
- /**
* Take into account the lastUpdate of the last event polled as start
* date for the next poll.
*
@@ -236,20 +211,6 @@ public interface GoogleCalendarStreamEndpointBuilderFactory {
return this;
}
/**
- * OAuth 2 refresh token. Using this, the Google Calendar component can
- * obtain a new accessToken whenever the current one expires - a
- * necessity if the application is long-lived.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: consumer
- */
- default GoogleCalendarStreamEndpointBuilder refreshToken(
- String refreshToken) {
- doSetProperty("refreshToken", refreshToken);
- return this;
- }
- /**
* Specifies the level of permissions you want a calendar application to
* have to a user account. See
* https://developers.google.com/calendar/auth for more info.
@@ -695,6 +656,45 @@ public interface GoogleCalendarStreamEndpointBuilderFactory {
doSetProperty("useFixedDelay", useFixedDelay);
return this;
}
+ /**
+ * OAuth 2 access token. This typically expires after an hour so
+ * refreshToken is recommended for long term usage.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
+ */
+ default GoogleCalendarStreamEndpointBuilder accessToken(
+ String accessToken) {
+ doSetProperty("accessToken", accessToken);
+ return this;
+ }
+ /**
+ * Client secret of the calendar application.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
+ */
+ default GoogleCalendarStreamEndpointBuilder clientSecret(
+ String clientSecret) {
+ doSetProperty("clientSecret", clientSecret);
+ return this;
+ }
+ /**
+ * OAuth 2 refresh token. Using this, the Google Calendar component can
+ * obtain a new accessToken whenever the current one expires - a
+ * necessity if the application is long-lived.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
+ */
+ default GoogleCalendarStreamEndpointBuilder refreshToken(
+ String refreshToken) {
+ doSetProperty("refreshToken", refreshToken);
+ return this;
+ }
}
/**
diff --git a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
index 1514f4a..9b3df2b 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
@@ -62,21 +62,21 @@ The Google Calendar Stream component supports 15 options, which are listed below
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
| *applicationName* (consumer) | Google Calendar application name. Example would be camel-google-calendar/1.0 | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *calendarId* (consumer) | The calendarId to be used | primary | String
| *clientId* (consumer) | Client ID of the calendar application | | String
-| *clientSecret* (consumer) | Client secret of the calendar application | | String
+| *configuration* (consumer) | The configuration | | GoogleCalendarStreamConfiguration
| *considerLastUpdate* (consumer) | Take into account the lastUpdate of the last event polled as start date for the next poll | false | boolean
| *consumeFromNow* (consumer) | Consume events in the selected calendar from now on | true | boolean
| *maxResults* (consumer) | Max results to be returned | 10 | int
| *query* (consumer) | The query to execute on calendar | | String
-| *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
| *scopes* (consumer) | Specifies the level of permissions you want a calendar application to have to a user account. See \https://developers.google.com/calendar/auth for more info. | | List
| *basicPropertyBinding* (advanced) | *Deprecated* Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *clientFactory* (advanced) | The client Factory | | GoogleCalendarClientFactory
-| *configuration* (advanced) | The configuration | | GoogleCalendarStreamConfiguration
+| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
+| *clientSecret* (security) | Client secret of the calendar application | | String
+| *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
|===
// component options: END
@@ -108,17 +108,14 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
| *applicationName* (consumer) | Google Calendar application name. Example would be camel-google-calendar/1.0 | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *calendarId* (consumer) | The calendarId to be used | primary | String
| *clientId* (consumer) | Client ID of the calendar application | | String
-| *clientSecret* (consumer) | Client secret of the calendar application | | String
| *considerLastUpdate* (consumer) | Take into account the lastUpdate of the last event polled as start date for the next poll | false | boolean
| *consumeFromNow* (consumer) | Consume events in the selected calendar from now on | true | boolean
| *maxResults* (consumer) | Max results to be returned | 10 | int
| *query* (consumer) | The query to execute on calendar | | String
-| *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
| *scopes* (consumer) | Specifies the level of permissions you want a calendar application to have to a user account. See \https://developers.google.com/calendar/auth for more info. | | List
| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
@@ -140,6 +137,9 @@ with the following path and query parameters:
| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. There are 7 enums and the value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
+| *accessToken* (security) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. | | String
+| *clientSecret* (security) | Client secret of the calendar application | | String
+| *refreshToken* (security) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
|===
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
index 3d99806..d68cdc0 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
@@ -291,6 +291,7 @@ public abstract class AbstractApiMethodGeneratorMojo extends AbstractApiMethodBa
VelocityContext context = new VelocityContext();
context.put("models", models);
context.put("proxyType", getProxyType());
+ context.put("proxyTypeLink", getProxyType().getName().replace('$', '.'));
context.put("helper", this);
return context;
}
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-endpoint-config.vm b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-endpoint-config.vm
index ffcfdfb..9236080 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-endpoint-config.vm
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-endpoint-config.vm
@@ -44,7 +44,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
/**
- * Camel endpoint configuration for {@link $proxyType.Name}.
+ * Camel endpoint configuration for {@link $proxyTypeLink}.
*/
@ApiParams(apiName = "$helper.getApiName($apiName)", #if($producerOnly)producerOnly = true,#elseif($consumerOnly)consumerOnly = true,#end
description = "$helper.getApiDescription($apiDescription)",