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/07 14:46:51 UTC
[camel] branch master updated (695c1b7 -> 32ee7fd)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 695c1b7 Removing netty40-version which isn't used any more
new 975a3da CAMEL-15478: javasource parser can parse inner classes
new afecae6 CAMEL-15478: javasource parser can parse inner classes
new afaee41 CAMEL-15478: camel-google-calendar uses javasource parser instead of javadoc for generating api component source code.
new ee17e95 CAMEL-15478: javasource parser can parse inner classes
new 80ccd25 CAMEL-15478: class resolving for inner classes is more complex
new 483c0ad CAMEL-15478: Delete src/generated and regen and then we can remove some old cruft as leftovers
new 32ee7fd CAMEL-15478: Regen
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/catalog/components/as2.json | 2 +-
.../org/apache/camel/catalog/components/box.json | 12 +--
.../org/apache/camel/catalog/components/fhir.json | 10 +--
.../catalog/components/google-calendar-stream.json | 14 ++--
.../camel/catalog/components/google-calendar.json | 14 ++--
.../apache/camel/catalog/docs/as2-component.adoc | 16 ++--
.../camel/catalog/docs/batch-config-eip.adoc | 2 +-
.../apache/camel/catalog/docs/box-component.adoc | 42 +++++-----
.../apache/camel/catalog/docs/fhir-component.adoc | 24 +++---
.../catalog/docs/google-calendar-component.adoc | 38 ++++-----
.../docs/google-calendar-stream-component.adoc | 38 ++++-----
.../apache/camel/catalog/docs/resequence-eip.adoc | 2 +-
.../camel/catalog/docs/stream-config-eip.adoc | 4 +-
components/camel-google-calendar/pom.xml | 34 ++++-----
.../calendar/CalendarAclEndpointConfiguration.java | 8 +-
.../CalendarCalendarListEndpointConfiguration.java | 6 +-
.../CalendarCalendarsEndpointConfiguration.java | 4 +-
.../CalendarChannelsEndpointConfiguration.java | 2 +-
.../CalendarEventsEndpointConfiguration.java | 12 +--
.../CalendarFreebusyEndpointConfiguration.java | 2 +-
.../CalendarSettingsEndpointConfiguration.java | 4 +-
.../component/google/calendar/google-calendar.json | 14 ++--
.../calendar/stream/google-calendar-stream.json | 14 ++--
.../src/main/docs/google-calendar-component.adoc | 38 ++++-----
.../docs/google-calendar-stream-component.adoc | 38 ++++-----
.../services/org/apache/camel/spi/TransactedPolicy | 2 -
.../stored/template/generated/ParseException.java | 29 ++-----
.../sql/stored/template/generated/SSPTParser.java | 25 +-----
.../template/generated/SSPTParserConstants.java | 16 ----
.../template/generated/SSPTParserTokenManager.java | 18 +----
.../template/generated/SimpleCharStream.java | 16 ----
.../sql/stored/template/generated/Token.java | 17 -----
.../stored/template/generated/TokenMgrError.java | 17 -----
.../services/org/apache/camel/reactive-executor | 2 -
.../dsl/ElytronComponentBuilderFactory.java | 0
.../org/apache/camel/util/concurrent/jaxb.index | 2 -
.../modules/ROOT/pages/as2-component.adoc | 16 ++--
.../modules/ROOT/pages/box-component.adoc | 42 +++++-----
.../modules/ROOT/pages/fhir-component.adoc | 24 +++---
.../ROOT/pages/google-calendar-component.adoc | 38 ++++-----
.../pages/google-calendar-stream-component.adoc | 38 ++++-----
.../maven/JavaSourceApiMethodGeneratorMojo.java | 4 +-
.../org/apache/camel/maven/JavaSourceParser.java | 89 ++++++++++++++++------
.../{TestConfiguration.java => NestedProxy.java} | 22 +++---
.../apache/camel/maven/JavaSourceParserTest.java | 23 +++++-
45 files changed, 388 insertions(+), 446 deletions(-)
delete mode 100644 components/camel-spring/src/generated/resources/META-INF/services/org/apache/camel/spi/TransactedPolicy
delete mode 100644 components/camel-threadpoolfactory-vertx/src/generated/resources/META-INF/services/org/apache/camel/reactive-executor
delete mode 100644 core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElytronComponentBuilderFactory.java
delete mode 100644 core/camel-util/src/generated/resources/org/apache/camel/util/concurrent/jaxb.index
copy tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/{TestConfiguration.java => NestedProxy.java} (73%)
[camel] 05/07: CAMEL-15478: class resolving for inner classes is
more complex
Posted by da...@apache.org.
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
commit 80ccd254677a61dd66d7d9a07a5efea6189a7cdc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 7 16:33:21 2020 +0200
CAMEL-15478: class resolving for inner classes is more complex
---
.../src/main/java/org/apache/camel/maven/JavaSourceParser.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
index d1b39a5..17de8ef 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
@@ -189,6 +189,8 @@ public class JavaSourceParser {
return clazz.getQualifiedName() + "$" + child.replace('.', '$');
}
}
+ String resolvedType = rootClazz.resolveType(parent);
+ return resolvedType + "$" + child;
}
// okay attempt to resolve the type
[camel] 03/07: CAMEL-15478: camel-google-calendar uses javasource
parser instead of javadoc for generating api component source code.
Posted by da...@apache.org.
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
commit afaee41cf4746d19b2c9e2c1bc14e07bb57b9ef5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 7 10:46:32 2020 +0200
CAMEL-15478: camel-google-calendar uses javasource parser instead of javadoc for generating api component source code.
---
components/camel-google-calendar/pom.xml | 34 +++++++++----------
.../calendar/CalendarAclEndpointConfiguration.java | 8 ++---
.../CalendarCalendarListEndpointConfiguration.java | 6 ++--
.../CalendarCalendarsEndpointConfiguration.java | 4 +--
.../CalendarChannelsEndpointConfiguration.java | 2 +-
.../CalendarEventsEndpointConfiguration.java | 12 +++----
.../CalendarFreebusyEndpointConfiguration.java | 2 +-
.../CalendarSettingsEndpointConfiguration.java | 4 +--
.../component/google/calendar/google-calendar.json | 14 ++++----
.../calendar/stream/google-calendar-stream.json | 14 ++++----
.../src/main/docs/google-calendar-component.adoc | 38 +++++++++++-----------
.../docs/google-calendar-stream-component.adoc | 38 +++++++++++-----------
12 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml
index 1a10ed5..4400e12 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -66,15 +66,6 @@
<version>${google-api-services-calendar-version}</version>
</dependency>
- <!-- Component API javadoc in provided scope to read API signatures -->
- <dependency>
- <groupId>com.google.apis</groupId>
- <artifactId>google-api-services-calendar</artifactId>
- <version>${google-api-services-calendar-version}</version>
- <type>javadoc</type>
- <scope>provided</scope>
- </dependency>
-
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -110,42 +101,42 @@
<api>
<apiName>acl</apiName>
<proxyClass>com.google.api.services.calendar.Calendar$Acl</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
<api>
<apiName>list</apiName>
<proxyClass>com.google.api.services.calendar.Calendar$CalendarList</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
<api>
<apiName>calendars</apiName>
<proxyClass>com.google.api.services.calendar.Calendar$Calendars</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
<api>
<apiName>channels</apiName>
<proxyClass>com.google.api.services.calendar.Calendar$Channels</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
<api>
<apiName>colors</apiName>
<proxyClass>com.google.api.services.calendar.Calendar$Colors</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
<api>
<apiName>freebusy</apiName>
<proxyClass>com.google.api.services.calendar.Calendar$Freebusy</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
<api>
<apiName>events</apiName>
<proxyClass>com.google.api.services.calendar.Calendar$Events</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
<api>
<apiName>settings</apiName>
<proxyClass>com.google.api.services.calendar.Calendar$Settings</proxyClass>
- <fromJavadoc />
+ <fromJavasource />
</api>
</apis>
<substitutions>
@@ -159,6 +150,15 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <!-- Component API to read API signatures -->
+ <dependency>
+ <groupId>com.google.apis</groupId>
+ <artifactId>google-api-services-calendar</artifactId>
+ <version>${google-api-services-calendar-version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<!-- we need to generate additional configurer classes -->
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 00efa78..8cae729 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
@@ -16,13 +16,13 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class CalendarAclEndpointConfiguration extends GoogleCalendarConfiguration {
- @UriParam
+ @UriParam(description = "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.")
private String calendarId;
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.AclRule")
private com.google.api.services.calendar.model.AclRule content;
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.Channel")
private com.google.api.services.calendar.model.Channel contentChannel;
- @UriParam
+ @UriParam(description = "ACL rule identifier")
private String ruleId;
public String getCalendarId() {
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 4c2c04b..c527fc8 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
@@ -16,11 +16,11 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class CalendarCalendarListEndpointConfiguration extends GoogleCalendarConfiguration {
- @UriParam
+ @UriParam(description = "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.")
private String calendarId;
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.CalendarListEntry")
private com.google.api.services.calendar.model.CalendarListEntry content;
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.Channel")
private com.google.api.services.calendar.model.Channel contentChannel;
public String getCalendarId() {
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 8dff3dc..f2a9dd1 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
@@ -16,9 +16,9 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class CalendarCalendarsEndpointConfiguration extends GoogleCalendarConfiguration {
- @UriParam
+ @UriParam(description = "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.")
private String calendarId;
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.Calendar")
private com.google.api.services.calendar.model.Calendar content;
public String getCalendarId() {
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 0bb1e49..3c2b437 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
@@ -16,7 +16,7 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class CalendarChannelsEndpointConfiguration extends GoogleCalendarConfiguration {
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.Channel")
private com.google.api.services.calendar.model.Channel contentChannel;
public com.google.api.services.calendar.model.Channel getContentChannel() {
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 fac947c..7fa2cfa 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
@@ -16,17 +16,17 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class CalendarEventsEndpointConfiguration extends GoogleCalendarConfiguration {
- @UriParam
+ @UriParam(description = "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.")
private String calendarId;
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.Event")
private com.google.api.services.calendar.model.Event content;
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.Channel")
private com.google.api.services.calendar.model.Channel contentChannel;
- @UriParam
+ @UriParam(description = "Calendar identifier of the target calendar where the event is to be moved to")
private String destination;
- @UriParam
+ @UriParam(description = "Event identifier")
private String eventId;
- @UriParam
+ @UriParam(description = "The text describing the event to be created")
private String text;
public String getCalendarId() {
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 30d6127..11206ff 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
@@ -16,7 +16,7 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class CalendarFreebusyEndpointConfiguration extends GoogleCalendarConfiguration {
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.FreeBusyRequest")
private com.google.api.services.calendar.model.FreeBusyRequest content;
public com.google.api.services.calendar.model.FreeBusyRequest getContent() {
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 266fc2a..3983bd9 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
@@ -16,9 +16,9 @@ import org.apache.camel.spi.UriParams;
@UriParams
@Configurer
public final class CalendarSettingsEndpointConfiguration extends GoogleCalendarConfiguration {
- @UriParam
+ @UriParam(description = "The com.google.api.services.calendar.model.Channel")
private com.google.api.services.calendar.model.Channel contentChannel;
- @UriParam
+ @UriParam(description = "The id of the user setting")
private String setting;
public com.google.api.services.calendar.model.Channel getContentChannel() {
diff --git a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
index 8e00140..2ee8bed 100644
--- a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
+++ b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
@@ -75,13 +75,13 @@
"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.GoogleCalendarConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one [...]
},
"apiProperties": {
- "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.AclRule", "deprecated": false, "secret": false, "description": "" }, "c [...]
- "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Calendar", "deprecated": false, "secret": false, "description": "" } },
- "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" } },
+ "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": "c [...]
+ "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "grou [...]
+ "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel" } },
"colors": { },
- "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Event", "deprecated": false, "secret": false, "description": "" }, " [...]
- "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "" } },
- "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.CalendarListEntry", "deprecated": false, "secret": false, "description [...]
- "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "descripti [...]
+ "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": [...]
+ "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.FreeBusyRequest" } },
+ "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": " [...]
+ "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String" [...]
}
}
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 72df006..83d97fb 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
@@ -75,13 +75,13 @@
"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." }
},
"apiProperties": {
- "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.AclRule", "deprecated": false, "secret": false, "description": "" } [...]
- "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Calendar", "deprecated": false, "secret": false, "description [...]
- "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" } },
+ "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": [...]
+ "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "gr [...]
+ "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel" } },
"colors": { },
- "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Event", "deprecated": false, "secret": false, "description": "" [...]
- "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "" } },
- "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.CalendarListEntry", "deprecated": false, "secret": false, "descrip [...]
- "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "descr [...]
+ "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group [...]
+ "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.FreeBusyRequest" } },
+ "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": [...]
+ "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.Str [...]
}
}
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
index f7a5f18..f74a8e9 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
@@ -158,10 +158,10 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | AclRule
-| *contentChannel* | | Channel
-| *ruleId* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.AclRule | AclRule
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *ruleId* | ACL rule identifier | String
|===
@@ -170,8 +170,8 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Calendar
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Calendar | Calendar
|===
@@ -180,7 +180,7 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -194,12 +194,12 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Event
-| *contentChannel* | | Channel
-| *destination* | | String
-| *eventId* | | String
-| *text* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Event | Event
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *destination* | Calendar identifier of the target calendar where the event is to be moved to | String
+| *eventId* | Event identifier | String
+| *text* | The text describing the event to be created | String
|===
@@ -208,7 +208,7 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *content* | | FreeBusyRequest
+| *content* | The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
|===
@@ -217,9 +217,9 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | CalendarListEntry
-| *contentChannel* | | Channel
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -228,8 +228,8 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
-| *setting* | | String
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *setting* | The id of the user setting | String
|===
// endpoint options: END
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 b2cefbc..9b567e2 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
@@ -161,10 +161,10 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | AclRule
-| *contentChannel* | | Channel
-| *ruleId* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.AclRule | AclRule
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *ruleId* | ACL rule identifier | String
|===
@@ -173,8 +173,8 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Calendar
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Calendar | Calendar
|===
@@ -183,7 +183,7 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -197,12 +197,12 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Event
-| *contentChannel* | | Channel
-| *destination* | | String
-| *eventId* | | String
-| *text* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Event | Event
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *destination* | Calendar identifier of the target calendar where the event is to be moved to | String
+| *eventId* | Event identifier | String
+| *text* | The text describing the event to be created | String
|===
@@ -211,7 +211,7 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *content* | | FreeBusyRequest
+| *content* | The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
|===
@@ -220,9 +220,9 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | CalendarListEntry
-| *contentChannel* | | Channel
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -231,8 +231,8 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
-| *setting* | | String
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *setting* | The id of the user setting | String
|===
// endpoint options: END
[camel] 04/07: CAMEL-15478: javasource parser can parse inner
classes
Posted by da...@apache.org.
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
commit ee17e951cd4703fbc457ec10a199ded4032cbbfe
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 7 11:24:29 2020 +0200
CAMEL-15478: javasource parser can parse inner classes
---
.../org/apache/camel/maven/JavaSourceParser.java | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
index fad784d..d1b39a5 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
@@ -166,6 +166,30 @@ public class JavaSourceParser {
if (inner) {
return clazz.getQualifiedName() + "$" + type;
}
+ int dot = type.indexOf('.');
+ if (Character.isUpperCase(type.charAt(0)) && dot != -1) {
+ // okay its likely a inner class with a nested sub type, so resolving is even more complex
+ String parent = type.substring(0, dot);
+ String child = type.substring(dot + 1);
+ inner = rootClazz.getNestedType(parent) != null;
+ if (inner) {
+ return rootClazz.getQualifiedName() + "$" + type.replace('.', '$');
+ }
+ inner = clazz.getNestedType(type) != null;
+ if (inner) {
+ return clazz.getQualifiedName() + "$" + type.replace('.', '$');
+ }
+ if (parent.equals(rootClazz.getName())) {
+ inner = rootClazz.getNestedType(child) != null;
+ if (inner) {
+ return rootClazz.getQualifiedName() + "$" + child.replace('.', '$');
+ }
+ inner = clazz.getNestedType(child) != null;
+ if (inner) {
+ return clazz.getQualifiedName() + "$" + child.replace('.', '$');
+ }
+ }
+ }
// okay attempt to resolve the type
String resolvedType = clazz.resolveType(type);
[camel] 02/07: CAMEL-15478: javasource parser can parse inner
classes
Posted by da...@apache.org.
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
commit afecae6ffdf336ac9b84126fbc2fa6cb3c0b9fc1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 7 10:44:06 2020 +0200
CAMEL-15478: javasource parser can parse inner classes
---
.../org/apache/camel/maven/JavaSourceParser.java | 52 +++++++++++-----------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
index 57eee7f..fad784d 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
@@ -46,7 +46,8 @@ public class JavaSourceParser {
private String errorMessage;
public synchronized void parse(InputStream in, String innerClass) throws Exception {
- JavaClassSource clazz = (JavaClassSource) Roaster.parse(in);
+ JavaClassSource rootClazz = (JavaClassSource) Roaster.parse(in);
+ JavaClassSource clazz = rootClazz;
if (innerClass != null) {
// we want the inner class from the parent class
@@ -55,7 +56,7 @@ public class JavaSourceParser {
clazz = (JavaClassSource) nested;
}
if (nested == null) {
- errorMessage = "Cannot find inner class " + innerClass + " in class: " + clazz.getQualifiedName();
+ errorMessage = "Cannot find inner class " + innerClass + " in class: " + rootClazz.getQualifiedName();
return;
}
}
@@ -74,12 +75,11 @@ public class JavaSourceParser {
String result = signature.substring(pos + 1).trim();
// lets use FQN types
if (!"void".equals(result)) {
- result = clazz.resolveType(result);
+ result = resolveType(rootClazz, clazz, result);
}
- if (result == null || result.isEmpty()) {
+ if (result.isEmpty()) {
result = "void";
}
- result = resolveType(clazz, result);
List<JavaDocTag> params = ms.getJavaDoc().getTags("@param");
@@ -90,7 +90,7 @@ public class JavaSourceParser {
for (int i = 0; i < list.size(); i++) {
ParameterSource ps = list.get(i);
String name = ps.getName();
- String type = resolveType(clazz, ms, ps.getType());
+ String type = resolveType(rootClazz, clazz, ms, ps.getType());
if (type.startsWith("java.lang.")) {
type = type.substring(10);
}
@@ -123,7 +123,7 @@ public class JavaSourceParser {
}
}
- private static String resolveType(JavaClassSource clazz, MethodSource ms, Type type) {
+ private static String resolveType(JavaClassSource rootClazz, JavaClassSource clazz, MethodSource ms, Type type) {
String name = type.getName();
// if the type is from a type variable (eg T extends Foo generic style)
// then the type should be returned as-is
@@ -135,7 +135,7 @@ public class JavaSourceParser {
return type.getName();
}
- String answer = resolveType(clazz, name);
+ String answer = resolveType(rootClazz, clazz, name);
List<Type> types = type.getTypeArguments();
if (!types.isEmpty()) {
if (type.isArray()) {
@@ -143,7 +143,7 @@ public class JavaSourceParser {
} else {
StringJoiner sj = new StringJoiner(", ");
for (Type arg : types) {
- sj.add(resolveType(clazz, ms, arg));
+ sj.add(resolveType(rootClazz, clazz, ms, arg));
}
answer = answer + "<" + sj.toString() + ">";
}
@@ -151,26 +151,28 @@ public class JavaSourceParser {
return answer;
}
- private static String resolveType(JavaClassSource clazz, String type) {
+ private static String resolveType(JavaClassSource rootClazz, JavaClassSource clazz, String type) {
if ("void".equals(type)) {
return "void";
}
- type = clazz.resolveType(type);
- int pos = type.lastIndexOf('.');
- if (Character.isUpperCase(type.charAt(0))) {
- // okay so its maybe an inner class and has import so we need to resolve this more complex
- if (pos != -1) {
- String base = type.substring(0, pos);
- String remainder = type.substring(pos + 1);
- base = clazz.resolveType(base);
- type = base + "$" + remainder;
- } else {
- type = type.replace('.', '$');
- // okay no package name so its a local inner class
- type = clazz.getPackage() + "." + type;
- }
+
+ // workaround bug in Roaster about resolving type that was an inner class
+ // is this an inner class
+ boolean inner = rootClazz.getNestedType(type) != null;
+ if (inner) {
+ return rootClazz.getQualifiedName() + "$" + type;
+ }
+ inner = clazz.getNestedType(type) != null;
+ if (inner) {
+ return clazz.getQualifiedName() + "$" + type;
+ }
+
+ // okay attempt to resolve the type
+ String resolvedType = clazz.resolveType(type);
+ if (resolvedType.equals(type)) {
+ resolvedType = rootClazz.resolveType(type);
}
- return type;
+ return resolvedType;
}
private static String getJavadocValue(List<JavaDocTag> params, String name) {
[camel] 06/07: CAMEL-15478: Delete src/generated and regen and then
we can remove some old cruft as leftovers
Posted by da...@apache.org.
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
commit 483c0ad9d84dd2ceec4ac12bd133076e33431dab
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 7 16:46:02 2020 +0200
CAMEL-15478: Delete src/generated and regen and then we can remove some old cruft as leftovers
---
.../services/org/apache/camel/spi/TransactedPolicy | 2 --
.../stored/template/generated/ParseException.java | 29 ++++++----------------
.../sql/stored/template/generated/SSPTParser.java | 25 +++----------------
.../template/generated/SSPTParserConstants.java | 16 ------------
.../template/generated/SSPTParserTokenManager.java | 18 ++------------
.../template/generated/SimpleCharStream.java | 16 ------------
.../sql/stored/template/generated/Token.java | 17 -------------
.../stored/template/generated/TokenMgrError.java | 17 -------------
.../services/org/apache/camel/reactive-executor | 2 --
.../dsl/ElytronComponentBuilderFactory.java | 0
.../org/apache/camel/util/concurrent/jaxb.index | 2 --
11 files changed, 12 insertions(+), 132 deletions(-)
diff --git a/components/camel-spring/src/generated/resources/META-INF/services/org/apache/camel/spi/TransactedPolicy b/components/camel-spring/src/generated/resources/META-INF/services/org/apache/camel/spi/TransactedPolicy
deleted file mode 100644
index 071d402..0000000
--- a/components/camel-spring/src/generated/resources/META-INF/services/org/apache/camel/spi/TransactedPolicy
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.spring.spi.SpringTransactionPolicy
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
index 109e68a..105de81 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
/* JavaCCOptions:KEEP_LINE_COL=null */
package org.apache.camel.component.sql.stored.template.generated;
@@ -54,6 +38,7 @@ public class ParseException extends Exception {
*/
public ParseException() {
+ super();
}
/** Constructor with message. */
@@ -91,14 +76,14 @@ public class ParseException extends Exception {
String eol = System.getProperty("line.separator", "\n");
StringBuffer expected = new StringBuffer();
int maxSize = 0;
- for (int[] expectedTokenSequence : expectedTokenSequences) {
- if (maxSize < expectedTokenSequence.length) {
- maxSize = expectedTokenSequence.length;
+ for (int i = 0; i < expectedTokenSequences.length; i++) {
+ if (maxSize < expectedTokenSequences[i].length) {
+ maxSize = expectedTokenSequences[i].length;
}
- for (int j = 0; j < expectedTokenSequence.length; j++) {
- expected.append(tokenImage[expectedTokenSequence[j]]).append(' ');
+ for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+ expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
}
- if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) {
+ if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
expected.append("...");
}
expected.append(eol).append(" ");
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
index f12d413..319202c 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
@@ -1,29 +1,9 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
/* Generated By:JavaCC: Do not edit this line. SSPTParser.java */
package org.apache.camel.component.sql.stored.template.generated;
import java.io.Reader;
-import org.apache.camel.component.sql.stored.template.ast.InOutParameter;
-import org.apache.camel.component.sql.stored.template.ast.InParameter;
-import org.apache.camel.component.sql.stored.template.ast.OutParameter;
-import org.apache.camel.component.sql.stored.template.ast.ParseHelper;
-import org.apache.camel.component.sql.stored.template.ast.Template;
+import org.apache.camel.component.sql.stored.template.ast.*;
import org.apache.camel.spi.ClassResolver;
public class SSPTParser implements SSPTParserConstants {
@@ -251,6 +231,7 @@ public class SSPTParser implements SSPTParserConstants {
final public Token ParameterSqlType() throws ParseException {
Token t;
+ Token scaleToken;
switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
case NUMBER:
t = jj_consume_token(NUMBER);
@@ -451,7 +432,7 @@ public class SSPTParser implements SSPTParserConstants {
return (jj_ntk = jj_nt.kind);
}
- private java.util.List<int[]> jj_expentries = new java.util.ArrayList<>();
+ private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
private int[] jj_expentry;
private int jj_kind = -1;
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
index e74215d..b3363d9 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
/* Generated By:JavaCC: Do not edit this line. SSPTParserConstants.java */
package org.apache.camel.component.sql.stored.template.generated;
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index d46bd02..db7f99c 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -1,22 +1,8 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
/* Generated By:JavaCC: Do not edit this line. SSPTParserTokenManager.java */
package org.apache.camel.component.sql.stored.template.generated;
+import org.apache.camel.component.sql.stored.template.ast.*;
+
/** Token Manager. */
public class SSPTParserTokenManager implements SSPTParserConstants {
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SimpleCharStream.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SimpleCharStream.java
index 06e1f26..dbbf3a9 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SimpleCharStream.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SimpleCharStream.java
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
package org.apache.camel.component.sql.stored.template.generated;
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/Token.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/Token.java
index d53bc6b..c76e97e 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/Token.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/Token.java
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
package org.apache.camel.component.sql.stored.template.generated;
@@ -102,7 +86,6 @@ public class Token implements java.io.Serializable {
/**
* Returns the image.
*/
- @Override
public String toString() {
return image;
}
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/TokenMgrError.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/TokenMgrError.java
index 4bd6b87..f75a9f6 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/TokenMgrError.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/TokenMgrError.java
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
/* JavaCCOptions: */
package org.apache.camel.component.sql.stored.template.generated;
@@ -127,7 +111,6 @@ public class TokenMgrError extends Error {
*
* from this method for such cases in the release version of your parser.
*/
- @Override
public String getMessage() {
return super.getMessage();
}
diff --git a/components/camel-threadpoolfactory-vertx/src/generated/resources/META-INF/services/org/apache/camel/reactive-executor b/components/camel-threadpoolfactory-vertx/src/generated/resources/META-INF/services/org/apache/camel/reactive-executor
deleted file mode 100644
index 1e1e324..0000000
--- a/components/camel-threadpoolfactory-vertx/src/generated/resources/META-INF/services/org/apache/camel/reactive-executor
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.reactive.vertx.VertXReactiveExecutor
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElytronComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElytronComponentBuilderFactory.java
deleted file mode 100644
index e69de29..0000000
diff --git a/core/camel-util/src/generated/resources/org/apache/camel/util/concurrent/jaxb.index b/core/camel-util/src/generated/resources/org/apache/camel/util/concurrent/jaxb.index
deleted file mode 100644
index 15492a0..0000000
--- a/core/camel-util/src/generated/resources/org/apache/camel/util/concurrent/jaxb.index
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-ThreadPoolRejectedPolicy
[camel] 01/07: CAMEL-15478: javasource parser can parse inner
classes
Posted by da...@apache.org.
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
commit 975a3da63ed74815a42599c6769814a28d27b143
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 7 10:13:26 2020 +0200
CAMEL-15478: javasource parser can parse inner classes
---
.../maven/JavaSourceApiMethodGeneratorMojo.java | 4 ++-
.../org/apache/camel/maven/JavaSourceParser.java | 15 ++++++++-
.../apache/camel/component/test/NestedProxy.java | 36 ++++++++++++++++++++++
.../apache/camel/maven/JavaSourceParserTest.java | 23 +++++++++++---
4 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceApiMethodGeneratorMojo.java
index c976e55..3950b88 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceApiMethodGeneratorMojo.java
@@ -80,8 +80,10 @@ public class JavaSourceApiMethodGeneratorMojo extends AbstractApiMethodGenerator
log.debug("Processing " + aClass.getName());
String sourcePath = aClass.getName();
+ String nestedClass = null;
int pos = sourcePath.indexOf('$');
if (pos != -1) {
+ nestedClass = sourcePath.substring(pos + 1);
sourcePath = sourcePath.substring(0, pos);
}
sourcePath = sourcePath.replace('.', '/') + ".java";
@@ -95,7 +97,7 @@ public class JavaSourceApiMethodGeneratorMojo extends AbstractApiMethodGenerator
}
JavaSourceParser parser = new JavaSourceParser();
- parser.parse(inputStream);
+ parser.parse(inputStream, nestedClass);
// look for parse errors
final String parseError = parser.getErrorMessage();
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
index ad27999..57eee7f 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
@@ -28,6 +28,7 @@ import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.JavaDocTag;
import org.jboss.forge.roaster.model.Type;
import org.jboss.forge.roaster.model.source.JavaClassSource;
+import org.jboss.forge.roaster.model.source.JavaSource;
import org.jboss.forge.roaster.model.source.MethodSource;
import org.jboss.forge.roaster.model.source.ParameterSource;
import org.jboss.forge.roaster.model.source.TypeVariableSource;
@@ -44,9 +45,21 @@ public class JavaSourceParser {
private Map<String, Map<String, String>> parameters = new LinkedHashMap<>();
private String errorMessage;
- public synchronized void parse(InputStream in) throws Exception {
+ public synchronized void parse(InputStream in, String innerClass) throws Exception {
JavaClassSource clazz = (JavaClassSource) Roaster.parse(in);
+ if (innerClass != null) {
+ // we want the inner class from the parent class
+ JavaSource nested = clazz.getNestedType(innerClass);
+ if (nested instanceof JavaClassSource) {
+ clazz = (JavaClassSource) nested;
+ }
+ if (nested == null) {
+ errorMessage = "Cannot find inner class " + innerClass + " in class: " + clazz.getQualifiedName();
+ return;
+ }
+ }
+
for (MethodSource ms : clazz.getMethods()) {
// should not be constructor and must be public
if (!ms.isPublic() || ms.isConstructor()) {
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/NestedProxy.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/NestedProxy.java
new file mode 100644
index 0000000..cceddab
--- /dev/null
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/NestedProxy.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.test;
+
+public class NestedProxy {
+
+ public Order order() {
+ return new Order();
+ }
+
+ public static class Order {
+
+ /**
+ * Gets the order by the given id
+ *
+ * @param id the order id
+ */
+ public String getOrderById(int id) {
+ return "123";
+ }
+ }
+}
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavaSourceParserTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavaSourceParserTest.java
index 195c6cd..2bad48b 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavaSourceParserTest.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavaSourceParserTest.java
@@ -31,7 +31,7 @@ public class JavaSourceParserTest {
public void testGetMethodsAddress() throws Exception {
final JavaSourceParser parser = new JavaSourceParser();
- parser.parse(JavaSourceParserTest.class.getResourceAsStream("/AddressGateway.java"));
+ parser.parse(JavaSourceParserTest.class.getResourceAsStream("/AddressGateway.java"), null);
assertEquals(4, parser.getMethods().size());
assertEquals(
@@ -49,7 +49,7 @@ public class JavaSourceParserTest {
public void testGetMethodsCustomer() throws Exception {
final JavaSourceParser parser = new JavaSourceParser();
- parser.parse(JavaSourceParserTest.class.getResourceAsStream("/CustomerGateway.java"));
+ parser.parse(JavaSourceParserTest.class.getResourceAsStream("/CustomerGateway.java"), null);
assertEquals(7, parser.getMethods().size());
assertEquals(
@@ -66,7 +66,7 @@ public class JavaSourceParserTest {
public void testGetMethodsDispute() throws Exception {
final JavaSourceParser parser = new JavaSourceParser();
- parser.parse(JavaSourceParserTest.class.getResourceAsStream("/DisputeGateway.java"));
+ parser.parse(JavaSourceParserTest.class.getResourceAsStream("/DisputeGateway.java"), null);
assertEquals(9, parser.getMethods().size());
assertEquals(
@@ -83,7 +83,7 @@ public class JavaSourceParserTest {
public void testWildcard() throws Exception {
final JavaSourceParser parser = new JavaSourceParser();
- parser.parse(new FileInputStream("src/test/java/org/apache/camel/component/test/TestProxy.java"));
+ parser.parse(new FileInputStream("src/test/java/org/apache/camel/component/test/TestProxy.java"), null);
assertEquals(11, parser.getMethods().size());
// varargs is transformed to an array type as that is what works
@@ -93,4 +93,19 @@ public class JavaSourceParserTest {
parser.reset();
}
+ @Test
+ public void testNested() throws Exception {
+ final JavaSourceParser parser = new JavaSourceParser();
+
+ parser.parse(new FileInputStream("src/test/java/org/apache/camel/component/test/NestedProxy.java"), "Order");
+ assertEquals(1, parser.getMethods().size());
+
+ assertEquals(
+ "public java.lang.String getOrderById(int id)",
+ parser.getMethods().get(0));
+ assertEquals(1, parser.getParameters().get("getOrderById").size());
+ assertEquals("The order id", parser.getParameters().get("getOrderById").get("id"));
+ parser.reset();
+ }
+
}
[camel] 07/07: CAMEL-15478: Regen
Posted by da...@apache.org.
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
commit 32ee7fd8213181e749eac0cf747a38db3da7ba12
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 7 16:46:17 2020 +0200
CAMEL-15478: Regen
---
.../org/apache/camel/catalog/components/as2.json | 2 +-
.../org/apache/camel/catalog/components/box.json | 12 +++----
.../org/apache/camel/catalog/components/fhir.json | 10 +++---
.../catalog/components/google-calendar-stream.json | 14 ++++----
.../camel/catalog/components/google-calendar.json | 14 ++++----
.../apache/camel/catalog/docs/as2-component.adoc | 16 ++++-----
.../camel/catalog/docs/batch-config-eip.adoc | 2 +-
.../apache/camel/catalog/docs/box-component.adoc | 42 +++++++++++-----------
.../apache/camel/catalog/docs/fhir-component.adoc | 24 ++++++-------
.../catalog/docs/google-calendar-component.adoc | 38 ++++++++++----------
.../docs/google-calendar-stream-component.adoc | 38 ++++++++++----------
.../apache/camel/catalog/docs/resequence-eip.adoc | 2 +-
.../camel/catalog/docs/stream-config-eip.adoc | 4 +--
.../modules/ROOT/pages/as2-component.adoc | 16 ++++-----
.../modules/ROOT/pages/box-component.adoc | 42 +++++++++++-----------
.../modules/ROOT/pages/fhir-component.adoc | 24 ++++++-------
.../ROOT/pages/google-calendar-component.adoc | 38 ++++++++++----------
.../pages/google-calendar-stream-component.adoc | 38 ++++++++++----------
18 files changed, 188 insertions(+), 188 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
index 14e66ee..3c07a86 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
@@ -82,7 +82,7 @@
"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." }
},
"apiProperties": {
- "client": { "as2From": { "kind": "parameter", "displayName": "As2 From", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "AS2 name of sender" }, "as2MessageStructure": { "kind": "parameter", "displayName": "As2 Message Structure", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.as2.api.AS2MessageStructure", "enum": [ "P [...]
+ "client": { "as2From": { "kind": "parameter", "displayName": "As2 From", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "AS2 name of sender" }, "as2MessageStructure": { "kind": "parameter", "displayName": "As2 Message Structure", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.as2.api.AS2MessageStructure", "enum": [ "P [...]
"server": { "requestUriPattern": { "kind": "parameter", "displayName": "Request Uri Pattern", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" } }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/box.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/box.json
index e899d33..492364f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/box.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/box.json
@@ -88,13 +88,13 @@
"apiProperties": {
"collaborations": { "collaborationId": { "kind": "parameter", "displayName": "Collaboration Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of comment to change" }, "collaborator": { "kind": "parameter", "displayName": "Collaborator", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxCollaborator", "deprecated": false, " [...]
"comments": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of comment to change" }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id o [...]
- "event-logs": { "after": { "kind": "parameter", "displayName": "After", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "description": "The lower bound on the timestamp of the events returned" }, "before": { "kind": "parameter", "displayName": "Before", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "descrip [...]
+ "event-logs": { "after": { "kind": "parameter", "displayName": "After", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "description": "The lower bound on the timestamp of the events returned" }, "before": { "kind": "parameter", "displayName": "Before", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "descrip [...]
"events": { "startingPosition": { "kind": "parameter", "displayName": "Starting Position", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "The starting position of the event stream" } },
- "files": { "access": { "kind": "parameter", "displayName": "Access", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxSharedLink.Access", "enum": [ "DEFAULT", "OPEN", "COMPANY", "COLLABORATORS" ], "deprecated": false, "secret": false, "description": "The access level of the shared link" }, "check": { "kind": "parameter", "displayName": "Check", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang. [...]
- "folders": { "access": { "kind": "parameter", "displayName": "Access", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxSharedLink.Access", "enum": [ "DEFAULT", "OPEN", "COMPANY", "COLLABORATORS" ], "deprecated": false, "secret": false, "description": "The access level of the shared link" }, "destinationFolderId": { "kind": "parameter", "displayName": "Destination Folder Id", "group": "common", "label": "", "required": false, "type": "s [...]
- "groups": { "description": { "kind": "parameter", "displayName": "Description", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The description of the new group" }, "externalSyncIdentifier": { "kind": "parameter", "displayName": "External Sync Identifier", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "s [...]
+ "files": { "access": { "kind": "parameter", "displayName": "Access", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxSharedLink.Access", "enum": [ "DEFAULT", "OPEN", "COMPANY", "COLLABORATORS" ], "deprecated": false, "secret": false, "description": "The access level of the shared link" }, "check": { "kind": "parameter", "displayName": "Check", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang. [...]
+ "folders": { "access": { "kind": "parameter", "displayName": "Access", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxSharedLink.Access", "enum": [ "DEFAULT", "OPEN", "COMPANY", "COLLABORATORS" ], "deprecated": false, "secret": false, "description": "The access level of the shared link" }, "destinationFolderId": { "kind": "parameter", "displayName": "Destination Folder Id", "group": "common", "label": "", "required": false, "type": "s [...]
+ "groups": { "description": { "kind": "parameter", "displayName": "Description", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The description of the new group" }, "externalSyncIdentifier": { "kind": "parameter", "displayName": "External Sync Identifier", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "s [...]
"search": { "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of folder searched" }, "query": { "kind": "parameter", "displayName": "Query", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The search query" } },
- "tasks": { "action": { "kind": "parameter", "displayName": "Action", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxTask.Action", "enum": [ "REVIEW", "COMPLETE" ], "deprecated": false, "secret": false, "description": "The action the task assignee will be prompted to do" }, "assignTo": { "kind": "parameter", "displayName": "Assign To", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxUser [...]
- "users": { "email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The email address to add as an alias" }, "emailAliasId": { "kind": "parameter", "displayName": "Email Alias Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": [...]
+ "tasks": { "action": { "kind": "parameter", "displayName": "Action", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxTask.Action", "enum": [ "REVIEW", "COMPLETE" ], "deprecated": false, "secret": false, "description": "The action the task assignee will be prompted to do" }, "assignTo": { "kind": "parameter", "displayName": "Assign To", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxUser [...]
+ "users": { "email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The email address to add as an alias" }, "emailAliasId": { "kind": "parameter", "displayName": "Email Alias Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": [...]
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fhir.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fhir.json
index 8b6240e..333e4de 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fhir.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fhir.json
@@ -103,16 +103,16 @@
},
"apiProperties": {
"capabilities": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "type": { "kind": "parameter", "displayName": "Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.Class<org.hl7.fhir. [...]
- "create": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "preferReturn": { "kind": "parameter", "displayName": "Prefer Return", "group": "common", "label": "", "required": false, "type": "object", "javaType": "ca.uhn.fhir.res [...]
- "delete": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdT [...]
+ "create": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL" }, "preferReturn": { "kind": "parameter", "displayName": "Prefer Return", "group": "common", [...]
+ "delete": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "require [...]
"history": { "count": { "kind": "parameter", "displayName": "Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "" }, "cutoff": { "kind": "parameter", "displayName": "Cutoff", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "description": "" }, "extraParameters": { "kind": "parameter", [...]
"load-page": { "bundle": { "kind": "parameter", "displayName": "Bundle", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IBaseBundle", "deprecated": false, "secret": false, "description": "" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, ja [...]
"meta": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdType", [...]
"operation": { "asynchronous": { "kind": "parameter", "displayName": "Asynchronous", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Objec [...]
- "patch": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdTy [...]
+ "patch": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required [...]
"read": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "iUrl": { "kind": "parameter", "displayName": "IUrl", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdTy [...]
- "search": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See" }, "url": { "kind": "parameter", "displayName": "Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
- "transaction": { "bundle": { "kind": "parameter", "displayName": "Bundle", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IBaseBundle", "deprecated": false, "secret": false, "description": "Bundle to use in the transaction" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.comp [...]
+ "search": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL" }, "url": { "kind": "parameter", "displayName": "Url", "group": "common", "label": "", "requi [...]
+ "transaction": { "bundle": { "kind": "parameter", "displayName": "Bundle", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IBaseBundle", "deprecated": false, "secret": false, "description": "Bundle to use in the transaction" }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.comp [...]
"update": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IIdType [...]
"validate": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "" }, "resource": { "kind": "parameter", "displayName": "Resource", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.mod [...]
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar-stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar-stream.json
index 72df006..83d97fb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar-stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar-stream.json
@@ -75,13 +75,13 @@
"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." }
},
"apiProperties": {
- "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.AclRule", "deprecated": false, "secret": false, "description": "" } [...]
- "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Calendar", "deprecated": false, "secret": false, "description [...]
- "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" } },
+ "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": [...]
+ "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "gr [...]
+ "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel" } },
"colors": { },
- "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Event", "deprecated": false, "secret": false, "description": "" [...]
- "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "" } },
- "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.CalendarListEntry", "deprecated": false, "secret": false, "descrip [...]
- "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "descr [...]
+ "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group [...]
+ "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.FreeBusyRequest" } },
+ "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": [...]
+ "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.Str [...]
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar.json
index 8e00140..2ee8bed 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar.json
@@ -75,13 +75,13 @@
"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.GoogleCalendarConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one [...]
},
"apiProperties": {
- "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.AclRule", "deprecated": false, "secret": false, "description": "" }, "c [...]
- "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Calendar", "deprecated": false, "secret": false, "description": "" } },
- "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" } },
+ "acl": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": "c [...]
+ "calendars": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "grou [...]
+ "channels": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel" } },
"colors": { },
- "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Event", "deprecated": false, "secret": false, "description": "" }, " [...]
- "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "" } },
- "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "" }, "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.CalendarListEntry", "deprecated": false, "secret": false, "description [...]
- "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "descripti [...]
+ "events": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": [...]
+ "freebusy": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.FreeBusyRequest" } },
+ "list": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword." }, "content": { "kind": "parameter", "displayName": "Content", "group": " [...]
+ "settings": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel" }, "setting": { "kind": "parameter", "displayName": "Setting", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String" [...]
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/as2-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/as2-component.adoc
index 272a557..b634339 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/as2-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/as2-component.adoc
@@ -162,20 +162,20 @@ The following lists each API name and method and its additional parameters.
|===
| Name | Description | Type
| *as2From* | AS2 name of sender | String
-| *as2MessageStructure* | The structure of AS2 to send; see | AS2MessageStructure
+| *as2MessageStructure* | The structure of AS2 to send; see AS2MessageStructure | AS2MessageStructure
| *as2To* | AS2 name of recipient | String
-| *compressionAlgorithm* | The algorithm used to compress the message or | AS2CompressionAlgorithm
-| *dispositionNotificationTo* | An RFC2822 address to request a receipt or | String
+| *compressionAlgorithm* | The algorithm used to compress the message or null if sending EDI message uncompressed | AS2CompressionAlgorithm
+| *dispositionNotificationTo* | An RFC2822 address to request a receipt or null if no receipt requested | String
| *ediMessage* | EDI message to transport | String
| *ediMessageContentType* | The content typw of EDI message | ContentType
| *ediMessageTransferEncoding* | The transfer encoding used to transport EDI message | String
-| *encryptingAlgorithm* | The algorithm used to encrypt the message or | AS2EncryptionAlgorithm
-| *encryptingCertificateChain* | The chain of certificates used to encrypt the message or | Certificate[]
+| *encryptingAlgorithm* | The algorithm used to encrypt the message or null if sending EDI message unencrypted | AS2EncryptionAlgorithm
+| *encryptingCertificateChain* | The chain of certificates used to encrypt the message or null if sending EDI message unencrypted | Certificate[]
| *from* | RFC2822 address of sender | String
| *requestUri* | Resource location to deliver message | String
-| *signedReceiptMicAlgorithms* | The senders list of signing algorithms for signing receipt, in preferred order, or | String[]
-| *signingAlgorithm* | The algorithm used to sign the message or | AS2SignatureAlgorithm
-| *signingCertificateChain* | The chain of certificates used to sign the message or | Certificate[]
+| *signedReceiptMicAlgorithms* | The senders list of signing algorithms for signing receipt, in preferred order, or null if requesting an unsigned receipt. | String[]
+| *signingAlgorithm* | The algorithm used to sign the message or null if sending EDI message unsigned | AS2SignatureAlgorithm
+| *signingCertificateChain* | The chain of certificates used to sign the message or null if sending EDI message unsigned | Certificate[]
| *signingPrivateKey* | The private key used to sign EDI message | PrivateKey
| *subject* | Message subject | String
|===
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/batch-config-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/batch-config-eip.adoc
index b348cc6..b1e6bc9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/batch-config-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/batch-config-eip.adoc
@@ -14,7 +14,7 @@ The Batch-config EIP supports 5 options which are listed below:
|===
| Name | Description | Default | Type
| *batchSize* | Sets the size of the batch to be re-ordered. The default size is 100. | 100 | Integer
-| *batchTimeout* | Sets the timeout for collecting elements to be re-ordered. The default timeout is 1000 msec. | 1000 | Long
+| *batchTimeout* | Sets the timeout for collecting elements to be re-ordered. The default timeout is 1000 msec. | 1s | String
| *allowDuplicates* | Whether to allow duplicates. | false | Boolean
| *reverse* | Whether to reverse the ordering. | false | Boolean
| *ignoreInvalidExchanges* | Whether to ignore invalid exchanges | false | Boolean
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/box-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/box-component.adoc
index d2ed8ab..83a771c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/box-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/box-component.adoc
@@ -198,7 +198,7 @@ The following lists each API name and method and its additional parameters.
| Name | Description | Type
| *after* | The lower bound on the timestamp of the events returned | Date
| *before* | The upper bound on the timestamp of the events returned | Date
-| *position* | The starting position of the event stream. May be | String
+| *position* | The starting position of the event stream. May be null in which case all events within bounds returned. | String
| *types* | An optional list of event types to filter by | Type[]
|===
@@ -222,14 +222,14 @@ The following lists each API name and method and its additional parameters.
| *content* | A stream containing contents of the file to upload | InputStream
| *created* | The content created date that will be given to the uploaded file | Date
| *destinationFolderId* | The id of the destination folder | String
-| *fields* | The information fields to retrieve; if | String[]
+| *fields* | The information fields to retrieve; if null all information fields are retrieved. | String[]
| *fileContent* | A stream containing contents of the file to upload | InputStream
| *fileId* | The id of file to copy | String
| *fileName* | The name to give the uploaded file | String
| *fileSize* | The size of the file's content used for monitoring the upload's progress | Long
| *fileType* | Either PNG of JPG | ThumbnailFileType
| *info* | The updated information | Info
-| *listener* | A listener for monitoring the download's progress; if | ProgressListener
+| *listener* | A listener for monitoring the download's progress; if null the download's progress will not be monitored. | ProgressListener
| *maxHeight* | Maximum height | Integer
| *maxWidth* | Maximum width | Integer
| *metadata* | The new metadata values | Metadata
@@ -237,16 +237,16 @@ The following lists each API name and method and its additional parameters.
| *minWidth* | Minimum width | Integer
| *modified* | The content modified date that will be given to the uploaded file | Date
| *newFileName* | The new name of file | String
-| *newName* | Is | String
+| *newName* | The new name for copied file; if newName is null, the copied file has same name as the original. | String
| *output* | The stream to which the file contents will be written | OutputStream
| *parentFolderId* | The id of parent folder | String
-| *permissions* | Is | Permissions
-| *rangeEnd* | The byte offset in file at which to stop the download; if | Long
-| *rangeStart* | The byte offset in file at which to start the download; if | Long
-| *size* | The size of the file's content used for monitoring the upload's progress.Skip navigation links | Long
-| *typeName* | The metadata template type name; if | String
-| *unshareDate* | The date and time at which time the created shared link will expire; if | Date
-| *version* | The version of file to delete; initial version of file has value of | Integer
+| *permissions* | The permissions of the created link; if permissions is null then the created shared link is create with default permissions. | Permissions
+| *rangeEnd* | The byte offset in file at which to stop the download; if null the entire contents of file will be downloaded. | Long
+| *rangeStart* | The byte offset in file at which to start the download; if null the entire contents of file will be downloaded. | Long
+| *size* | The size of the file's content used for monitoring the upload's progress | Long
+| *typeName* | The metadata template type name; if null the global properties template type is used. | String
+| *unshareDate* | The date and time at which time the created shared link will expire; if unsharedDate is null then a non-expiring link is created. | Date
+| *version* | The version of file to delete; initial version of file has value of 0, second version of file is 1 and so on. | Integer
|===
@@ -257,18 +257,18 @@ The following lists each API name and method and its additional parameters.
| Name | Description | Type
| *access* | The access level of the shared link | Access
| *destinationFolderId* | The id of the destination folder | String
-| *fields* | The information fields to retrieve; if | String[]
+| *fields* | The information fields to retrieve; if null all information fields are retrieved. | String[]
| *folderId* | The id of folder to copy | String
| *folderName* | The name of created folder | String
| *info* | The updated information | Info
-| *limit* | The maximum number of children to retrieve after the offset; if | Long
+| *limit* | The maximum number of children to retrieve after the offset; if null all child items are retrieved. | Long
| *newFolderName* | The new name of folder | String
-| *newName* | Is | String
-| *offset* | The index of first child item to retrieve; if | Long
+| *newName* | The new name for copied folder; if newName is null, the copied folder has same name as the original. | String
+| *offset* | The index of first child item to retrieve; if null all child items are retrieved. | Long
| *parentFolderId* | The id of parent folder | String
| *path* | Sequence of Box folder names from parent folder to returned folder | String[]
-| *permissions* | Is | Permissions
-| *unshareDate* | The date and time at which time the created shared link will expire; if | Date
+| *permissions* | The permissions of the created link; if permissions is null then the created shared link is create with default permissions. | Permissions
+| *unshareDate* | The date and time at which time the created shared link will expire; if unsharedDate is null then a non-expiring link is created. | Date
|===
@@ -287,7 +287,7 @@ The following lists each API name and method and its additional parameters.
| *memberViewabilityLevel* | The member_viewability_level of the new group | String
| *name* | The name of the new group | String
| *provenance* | The provenance of the new group | String
-| *role* | The role of the user in this group. Can be | Role
+| *role* | The role of the user in this group. Can be null to assign the default role. | Role
| *userId* | The id of user to be added to group | String
|===
@@ -313,7 +313,7 @@ The following lists each API name and method and its additional parameters.
| *fileId* | The id of file to add task to | String
| *info* | The updated information | Info
| *message* | An optional message to include with the task | String
-| *taskAssignmentId* | The id of task assignment to delete.Skip navigation links | String
+| *taskAssignmentId* | The id of task assignment to delete | String
| *taskId* | The id of task to add assignment for | String
|===
@@ -326,14 +326,14 @@ The following lists each API name and method and its additional parameters.
| *email* | The email address to add as an alias | String
| *emailAliasId* | The id of the email alias to delete | String
| *fields* | The fields to retrieve. Leave this out for the standard fields. | String[]
-| *filterTerm* | The filter term to lookup users by (login for external, login or name for managed); if | String
+| *filterTerm* | The filter term to lookup users by (login for external, login or name for managed); if null all managed users are returned. | String
| *force* | Whether or not this user should be deleted even if they still own files | Boolean
| *info* | The updated information | Info
| *login* | The email address the user will use to login | String
| *name* | The name of the user | String
| *notifyUser* | Whether or not to send an email notification to the user that their account has been deleted | Boolean
| *params* | Additional user information | CreateUserParams
-| *sourceUserId* | The user id of the user whose files will be the source for this operation.Skip navigation links | String
+| *sourceUserId* | The user id of the user whose files will be the source for this operation | String
| *userId* | The id of user | String
|===
// endpoint options: END
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/fhir-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/fhir-component.adoc
index ad0c8bf..ef9e1df 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/fhir-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/fhir-component.adoc
@@ -197,11 +197,11 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *extraParameters* | See | Map
-| *preferReturn* | Add a | PreferReturnEnum
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
+| *preferReturn* | Add a Prefer header to the request, which requests that the server include or suppress the resource body as a part of the result. If a resource is returned by the server it will be parsed an accessible to the client via MethodOutcome#getResource() , may be null | PreferReturnEnum
| *resource* | The resource to create | IBaseResource
| *resourceAsString* | The resource to create | String
-| *url* | The search URL to use. The format of this URL should be of the form | String
+| *url* | The search URL to use. The format of this URL should be of the form ResourceTypeParameters, for example: Patientname=Smith&identifier=13.2.4.11.4%7C847366, may be null | String
|===
@@ -210,12 +210,12 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *extraParameters* | See | Map
-| *id* | The | IIdType
-| *resource* | The | IBaseResource
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
+| *id* | The IIdType referencing the resource | IIdType
+| *resource* | The IBaseResource to delete | IBaseResource
| *stringId* | It's id | String
| *type* | The resource type e.g Patient | String
-| *url* | The search URL to use. The format of this URL should be of the form | String
+| *url* | The search URL to use. The format of this URL should be of the form ResourceTypeParameters, for example: Patientname=Smith&identifier=13.2.4.11.4%7C847366 | String
|===
@@ -284,12 +284,12 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *extraParameters* | See | Map
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
| *id* | The resource ID to patch | IIdType
| *patchBody* | The body of the patch document serialized in either XML or JSON which conforms to \http://jsonpatch.com/ or \http://tools.ietf.org/html/rfc5261 | String
-| *preferReturn* | Add a | PreferReturnEnum
+| *preferReturn* | Add a Prefer header to the request, which requests that the server include or suppress the resource body as a part of the result. If a resource is returned by the server it will be parsed an accessible to the client via MethodOutcome#getResource() | PreferReturnEnum
| *stringId* | The resource ID to patch | String
-| *url* | The search URL to use. The format of this URL should be of the form | String
+| *url* | The search URL to use. The format of this URL should be of the form ResourceTypeParameters, for example: Patientname=Smith&identifier=13.2.4.11.4%7C847366 | String
|===
@@ -319,7 +319,7 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *extraParameters* | See | Map
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
| *url* | The URL to search for. Note that this URL may be complete (e.g. \http://example.com/base/Patientname=foo) in which case the client's base URL will be ignored. Or it can be relative (e.g. Patientname=foo) in which case the client's base URL will be used. | String
|===
@@ -330,7 +330,7 @@ The following lists each API name and method and its additional parameters.
|===
| Name | Description | Type
| *bundle* | Bundle to use in the transaction | IBaseBundle
-| *extraParameters* | See | Map
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
| *resources* | Resources to use in the transaction | List
| *stringBundle* | Bundle to use in the transaction | String
|===
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-component.adoc
index f7a5f18..f74a8e9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-component.adoc
@@ -158,10 +158,10 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | AclRule
-| *contentChannel* | | Channel
-| *ruleId* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.AclRule | AclRule
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *ruleId* | ACL rule identifier | String
|===
@@ -170,8 +170,8 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Calendar
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Calendar | Calendar
|===
@@ -180,7 +180,7 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -194,12 +194,12 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Event
-| *contentChannel* | | Channel
-| *destination* | | String
-| *eventId* | | String
-| *text* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Event | Event
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *destination* | Calendar identifier of the target calendar where the event is to be moved to | String
+| *eventId* | Event identifier | String
+| *text* | The text describing the event to be created | String
|===
@@ -208,7 +208,7 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *content* | | FreeBusyRequest
+| *content* | The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
|===
@@ -217,9 +217,9 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | CalendarListEntry
-| *contentChannel* | | Channel
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -228,8 +228,8 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
-| *setting* | | String
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *setting* | The id of the user setting | String
|===
// endpoint options: END
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 b2cefbc..9b567e2 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
@@ -161,10 +161,10 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | AclRule
-| *contentChannel* | | Channel
-| *ruleId* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.AclRule | AclRule
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *ruleId* | ACL rule identifier | String
|===
@@ -173,8 +173,8 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Calendar
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Calendar | Calendar
|===
@@ -183,7 +183,7 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -197,12 +197,12 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Event
-| *contentChannel* | | Channel
-| *destination* | | String
-| *eventId* | | String
-| *text* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Event | Event
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *destination* | Calendar identifier of the target calendar where the event is to be moved to | String
+| *eventId* | Event identifier | String
+| *text* | The text describing the event to be created | String
|===
@@ -211,7 +211,7 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *content* | | FreeBusyRequest
+| *content* | The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
|===
@@ -220,9 +220,9 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | CalendarListEntry
-| *contentChannel* | | Channel
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -231,8 +231,8 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
-| *setting* | | String
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *setting* | The id of the user setting | String
|===
// endpoint options: END
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/resequence-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/resequence-eip.adoc
index 22d28c6..c511c38 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/resequence-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/resequence-eip.adoc
@@ -109,7 +109,7 @@ It's now much easier to use the Resequencer to resequence messages from JMS queu
from("jms:queue:foo")
// sort by JMSPriority by allowing duplicates (message can have same JMSPriority)
// and use reverse ordering so 9 is first output (most important), and 0 is last
- // use batch mode and fire every 3rd second
+ // use batch mode and fire every 3th second
.resequence(header("JMSPriority")).batch().timeout(3000).allowDuplicates().reverse()
.to("mock:result");
----
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/stream-config-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/stream-config-eip.adoc
index e96b6a9..58f9407 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/stream-config-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/stream-config-eip.adoc
@@ -14,8 +14,8 @@ The Stream-config EIP supports 6 options which are listed below:
|===
| Name | Description | Default | Type
| *capacity* | Sets the capacity of the resequencer's inbound queue. | 100 | Integer
-| *timeout* | Sets minimum time to wait for missing elements (messages). | 1000 | Long
-| *deliveryAttemptInterval* | Sets the interval in milli seconds the stream resequencer will at most wait while waiting for condition of being able to deliver. | 1000 | Long
+| *timeout* | Sets minimum time to wait for missing elements (messages). | 1s | String
+| *deliveryAttemptInterval* | Sets the interval in milli seconds the stream resequencer will at most wait while waiting for condition of being able to deliver. | 1s | String
| *ignoreInvalidExchanges* | Whether to ignore invalid exchanges | false | Boolean
| *comparatorRef* | To use a custom comparator | | String
| *rejectOld* | If true, throws an exception when messages older than the last delivered message are processed | false | Boolean
diff --git a/docs/components/modules/ROOT/pages/as2-component.adoc b/docs/components/modules/ROOT/pages/as2-component.adoc
index 5dbf8c2..994b962 100644
--- a/docs/components/modules/ROOT/pages/as2-component.adoc
+++ b/docs/components/modules/ROOT/pages/as2-component.adoc
@@ -164,20 +164,20 @@ The following lists each API name and method and its additional parameters.
|===
| Name | Description | Type
| *as2From* | AS2 name of sender | String
-| *as2MessageStructure* | The structure of AS2 to send; see | AS2MessageStructure
+| *as2MessageStructure* | The structure of AS2 to send; see AS2MessageStructure | AS2MessageStructure
| *as2To* | AS2 name of recipient | String
-| *compressionAlgorithm* | The algorithm used to compress the message or | AS2CompressionAlgorithm
-| *dispositionNotificationTo* | An RFC2822 address to request a receipt or | String
+| *compressionAlgorithm* | The algorithm used to compress the message or null if sending EDI message uncompressed | AS2CompressionAlgorithm
+| *dispositionNotificationTo* | An RFC2822 address to request a receipt or null if no receipt requested | String
| *ediMessage* | EDI message to transport | String
| *ediMessageContentType* | The content typw of EDI message | ContentType
| *ediMessageTransferEncoding* | The transfer encoding used to transport EDI message | String
-| *encryptingAlgorithm* | The algorithm used to encrypt the message or | AS2EncryptionAlgorithm
-| *encryptingCertificateChain* | The chain of certificates used to encrypt the message or | Certificate[]
+| *encryptingAlgorithm* | The algorithm used to encrypt the message or null if sending EDI message unencrypted | AS2EncryptionAlgorithm
+| *encryptingCertificateChain* | The chain of certificates used to encrypt the message or null if sending EDI message unencrypted | Certificate[]
| *from* | RFC2822 address of sender | String
| *requestUri* | Resource location to deliver message | String
-| *signedReceiptMicAlgorithms* | The senders list of signing algorithms for signing receipt, in preferred order, or | String[]
-| *signingAlgorithm* | The algorithm used to sign the message or | AS2SignatureAlgorithm
-| *signingCertificateChain* | The chain of certificates used to sign the message or | Certificate[]
+| *signedReceiptMicAlgorithms* | The senders list of signing algorithms for signing receipt, in preferred order, or null if requesting an unsigned receipt. | String[]
+| *signingAlgorithm* | The algorithm used to sign the message or null if sending EDI message unsigned | AS2SignatureAlgorithm
+| *signingCertificateChain* | The chain of certificates used to sign the message or null if sending EDI message unsigned | Certificate[]
| *signingPrivateKey* | The private key used to sign EDI message | PrivateKey
| *subject* | Message subject | String
|===
diff --git a/docs/components/modules/ROOT/pages/box-component.adoc b/docs/components/modules/ROOT/pages/box-component.adoc
index ad87df8..aeef804 100644
--- a/docs/components/modules/ROOT/pages/box-component.adoc
+++ b/docs/components/modules/ROOT/pages/box-component.adoc
@@ -200,7 +200,7 @@ The following lists each API name and method and its additional parameters.
| Name | Description | Type
| *after* | The lower bound on the timestamp of the events returned | Date
| *before* | The upper bound on the timestamp of the events returned | Date
-| *position* | The starting position of the event stream. May be | String
+| *position* | The starting position of the event stream. May be null in which case all events within bounds returned. | String
| *types* | An optional list of event types to filter by | Type[]
|===
@@ -224,14 +224,14 @@ The following lists each API name and method and its additional parameters.
| *content* | A stream containing contents of the file to upload | InputStream
| *created* | The content created date that will be given to the uploaded file | Date
| *destinationFolderId* | The id of the destination folder | String
-| *fields* | The information fields to retrieve; if | String[]
+| *fields* | The information fields to retrieve; if null all information fields are retrieved. | String[]
| *fileContent* | A stream containing contents of the file to upload | InputStream
| *fileId* | The id of file to copy | String
| *fileName* | The name to give the uploaded file | String
| *fileSize* | The size of the file's content used for monitoring the upload's progress | Long
| *fileType* | Either PNG of JPG | ThumbnailFileType
| *info* | The updated information | Info
-| *listener* | A listener for monitoring the download's progress; if | ProgressListener
+| *listener* | A listener for monitoring the download's progress; if null the download's progress will not be monitored. | ProgressListener
| *maxHeight* | Maximum height | Integer
| *maxWidth* | Maximum width | Integer
| *metadata* | The new metadata values | Metadata
@@ -239,16 +239,16 @@ The following lists each API name and method and its additional parameters.
| *minWidth* | Minimum width | Integer
| *modified* | The content modified date that will be given to the uploaded file | Date
| *newFileName* | The new name of file | String
-| *newName* | Is | String
+| *newName* | The new name for copied file; if newName is null, the copied file has same name as the original. | String
| *output* | The stream to which the file contents will be written | OutputStream
| *parentFolderId* | The id of parent folder | String
-| *permissions* | Is | Permissions
-| *rangeEnd* | The byte offset in file at which to stop the download; if | Long
-| *rangeStart* | The byte offset in file at which to start the download; if | Long
-| *size* | The size of the file's content used for monitoring the upload's progress.Skip navigation links | Long
-| *typeName* | The metadata template type name; if | String
-| *unshareDate* | The date and time at which time the created shared link will expire; if | Date
-| *version* | The version of file to delete; initial version of file has value of | Integer
+| *permissions* | The permissions of the created link; if permissions is null then the created shared link is create with default permissions. | Permissions
+| *rangeEnd* | The byte offset in file at which to stop the download; if null the entire contents of file will be downloaded. | Long
+| *rangeStart* | The byte offset in file at which to start the download; if null the entire contents of file will be downloaded. | Long
+| *size* | The size of the file's content used for monitoring the upload's progress | Long
+| *typeName* | The metadata template type name; if null the global properties template type is used. | String
+| *unshareDate* | The date and time at which time the created shared link will expire; if unsharedDate is null then a non-expiring link is created. | Date
+| *version* | The version of file to delete; initial version of file has value of 0, second version of file is 1 and so on. | Integer
|===
@@ -259,18 +259,18 @@ The following lists each API name and method and its additional parameters.
| Name | Description | Type
| *access* | The access level of the shared link | Access
| *destinationFolderId* | The id of the destination folder | String
-| *fields* | The information fields to retrieve; if | String[]
+| *fields* | The information fields to retrieve; if null all information fields are retrieved. | String[]
| *folderId* | The id of folder to copy | String
| *folderName* | The name of created folder | String
| *info* | The updated information | Info
-| *limit* | The maximum number of children to retrieve after the offset; if | Long
+| *limit* | The maximum number of children to retrieve after the offset; if null all child items are retrieved. | Long
| *newFolderName* | The new name of folder | String
-| *newName* | Is | String
-| *offset* | The index of first child item to retrieve; if | Long
+| *newName* | The new name for copied folder; if newName is null, the copied folder has same name as the original. | String
+| *offset* | The index of first child item to retrieve; if null all child items are retrieved. | Long
| *parentFolderId* | The id of parent folder | String
| *path* | Sequence of Box folder names from parent folder to returned folder | String[]
-| *permissions* | Is | Permissions
-| *unshareDate* | The date and time at which time the created shared link will expire; if | Date
+| *permissions* | The permissions of the created link; if permissions is null then the created shared link is create with default permissions. | Permissions
+| *unshareDate* | The date and time at which time the created shared link will expire; if unsharedDate is null then a non-expiring link is created. | Date
|===
@@ -289,7 +289,7 @@ The following lists each API name and method and its additional parameters.
| *memberViewabilityLevel* | The member_viewability_level of the new group | String
| *name* | The name of the new group | String
| *provenance* | The provenance of the new group | String
-| *role* | The role of the user in this group. Can be | Role
+| *role* | The role of the user in this group. Can be null to assign the default role. | Role
| *userId* | The id of user to be added to group | String
|===
@@ -315,7 +315,7 @@ The following lists each API name and method and its additional parameters.
| *fileId* | The id of file to add task to | String
| *info* | The updated information | Info
| *message* | An optional message to include with the task | String
-| *taskAssignmentId* | The id of task assignment to delete.Skip navigation links | String
+| *taskAssignmentId* | The id of task assignment to delete | String
| *taskId* | The id of task to add assignment for | String
|===
@@ -328,14 +328,14 @@ The following lists each API name and method and its additional parameters.
| *email* | The email address to add as an alias | String
| *emailAliasId* | The id of the email alias to delete | String
| *fields* | The fields to retrieve. Leave this out for the standard fields. | String[]
-| *filterTerm* | The filter term to lookup users by (login for external, login or name for managed); if | String
+| *filterTerm* | The filter term to lookup users by (login for external, login or name for managed); if null all managed users are returned. | String
| *force* | Whether or not this user should be deleted even if they still own files | Boolean
| *info* | The updated information | Info
| *login* | The email address the user will use to login | String
| *name* | The name of the user | String
| *notifyUser* | Whether or not to send an email notification to the user that their account has been deleted | Boolean
| *params* | Additional user information | CreateUserParams
-| *sourceUserId* | The user id of the user whose files will be the source for this operation.Skip navigation links | String
+| *sourceUserId* | The user id of the user whose files will be the source for this operation | String
| *userId* | The id of user | String
|===
// endpoint options: END
diff --git a/docs/components/modules/ROOT/pages/fhir-component.adoc b/docs/components/modules/ROOT/pages/fhir-component.adoc
index 62e0e4a..682685e 100644
--- a/docs/components/modules/ROOT/pages/fhir-component.adoc
+++ b/docs/components/modules/ROOT/pages/fhir-component.adoc
@@ -199,11 +199,11 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *extraParameters* | See | Map
-| *preferReturn* | Add a | PreferReturnEnum
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
+| *preferReturn* | Add a Prefer header to the request, which requests that the server include or suppress the resource body as a part of the result. If a resource is returned by the server it will be parsed an accessible to the client via MethodOutcome#getResource() , may be null | PreferReturnEnum
| *resource* | The resource to create | IBaseResource
| *resourceAsString* | The resource to create | String
-| *url* | The search URL to use. The format of this URL should be of the form | String
+| *url* | The search URL to use. The format of this URL should be of the form ResourceTypeParameters, for example: Patientname=Smith&identifier=13.2.4.11.4%7C847366, may be null | String
|===
@@ -212,12 +212,12 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *extraParameters* | See | Map
-| *id* | The | IIdType
-| *resource* | The | IBaseResource
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
+| *id* | The IIdType referencing the resource | IIdType
+| *resource* | The IBaseResource to delete | IBaseResource
| *stringId* | It's id | String
| *type* | The resource type e.g Patient | String
-| *url* | The search URL to use. The format of this URL should be of the form | String
+| *url* | The search URL to use. The format of this URL should be of the form ResourceTypeParameters, for example: Patientname=Smith&identifier=13.2.4.11.4%7C847366 | String
|===
@@ -286,12 +286,12 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *extraParameters* | See | Map
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
| *id* | The resource ID to patch | IIdType
| *patchBody* | The body of the patch document serialized in either XML or JSON which conforms to \http://jsonpatch.com/ or \http://tools.ietf.org/html/rfc5261 | String
-| *preferReturn* | Add a | PreferReturnEnum
+| *preferReturn* | Add a Prefer header to the request, which requests that the server include or suppress the resource body as a part of the result. If a resource is returned by the server it will be parsed an accessible to the client via MethodOutcome#getResource() | PreferReturnEnum
| *stringId* | The resource ID to patch | String
-| *url* | The search URL to use. The format of this URL should be of the form | String
+| *url* | The search URL to use. The format of this URL should be of the form ResourceTypeParameters, for example: Patientname=Smith&identifier=13.2.4.11.4%7C847366 | String
|===
@@ -321,7 +321,7 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *extraParameters* | See | Map
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
| *url* | The URL to search for. Note that this URL may be complete (e.g. \http://example.com/base/Patientname=foo) in which case the client's base URL will be ignored. Or it can be relative (e.g. Patientname=foo) in which case the client's base URL will be used. | String
|===
@@ -332,7 +332,7 @@ The following lists each API name and method and its additional parameters.
|===
| Name | Description | Type
| *bundle* | Bundle to use in the transaction | IBaseBundle
-| *extraParameters* | See | Map
+| *extraParameters* | See ExtraParameters for a full list of parameters that can be passed, may be NULL | Map
| *resources* | Resources to use in the transaction | List
| *stringBundle* | Bundle to use in the transaction | String
|===
diff --git a/docs/components/modules/ROOT/pages/google-calendar-component.adoc b/docs/components/modules/ROOT/pages/google-calendar-component.adoc
index 64887e8..6a96b07 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-component.adoc
@@ -160,10 +160,10 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | AclRule
-| *contentChannel* | | Channel
-| *ruleId* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.AclRule | AclRule
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *ruleId* | ACL rule identifier | String
|===
@@ -172,8 +172,8 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Calendar
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Calendar | Calendar
|===
@@ -182,7 +182,7 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -196,12 +196,12 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Event
-| *contentChannel* | | Channel
-| *destination* | | String
-| *eventId* | | String
-| *text* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Event | Event
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *destination* | Calendar identifier of the target calendar where the event is to be moved to | String
+| *eventId* | Event identifier | String
+| *text* | The text describing the event to be created | String
|===
@@ -210,7 +210,7 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *content* | | FreeBusyRequest
+| *content* | The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
|===
@@ -219,9 +219,9 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | CalendarListEntry
-| *contentChannel* | | Channel
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -230,8 +230,8 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
-| *setting* | | String
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *setting* | The id of the user setting | String
|===
// endpoint options: END
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 d16a205..887165c 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
@@ -163,10 +163,10 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | AclRule
-| *contentChannel* | | Channel
-| *ruleId* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.AclRule | AclRule
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *ruleId* | ACL rule identifier | String
|===
@@ -175,8 +175,8 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Calendar
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Calendar | Calendar
|===
@@ -185,7 +185,7 @@ The following lists each API name and method and its additional parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -199,12 +199,12 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | Event
-| *contentChannel* | | Channel
-| *destination* | | String
-| *eventId* | | String
-| *text* | | String
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.Event | Event
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *destination* | Calendar identifier of the target calendar where the event is to be moved to | String
+| *eventId* | Event identifier | String
+| *text* | The text describing the event to be created | String
|===
@@ -213,7 +213,7 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *content* | | FreeBusyRequest
+| *content* | The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
|===
@@ -222,9 +222,9 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *calendarId* | | String
-| *content* | | CalendarListEntry
-| *contentChannel* | | Channel
+| *calendarId* | Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| *content* | The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
|===
@@ -233,8 +233,8 @@ The colors method has no API parameters.
[width="100%",cols="2,5,3",options="header"]
|===
| Name | Description | Type
-| *contentChannel* | | Channel
-| *setting* | | String
+| *contentChannel* | The com.google.api.services.calendar.model.Channel | Channel
+| *setting* | The id of the user setting | String
|===
// endpoint options: END