This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 82b2011 CAMEL-17532: Upgrade & align google-api-services dependencies 82b2011 is described below commit 82b20113d2ea12555df429731f56ad0393938631 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Fri Jan 21 13:44:01 2022 +0000 CAMEL-17532: Upgrade & align google-api-services dependencies --- .../camel-google/camel-google-calendar/pom.xml | 29 ++++- .../CalendarCalendarListEndpointConfiguration.java | 2 +- .../component/google/calendar/google-calendar.json | 2 +- components/camel-google/camel-google-drive/pom.xml | 31 +++-- .../drive/DriveChangesEndpointConfiguration.java | 2 +- .../drive/DriveFilesEndpointConfiguration.java | 2 +- .../DrivePermissionsEndpointConfiguration.java | 4 +- .../DrivePropertiesEndpointConfiguration.java | 2 +- .../drive/DriveRealtimeEndpointConfiguration.java | 45 ------- ...iveRealtimeEndpointConfigurationConfigurer.java | 133 --------------------- .../drive/DriveRevisionsEndpointConfiguration.java | 2 +- .../drive/internal/DriveRealtimeApiMethod.java | 59 --------- .../drive/internal/GoogleDriveApiCollection.java | 9 -- .../google/drive/internal/GoogleDriveApiName.java | 2 - ...google.drive.DriveRealtimeEndpointConfiguration | 2 - .../camel/component/google/drive/google-drive.json | 14 +-- .../google/drive/GoogleDriveEndpoint.java | 3 - components/camel-google/camel-google-mail/pom.xml | 10 +- .../camel-google/camel-google-sheets/pom.xml | 4 + ...etsSpreadsheetsValuesEndpointConfiguration.java | 2 +- .../component/google/sheets/google-sheets.json | 2 +- .../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc | 4 + parent/pom.xml | 12 +- 23 files changed, 79 insertions(+), 298 deletions(-) diff --git a/components/camel-google/camel-google-calendar/pom.xml b/components/camel-google/camel-google-calendar/pom.xml index 7b6b0bc..0ec70db 100644 --- a/components/camel-google/camel-google-calendar/pom.xml +++ b/components/camel-google/camel-google-calendar/pom.xml @@ -46,6 +46,21 @@ <artifactId>camel-support</artifactId> </dependency> <dependency> + <groupId>com.google.apis</groupId> + <artifactId>google-api-services-calendar</artifactId> + <version>${google-api-services-calendar-version}</version> + <exclusions> + <exclusion> + <groupId>com.google.api-client</groupId> + <artifactId>google-api-client</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.oauth-client</groupId> + <artifactId>google-oauth-client</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> <version>${google-api-client-version}</version> @@ -54,10 +69,19 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <exclusion> + <groupId>com.google.oauth-client</groupId> + <artifactId>google-oauth-client</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>com.google.oauth-client</groupId> + <artifactId>google-oauth-client</artifactId> + <version>${google-api-client-version}</version> + </dependency> + <dependency> + <groupId>com.google.oauth-client</groupId> <artifactId>google-oauth-client-jetty</artifactId> <version>${google-api-client-version}</version> </dependency> @@ -72,11 +96,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>com.google.apis</groupId> - <artifactId>google-api-services-calendar</artifactId> - <version>${google-api-services-calendar-version}</version> - </dependency> <!-- logging --> <dependency> diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java index 6c84b2e..32bc620 100644 --- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java +++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfiguration.java @@ -16,7 +16,7 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "list", description = "The calendarList collection of methods", - apiMethods = {@ApiMethod(methodName = "delete", description="Deletes an entry on the user's calendar list", signatures={"com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String calendarId)"}), @ApiMethod(methodName = "get", description="Returns an entry on the user's calendar list", signatures={"com.google.api.services.calendar.Calendar$CalendarList$Get get(String calendarId)"}), @ApiMethod(methodName = "insert", description="Adds an entry to the user's cal [...] + apiMethods = {@ApiMethod(methodName = "delete", description="Removes a calendar from the user's calendar list", signatures={"com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String calendarId)"}), @ApiMethod(methodName = "get", description="Returns a calendar from the user's calendar list", signatures={"com.google.api.services.calendar.Calendar$CalendarList$Get get(String calendarId)"}), @ApiMethod(methodName = "insert", description="Inserts an existing cal [...] @UriParams @Configurer(extended = true) public final class CalendarCalendarListEndpointConfiguration extends GoogleCalendarConfiguration { diff --git a/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json b/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json index 774e4e0..af3b52d 100644 --- a/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json +++ b/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json @@ -78,7 +78,7 @@ "channels": { "consumerOnly": false, "producerOnly": false, "description": "The channels collection of methods", "methods": { "stop": { "description": "Stop watching resources through this channel", "signatures": [ "com.google.api.services.calendar.Calendar$Channels$Stop stop(com.google.api.services.calendar.model.Channel content)" ] } } }, "events": { "consumerOnly": false, "producerOnly": false, "description": "The events collection of methods", "methods": { "calendarImport": { "description": "Imports an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$CalendarImport calendarImport(String calendarId, com.google.api.services.calendar.model.Event content)" ] }, "delete": { "description": "Deletes an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$Delete delete(String ca [...] "freebusy": { "consumerOnly": false, "producerOnly": false, "description": "The freebusy collection of methods", "methods": { "query": { "description": "Returns free\/busy information for a set of calendars", "signatures": [ "com.google.api.services.calendar.Calendar$Freebusy$Query query(com.google.api.services.calendar.model.FreeBusyRequest content)" ] } } }, - "list": { "consumerOnly": false, "producerOnly": false, "description": "The calendarList collection of methods", "methods": { "delete": { "description": "Deletes an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String calendarId)" ] }, "get": { "description": "Returns an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Get get(String calendarId)" ] }, [...] + "list": { "consumerOnly": false, "producerOnly": false, "description": "The calendarList collection of methods", "methods": { "delete": { "description": "Removes a calendar from the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String calendarId)" ] }, "get": { "description": "Returns a calendar from the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Get get(String calendarI [...] "settings": { "consumerOnly": false, "producerOnly": false, "description": "The settings collection of methods", "methods": { "get": { "description": "Returns a single user setting", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Get get(String setting)" ] }, "watch": { "description": "Watch for changes to Settings resources", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Watch watch(com.google.api.services.calendar.model.Channel content)" ] } } } }, "apiProperties": { diff --git a/components/camel-google/camel-google-drive/pom.xml b/components/camel-google/camel-google-drive/pom.xml index 9c2d727..5d2b6e2 100644 --- a/components/camel-google/camel-google-drive/pom.xml +++ b/components/camel-google/camel-google-drive/pom.xml @@ -50,6 +50,17 @@ <artifactId>camel-file</artifactId> </dependency> <dependency> + <groupId>com.google.apis</groupId> + <artifactId>google-api-services-drive</artifactId> + <version>${google-api-services-drive-version}</version> + <exclusions> + <exclusion> + <groupId>com.google.api-client</groupId> + <artifactId>google-api-client</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> <version>${google-api-client-version}</version> @@ -58,10 +69,19 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <exclusion> + <groupId>com.google.oauth-client</groupId> + <artifactId>google-oauth-client</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>com.google.oauth-client</groupId> + <artifactId>google-oauth-client</artifactId> + <version>${google-api-client-version}</version> + </dependency> + <dependency> + <groupId>com.google.oauth-client</groupId> <artifactId>google-oauth-client-jetty</artifactId> <version>${google-api-client-version}</version> </dependency> @@ -76,11 +96,7 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>com.google.apis</groupId> - <artifactId>google-api-services-drive</artifactId> - <version>${google-api-services-drive-version}</version> - </dependency> + <!-- logging --> <dependency> @@ -165,11 +181,6 @@ <fromJavasource /> </api> <api> - <apiName>drive-realtime</apiName> - <proxyClass>com.google.api.services.drive.Drive$Realtime</proxyClass> - <fromJavasource /> - </api> - <api> <apiName>drive-replies</apiName> <proxyClass>com.google.api.services.drive.Drive$Replies</proxyClass> <fromJavasource /> diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java index e6549fa..ad9125b 100644 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java +++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveChangesEndpointConfiguration.java @@ -16,7 +16,7 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "drive-changes", description = "The changes collection of methods", - apiMethods = {@ApiMethod(methodName = "get", description="Deprecated - Use changes", signatures={"com.google.api.services.drive.Drive$Changes$Get get(String changeId)"}), @ApiMethod(methodName = "getStartPageToken", description="Gets the starting pageToken for listing future changes", signatures={"com.google.api.services.drive.Drive$Changes$GetStartPageToken getStartPageToken()"}), @ApiMethod(methodName = "list", description="Lists the changes for a user or Team Drive", signat [...] + apiMethods = {@ApiMethod(methodName = "get", description="Deprecated - Use changes", signatures={"com.google.api.services.drive.Drive$Changes$Get get(String changeId)"}), @ApiMethod(methodName = "getStartPageToken", description="Gets the starting pageToken for listing future changes", signatures={"com.google.api.services.drive.Drive$Changes$GetStartPageToken getStartPageToken()"}), @ApiMethod(methodName = "list", description="Lists the changes for a user or shared drive", sign [...] @UriParams @Configurer(extended = true) public final class DriveChangesEndpointConfiguration extends GoogleDriveConfiguration { diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java index caebbb3..5e5740f 100644 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java +++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfiguration.java @@ -16,7 +16,7 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "drive-files", description = "The files collection of methods", - apiMethods = {@ApiMethod(methodName = "copy", description="Creates a copy of the specified file", signatures={"com.google.api.services.drive.Drive$Files$Copy copy(String fileId, com.google.api.services.drive.model.File content)"}), @ApiMethod(methodName = "delete", description="Permanently deletes a file by ID", signatures={"com.google.api.services.drive.Drive$Files$Delete delete(String fileId)"}), @ApiMethod(methodName = "emptyTrash", description="Permanently deletes all of t [...] + apiMethods = {@ApiMethod(methodName = "copy", description="Creates a copy of the specified file", signatures={"com.google.api.services.drive.Drive$Files$Copy copy(String fileId, com.google.api.services.drive.model.File content)"}), @ApiMethod(methodName = "delete", description="Permanently deletes a file by ID", signatures={"com.google.api.services.drive.Drive$Files$Delete delete(String fileId)"}), @ApiMethod(methodName = "emptyTrash", description="Permanently deletes all of t [...] @UriParams @Configurer(extended = true) public final class DriveFilesEndpointConfiguration extends GoogleDriveConfiguration { diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java index 9e347d8..5b00ff1 100644 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java +++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePermissionsEndpointConfiguration.java @@ -16,7 +16,7 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "drive-permissions", description = "The permissions collection of methods", - apiMethods = {@ApiMethod(methodName = "delete", description="Deletes a permission from a file or Team Drive", signatures={"com.google.api.services.drive.Drive$Permissions$Delete delete(String fileId, String permissionId)"}), @ApiMethod(methodName = "get", description="Gets a permission by ID", signatures={"com.google.api.services.drive.Drive$Permissions$Get get(String fileId, String permissionId)"}), @ApiMethod(methodName = "getIdForEmail", description="Returns the permission [...] + apiMethods = {@ApiMethod(methodName = "delete", description="Deletes a permission from a file or shared drive", signatures={"com.google.api.services.drive.Drive$Permissions$Delete delete(String fileId, String permissionId)"}), @ApiMethod(methodName = "get", description="Gets a permission by ID", signatures={"com.google.api.services.drive.Drive$Permissions$Get get(String fileId, String permissionId)"}), @ApiMethod(methodName = "getIdForEmail", description="Returns the permissio [...] @UriParams @Configurer(extended = true) public final class DrivePermissionsEndpointConfiguration extends GoogleDriveConfiguration { @@ -27,7 +27,7 @@ public final class DrivePermissionsEndpointConfiguration extends GoogleDriveConf @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "getIdForEmail", description="The email address for which to return a permission ID")}) private String email; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "delete", description="The ID for the file or Team Drive"), @ApiMethod(methodName = "get", description="The ID for the file or Team Drive"), @ApiMethod(methodName = "insert", description="The ID for the file or Team Drive"), @ApiMethod(methodName = "list", description="The ID for the file or Team Drive"), @ApiMethod(methodName = "patch", description="The ID for the file or Team Drive"), @ApiMethod(methodName = "update" [...] + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "delete", description="The ID for the file or shared drive"), @ApiMethod(methodName = "get", description="The ID for the file or shared drive"), @ApiMethod(methodName = "insert", description="The ID for the file or shared drive"), @ApiMethod(methodName = "list", description="The ID for the file or shared drive"), @ApiMethod(methodName = "patch", description="The ID for the file or shared drive"), @ApiMethod(methodName [...] private String fileId; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "delete", description="The ID for the permission"), @ApiMethod(methodName = "get", description="The ID for the permission"), @ApiMethod(methodName = "patch", description="The ID for the permission"), @ApiMethod(methodName = "update", description="The ID for the permission")}) diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java index 3d8870f..94d7647 100644 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java +++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DrivePropertiesEndpointConfiguration.java @@ -16,7 +16,7 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "drive-properties", description = "The properties collection of methods", - apiMethods = {@ApiMethod(methodName = "delete", description="Deletes a property", signatures={"com.google.api.services.drive.Drive$Properties$Delete delete(String fileId, String propertyKey)"}), @ApiMethod(methodName = "get", description="Gets a property by its key", signatures={"com.google.api.services.drive.Drive$Properties$Get get(String fileId, String propertyKey)"}), @ApiMethod(methodName = "insert", description="Adds a property to a file, or updates it if it already exis [...] + apiMethods = {@ApiMethod(methodName = "delete", description="Deletes a property", signatures={"com.google.api.services.drive.Drive$Properties$Delete delete(String fileId, String propertyKey)"}), @ApiMethod(methodName = "get", description="Gets a property by its key", signatures={"com.google.api.services.drive.Drive$Properties$Get get(String fileId, String propertyKey)"}), @ApiMethod(methodName = "insert", description="Adds a property to a file, or updates it if it already exis [...] @UriParams @Configurer(extended = true) public final class DrivePropertiesEndpointConfiguration extends GoogleDriveConfiguration { diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfiguration.java deleted file mode 100644 index 54f9761..0000000 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfiguration.java +++ /dev/null @@ -1,45 +0,0 @@ - -/* - * Camel EndpointConfiguration generated by camel-api-component-maven-plugin - */ -package org.apache.camel.component.google.drive; - -import org.apache.camel.spi.ApiMethod; -import org.apache.camel.spi.ApiParam; -import org.apache.camel.spi.ApiParams; -import org.apache.camel.spi.Configurer; -import org.apache.camel.spi.UriParam; -import org.apache.camel.spi.UriParams; - -/** - * Camel endpoint configuration for {@link com.google.api.services.drive.Drive.Realtime}. - */ -@ApiParams(apiName = "drive-realtime", - description = "The realtime collection of methods", - apiMethods = {@ApiMethod(methodName = "get", description="Exports the contents of the Realtime API data model associated with this file as JSON", signatures={"com.google.api.services.drive.Drive$Realtime$Get get(String fileId)"}), @ApiMethod(methodName = "update", description="Overwrites the Realtime API data model associated with this file with the provided JSON data model", signatures={"com.google.api.services.drive.Drive$Realtime$Update update(String fileId)", "com.google.a [...] -@UriParams -@Configurer(extended = true) -public final class DriveRealtimeEndpointConfiguration extends GoogleDriveConfiguration { - @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "get", description="The ID of the file that the Realtime API data model is associated with"), @ApiMethod(methodName = "update", description="The ID of the file that the Realtime API data model is associated with"), @ApiMethod(methodName = "update", description="The ID of the file that the Realtime API data model is associated with")}) - private String fileId; - @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "update", description="The media HTTP content or null if none")}) - private com.google.api.client.http.AbstractInputStreamContent mediaContent; - - public String getFileId() { - return fileId; - } - - public void setFileId(String fileId) { - this.fileId = fileId; - } - - public com.google.api.client.http.AbstractInputStreamContent getMediaContent() { - return mediaContent; - } - - public void setMediaContent(com.google.api.client.http.AbstractInputStreamContent mediaContent) { - this.mediaContent = mediaContent; - } -} diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfigurationConfigurer.java deleted file mode 100644 index cf969be..0000000 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRealtimeEndpointConfigurationConfigurer.java +++ /dev/null @@ -1,133 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.component.google.drive; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.ExtendedPropertyConfigurerGetter; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.spi.ConfigurerStrategy; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class DriveRealtimeEndpointConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, ExtendedPropertyConfigurerGetter { - - private static final Map<String, Object> ALL_OPTIONS; - static { - Map<String, Object> map = new CaseInsensitiveMap(); - map.put("AccessToken", java.lang.String.class); - map.put("ApiName", org.apache.camel.component.google.drive.internal.GoogleDriveApiName.class); - map.put("ApplicationName", java.lang.String.class); - map.put("ClientId", java.lang.String.class); - map.put("ClientSecret", java.lang.String.class); - map.put("FileId", java.lang.String.class); - map.put("MediaContent", com.google.api.client.http.AbstractInputStreamContent.class); - map.put("MethodName", java.lang.String.class); - map.put("RefreshToken", java.lang.String.class); - map.put("Scopes", java.util.List.class); - ALL_OPTIONS = map; - } - - @Override - public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { - org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration target = (org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "accesstoken": - case "AccessToken": target.setAccessToken(property(camelContext, java.lang.String.class, value)); return true; - case "apiname": - case "ApiName": target.setApiName(property(camelContext, org.apache.camel.component.google.drive.internal.GoogleDriveApiName.class, value)); return true; - case "applicationname": - case "ApplicationName": target.setApplicationName(property(camelContext, java.lang.String.class, value)); return true; - case "clientid": - case "ClientId": target.setClientId(property(camelContext, java.lang.String.class, value)); return true; - case "clientsecret": - case "ClientSecret": target.setClientSecret(property(camelContext, java.lang.String.class, value)); return true; - case "fileid": - case "FileId": target.setFileId(property(camelContext, java.lang.String.class, value)); return true; - case "mediacontent": - case "MediaContent": target.setMediaContent(property(camelContext, com.google.api.client.http.AbstractInputStreamContent.class, value)); return true; - case "methodname": - case "MethodName": target.setMethodName(property(camelContext, java.lang.String.class, value)); return true; - case "refreshtoken": - case "RefreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true; - case "scopes": - case "Scopes": target.setScopes(property(camelContext, java.util.List.class, value)); return true; - default: return false; - } - } - - @Override - public Map<String, Object> getAllOptions(Object target) { - return ALL_OPTIONS; - } - - @Override - public Class<?> getOptionType(String name, boolean ignoreCase) { - switch (ignoreCase ? name.toLowerCase() : name) { - case "accesstoken": - case "AccessToken": return java.lang.String.class; - case "apiname": - case "ApiName": return org.apache.camel.component.google.drive.internal.GoogleDriveApiName.class; - case "applicationname": - case "ApplicationName": return java.lang.String.class; - case "clientid": - case "ClientId": return java.lang.String.class; - case "clientsecret": - case "ClientSecret": return java.lang.String.class; - case "fileid": - case "FileId": return java.lang.String.class; - case "mediacontent": - case "MediaContent": return com.google.api.client.http.AbstractInputStreamContent.class; - case "methodname": - case "MethodName": return java.lang.String.class; - case "refreshtoken": - case "RefreshToken": return java.lang.String.class; - case "scopes": - case "Scopes": return java.util.List.class; - default: return null; - } - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration target = (org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "accesstoken": - case "AccessToken": return target.getAccessToken(); - case "apiname": - case "ApiName": return target.getApiName(); - case "applicationname": - case "ApplicationName": return target.getApplicationName(); - case "clientid": - case "ClientId": return target.getClientId(); - case "clientsecret": - case "ClientSecret": return target.getClientSecret(); - case "fileid": - case "FileId": return target.getFileId(); - case "mediacontent": - case "MediaContent": return target.getMediaContent(); - case "methodname": - case "MethodName": return target.getMethodName(); - case "refreshtoken": - case "RefreshToken": return target.getRefreshToken(); - case "scopes": - case "Scopes": return target.getScopes(); - default: return null; - } - } - - @Override - public Object getCollectionValueType(Object target, String name, boolean ignoreCase) { - switch (ignoreCase ? name.toLowerCase() : name) { - case "scopes": - case "Scopes": return java.lang.String.class; - default: return null; - } - } -} - diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java index 9790dee..862bec2 100644 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java +++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveRevisionsEndpointConfiguration.java @@ -16,7 +16,7 @@ import org.apache.camel.spi.UriParams; */ @ApiParams(apiName = "drive-revisions", description = "The revisions collection of methods", - apiMethods = {@ApiMethod(methodName = "delete", description="Removes a revision", signatures={"com.google.api.services.drive.Drive$Revisions$Delete delete(String fileId, String revisionId)"}), @ApiMethod(methodName = "get", description="Gets a specific revision", signatures={"com.google.api.services.drive.Drive$Revisions$Get get(String fileId, String revisionId)"}), @ApiMethod(methodName = "list", description="Lists a file's revisions", signatures={"com.google.api.services.dri [...] + apiMethods = {@ApiMethod(methodName = "delete", description="Permanently deletes a file version", signatures={"com.google.api.services.drive.Drive$Revisions$Delete delete(String fileId, String revisionId)"}), @ApiMethod(methodName = "get", description="Gets a specific revision", signatures={"com.google.api.services.drive.Drive$Revisions$Get get(String fileId, String revisionId)"}), @ApiMethod(methodName = "list", description="Lists a file's revisions", signatures={"com.google. [...] @UriParams @Configurer(extended = true) public final class DriveRevisionsEndpointConfiguration extends GoogleDriveConfiguration { diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRealtimeApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRealtimeApiMethod.java deleted file mode 100644 index f04bf1c..0000000 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveRealtimeApiMethod.java +++ /dev/null @@ -1,59 +0,0 @@ - -/* - * Camel ApiMethod Enumeration generated by camel-api-component-maven-plugin - */ -package org.apache.camel.component.google.drive.internal; - -import java.lang.reflect.Method; -import java.util.List; - -import com.google.api.services.drive.Drive.Realtime; - -import org.apache.camel.support.component.ApiMethod; -import org.apache.camel.support.component.ApiMethodArg; -import org.apache.camel.support.component.ApiMethodImpl; - -import static org.apache.camel.support.component.ApiMethodArg.arg; - -/** - * Camel {@link ApiMethod} Enumeration for com.google.api.services.drive.Drive$Realtime - */ -public enum DriveRealtimeApiMethod implements ApiMethod { - - GET( - com.google.api.services.drive.Drive.Realtime.Get.class, - "get", - arg("fileId", String.class)), - - UPDATE( - com.google.api.services.drive.Drive.Realtime.Update.class, - "update", - arg("fileId", String.class)), - - UPDATE_1( - com.google.api.services.drive.Drive.Realtime.Update.class, - "update", - arg("fileId", String.class), - arg("mediaContent", com.google.api.client.http.AbstractInputStreamContent.class)); - - private final ApiMethod apiMethod; - - private DriveRealtimeApiMethod(Class<?> resultType, String name, ApiMethodArg... args) { - this.apiMethod = new ApiMethodImpl(Realtime.class, resultType, name, args); - } - - @Override - public String getName() { return apiMethod.getName(); } - - @Override - public Class<?> getResultType() { return apiMethod.getResultType(); } - - @Override - public List<String> getArgNames() { return apiMethod.getArgNames(); } - - @Override - public List<Class<?>> getArgTypes() { return apiMethod.getArgTypes(); } - - @Override - public Method getMethod() { return apiMethod.getMethod(); } -} diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java index c20b239..06afc51 100644 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java +++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiCollection.java @@ -21,7 +21,6 @@ import org.apache.camel.component.google.drive.DriveFilesEndpointConfiguration; import org.apache.camel.component.google.drive.DriveParentsEndpointConfiguration; import org.apache.camel.component.google.drive.DrivePermissionsEndpointConfiguration; import org.apache.camel.component.google.drive.DrivePropertiesEndpointConfiguration; -import org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration; import org.apache.camel.component.google.drive.DriveRepliesEndpointConfiguration; import org.apache.camel.component.google.drive.DriveRevisionsEndpointConfiguration; @@ -95,11 +94,6 @@ public final class GoogleDriveApiCollection extends ApiCollection<GoogleDriveApi aliases.clear(); nullableArgs = Arrays.asList(); - apiHelpers.put(GoogleDriveApiName.DRIVE_REALTIME, new ApiMethodHelper<DriveRealtimeApiMethod>(DriveRealtimeApiMethod.class, aliases, nullableArgs)); - apiMethods.put(DriveRealtimeApiMethod.class, GoogleDriveApiName.DRIVE_REALTIME); - - aliases.clear(); - nullableArgs = Arrays.asList(); apiHelpers.put(GoogleDriveApiName.DRIVE_REPLIES, new ApiMethodHelper<DriveRepliesApiMethod>(DriveRepliesApiMethod.class, aliases, nullableArgs)); apiMethods.put(DriveRepliesApiMethod.class, GoogleDriveApiName.DRIVE_REPLIES); @@ -145,9 +139,6 @@ public final class GoogleDriveApiCollection extends ApiCollection<GoogleDriveApi case DRIVE_PROPERTIES: result = new DrivePropertiesEndpointConfiguration(); break; - case DRIVE_REALTIME: - result = new DriveRealtimeEndpointConfiguration(); - break; case DRIVE_REPLIES: result = new DriveRepliesEndpointConfiguration(); break; diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiName.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiName.java index 8a8cf85..7307861 100644 --- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiName.java +++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/GoogleDriveApiName.java @@ -31,8 +31,6 @@ public enum GoogleDriveApiName implements ApiName { DRIVE_PROPERTIES("drive-properties"), - DRIVE_REALTIME("drive-realtime"), - DRIVE_REPLIES("drive-replies"), DRIVE_REVISIONS("drive-revisions"); diff --git a/components/camel-google/camel-google-drive/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration b/components/camel-google/camel-google-drive/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration deleted file mode 100644 index 600888a..0000000 --- a/components/camel-google/camel-google-drive/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.google.drive.DriveRealtimeEndpointConfiguration +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.component.google.drive.DriveRealtimeEndpointConfigurationConfigurer diff --git a/components/camel-google/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json b/components/camel-google/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json index 3f257e6..53de387 100644 --- a/components/camel-google/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json +++ b/components/camel-google/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json @@ -36,7 +36,7 @@ "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.drive.GoogleDriveConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever th [...] }, "properties": { - "apiName": { "kind": "path", "displayName": "Api Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.google.drive.internal.GoogleDriveApiName", "enum": [ "DRIVE_ABOUT", "DRIVE_APPS", "DRIVE_CHANGES", "DRIVE_CHANNELS", "DRIVE_CHILDREN", "DRIVE_COMMENTS", "DRIVE_FILES", "DRIVE_PARENTS", "DRIVE_PERMISSIONS", "DRIVE_PROPERTIES", "DRIVE_REALTIME", "DRIVE_REPLIES", "DRIVE_REVISIONS" ], "deprecated": false, "deprecationNote": "" [...] + "apiName": { "kind": "path", "displayName": "Api Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.google.drive.internal.GoogleDriveApiName", "enum": [ "DRIVE_ABOUT", "DRIVE_APPS", "DRIVE_CHANGES", "DRIVE_CHANNELS", "DRIVE_CHILDREN", "DRIVE_COMMENTS", "DRIVE_FILES", "DRIVE_PARENTS", "DRIVE_PERMISSIONS", "DRIVE_PROPERTIES", "DRIVE_REPLIES", "DRIVE_REVISIONS" ], "deprecated": false, "deprecationNote": "", "autowired": fal [...] "methodName": { "kind": "path", "displayName": "Method Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "copy", "delete", "get", "getIdForEmail", "insert", "list", "patch", "stop", "touch", "trash", "untrash", "update", "watch" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.drive.GoogleDriveConfiguration", "configurationFiel [...] "applicationName": { "kind": "parameter", "displayName": "Application Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.drive.GoogleDriveConfiguration", "configurationField": "configuration", "description": "Google drive application name. Example would be camel-google-drive\/1.0" }, "clientFactory": { "kind": "parameter", "displayName": "Client Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.drive.GoogleDriveClientFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use the GoogleCalendarClientFactory as factory for creating the client. Will by default use BatchGoogleDriveClientFactory" }, @@ -73,13 +73,12 @@ "drive-channels": { "consumerOnly": false, "producerOnly": false, "description": "The channels collection of methods", "methods": { "stop": { "description": "Stop watching resources through this channel", "signatures": [ "com.google.api.services.drive.Drive$Channels$Stop stop(com.google.api.services.drive.model.Channel content)" ] } } }, "drive-children": { "consumerOnly": false, "producerOnly": false, "description": "The children collection of methods", "methods": { "delete": { "description": "Removes a child from a folder", "signatures": [ "com.google.api.services.drive.Drive$Children$Delete delete(String folderId, String childId)" ] }, "get": { "description": "Gets a specific child reference", "signatures": [ "com.google.api.services.drive.Drive$Children$Get get(String folderId, String childId)" ] }, "insert": { " [...] "drive-comments": { "consumerOnly": false, "producerOnly": false, "description": "The comments collection of methods", "methods": { "delete": { "description": "Deletes a comment", "signatures": [ "com.google.api.services.drive.Drive$Comments$Delete delete(String fileId, String commentId)" ] }, "get": { "description": "Gets a comment by ID", "signatures": [ "com.google.api.services.drive.Drive$Comments$Get get(String fileId, String commentId)" ] }, "insert": { "description": "Creates [...] - "drive-files": { "consumerOnly": false, "producerOnly": false, "description": "The files collection of methods", "methods": { "copy": { "description": "Creates a copy of the specified file", "signatures": [ "com.google.api.services.drive.Drive$Files$Copy copy(String fileId, com.google.api.services.drive.model.File content)" ] }, "delete": { "description": "Permanently deletes a file by ID", "signatures": [ "com.google.api.services.drive.Drive$Files$Delete delete(String fileId)" ] }, [...] + "drive-files": { "consumerOnly": false, "producerOnly": false, "description": "The files collection of methods", "methods": { "copy": { "description": "Creates a copy of the specified file", "signatures": [ "com.google.api.services.drive.Drive$Files$Copy copy(String fileId, com.google.api.services.drive.model.File content)" ] }, "delete": { "description": "Permanently deletes a file by ID", "signatures": [ "com.google.api.services.drive.Drive$Files$Delete delete(String fileId)" ] }, [...] "drive-parents": { "consumerOnly": false, "producerOnly": false, "description": "The parents collection of methods", "methods": { "delete": { "description": "Removes a parent from a file", "signatures": [ "com.google.api.services.drive.Drive$Parents$Delete delete(String fileId, String parentId)" ] }, "get": { "description": "Gets a specific parent reference", "signatures": [ "com.google.api.services.drive.Drive$Parents$Get get(String fileId, String parentId)" ] }, "insert": { "descri [...] - "drive-permissions": { "consumerOnly": false, "producerOnly": false, "description": "The permissions collection of methods", "methods": { "delete": { "description": "Deletes a permission from a file or Team Drive", "signatures": [ "com.google.api.services.drive.Drive$Permissions$Delete delete(String fileId, String permissionId)" ] }, "get": { "description": "Gets a permission by ID", "signatures": [ "com.google.api.services.drive.Drive$Permissions$Get get(String fileId, String permis [...] - "drive-properties": { "consumerOnly": false, "producerOnly": false, "description": "The properties collection of methods", "methods": { "delete": { "description": "Deletes a property", "signatures": [ "com.google.api.services.drive.Drive$Properties$Delete delete(String fileId, String propertyKey)" ] }, "get": { "description": "Gets a property by its key", "signatures": [ "com.google.api.services.drive.Drive$Properties$Get get(String fileId, String propertyKey)" ] }, "insert": { "desc [...] - "drive-realtime": { "consumerOnly": false, "producerOnly": false, "description": "The realtime collection of methods", "methods": { "get": { "description": "Exports the contents of the Realtime API data model associated with this file as JSON", "signatures": [ "com.google.api.services.drive.Drive$Realtime$Get get(String fileId)" ] }, "update": { "description": "Overwrites the Realtime API data model associated with this file with the provided JSON data model", "signatures": [ "com.go [...] + "drive-permissions": { "consumerOnly": false, "producerOnly": false, "description": "The permissions collection of methods", "methods": { "delete": { "description": "Deletes a permission from a file or shared drive", "signatures": [ "com.google.api.services.drive.Drive$Permissions$Delete delete(String fileId, String permissionId)" ] }, "get": { "description": "Gets a permission by ID", "signatures": [ "com.google.api.services.drive.Drive$Permissions$Get get(String fileId, String perm [...] + "drive-properties": { "consumerOnly": false, "producerOnly": false, "description": "The properties collection of methods", "methods": { "delete": { "description": "Deletes a property", "signatures": [ "com.google.api.services.drive.Drive$Properties$Delete delete(String fileId, String propertyKey)" ] }, "get": { "description": "Gets a property by its key", "signatures": [ "com.google.api.services.drive.Drive$Properties$Get get(String fileId, String propertyKey)" ] }, "insert": { "desc [...] "drive-replies": { "consumerOnly": false, "producerOnly": false, "description": "The replies collection of methods", "methods": { "delete": { "description": "Deletes a reply", "signatures": [ "com.google.api.services.drive.Drive$Replies$Delete delete(String fileId, String commentId, String replyId)" ] }, "get": { "description": "Gets a reply", "signatures": [ "com.google.api.services.drive.Drive$Replies$Get get(String fileId, String commentId, String replyId)" ] }, "insert": { "descr [...] - "drive-revisions": { "consumerOnly": false, "producerOnly": false, "description": "The revisions collection of methods", "methods": { "delete": { "description": "Removes a revision", "signatures": [ "com.google.api.services.drive.Drive$Revisions$Delete delete(String fileId, String revisionId)" ] }, "get": { "description": "Gets a specific revision", "signatures": [ "com.google.api.services.drive.Drive$Revisions$Get get(String fileId, String revisionId)" ] }, "list": { "description": [...] + "drive-revisions": { "consumerOnly": false, "producerOnly": false, "description": "The revisions collection of methods", "methods": { "delete": { "description": "Permanently deletes a file version", "signatures": [ "com.google.api.services.drive.Drive$Revisions$Delete delete(String fileId, String revisionId)" ] }, "get": { "description": "Gets a specific revision", "signatures": [ "com.google.api.services.drive.Drive$Revisions$Get get(String fileId, String revisionId)" ] }, "list": { [...] }, "apiProperties": { "drive-apps": { "methods": { "get": { "properties": { "appId": { "kind": "parameter", "displayName": "App Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the app", "optional": false } } } } }, @@ -89,9 +88,8 @@ "drive-comments": { "methods": { "delete": { "properties": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the comment", "optional": false }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "j [...] "drive-files": { "methods": { "copy": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.File", "deprecated": false, "autowired": false, "secret": false, "description": "The com.google.api.services.drive.model.File", "optional": false }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": fa [...] "drive-parents": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the file", "optional": false }, "parentId": { "kind": "parameter", "displayName": "Parent Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.la [...] - "drive-permissions": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID for the file or Team Drive", "optional": false }, "permissionId": { "kind": "parameter", "displayName": "Permission Id", "group": "common", "label": "", "required": false, "type": "st [...] + "drive-permissions": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID for the file or shared drive", "optional": false }, "permissionId": { "kind": "parameter", "displayName": "Permission Id", "group": "common", "label": "", "required": false, "type": " [...] "drive-properties": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the file", "optional": false }, "propertyKey": { "kind": "parameter", "displayName": "Property Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": [...] - "drive-realtime": { "methods": { "get": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the file that the Realtime API data model is associated with", "optional": false } } }, "update": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "c [...] "drive-replies": { "methods": { "delete": { "properties": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the comment", "optional": false }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "ja [...] "drive-revisions": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the file", "optional": false }, "revisionId": { "kind": "parameter", "displayName": "Revision Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "j [...] } diff --git a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java index 5fdbf76..404ad6b 100644 --- a/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java +++ b/components/camel-google/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java @@ -109,9 +109,6 @@ public class GoogleDriveEndpoint extends AbstractApiEndpoint<GoogleDriveApiName, case DRIVE_PROPERTIES: apiProxy = getClient().properties(); break; - case DRIVE_REALTIME: - apiProxy = getClient().realtime(); - break; case DRIVE_REPLIES: apiProxy = getClient().replies(); break; diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml index dcc5283..184c72d 100644 --- a/components/camel-google/camel-google-mail/pom.xml +++ b/components/camel-google/camel-google-mail/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> - <version>${google-mail-api-client-version}</version> + <version>${google-api-client-version}</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -63,12 +63,12 @@ <dependency> <groupId>com.google.oauth-client</groupId> <artifactId>google-oauth-client</artifactId> - <version>${google-mail-api-client-version}</version> + <version>${google-api-client-version}</version> </dependency> <dependency> <groupId>com.google.oauth-client</groupId> <artifactId>google-oauth-client-jetty</artifactId> - <version>${google-mail-api-client-version}</version> + <version>${google-api-client-version}</version> <exclusions> <exclusion> <groupId>org.mortbay.jetty</groupId> @@ -79,7 +79,7 @@ <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client-jackson2</artifactId> - <version>${google-mail-api-client-version}</version> + <version>${google-api-client-version}</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -95,7 +95,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${google-mail-guava-version}</version> + <version>${google-guava-version}</version> </dependency> <dependency> diff --git a/components/camel-google/camel-google-sheets/pom.xml b/components/camel-google/camel-google-sheets/pom.xml index 8e4f892..e4d391b 100644 --- a/components/camel-google/camel-google-sheets/pom.xml +++ b/components/camel-google/camel-google-sheets/pom.xml @@ -100,6 +100,10 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <exclusion> + <groupId>com.google.oauth-client</groupId> + <artifactId>google-oauth-client</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java index 561914e..a469845 100644 --- a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java +++ b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesEndpointConfiguration.java @@ -39,7 +39,7 @@ public final class SheetsSpreadsheetsValuesEndpointConfiguration extends GoogleS @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "batchClearByDataFilter", description="The com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest")}) private com.google.api.services.sheets.v4.model.BatchClearValuesByDataFilterRequest content; @UriParam - @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "append", description="The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table."), @ApiMethod(methodName = "clear", description="The A1 notation of the values to clear."), @ApiMethod(methodName = "get", description="The A1 notation of the values to retrieve."), @ApiMethod(methodName = "update", description="The A1 notation of the values to update.")}) + @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "append", description="The A1 notation of a range to search for a logical table of data. Values are appended after the last row of the table."), @ApiMethod(methodName = "clear", description="The A1 notation or R1C1 notation of the values to clear."), @ApiMethod(methodName = "get", description="The A1 notation or R1C1 notation of the range to retrieve values from."), @ApiMethod(methodName = "update", description="The A1 [...] private String range; @UriParam @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "append", description="The ID of the spreadsheet to update"), @ApiMethod(methodName = "batchClear", description="The ID of the spreadsheet to update"), @ApiMethod(methodName = "batchClearByDataFilter", description="The ID of the spreadsheet to update"), @ApiMethod(methodName = "batchGet", description="The ID of the spreadsheet to retrieve data from"), @ApiMethod(methodName = "batchGetByDataFilter", description="The ID [...] diff --git a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json index 9f00d7e..eac5da0 100644 --- a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json +++ b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json @@ -72,7 +72,7 @@ "spreadsheets": { "consumerOnly": false, "producerOnly": false, "description": "The spreadsheets collection of methods", "methods": { "batchUpdate": { "description": "Applies one or more updates to the spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content)" ] }, "create": { "description": "Creates a spreadsheet, returning the newly [...] }, "apiProperties": { - "data": { "methods": { "append": { "properties": { "range": { "kind": "parameter", "displayName": "Range", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table.", "optional": false }, "spreadsheetId": { "kind": "parameter", "displayName": "Spre [...] + "data": { "methods": { "append": { "properties": { "range": { "kind": "parameter", "displayName": "Range", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The A1 notation of a range to search for a logical table of data. Values are appended after the last row of the table.", "optional": false }, "spreadsheetId": { "kind": "parameter", "displayName": "Spreadsh [...] "spreadsheets": { "methods": { "batchUpdate": { "properties": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "autowired": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "optional": f [...] } } diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc index 5b8d758..22a1d21 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc @@ -209,3 +209,7 @@ The rabbitmq producer has migrated from commons-poll v1 to v2. The contextPath specified in the REST configuration is no longer added to the paths of the operations in the generated openapi specification. +=== camel-google-drive + +The `camel-google-drive` component has upgraded to the latest version of `google-api-services-drive`. This means that support for access to the Google Drive Realtime APIs +via URIs like `google-drive:drive-realtime` has been removed. Google deprecated and retired the realtime APIs some time ago. diff --git a/parent/pom.xml b/parent/pom.xml index fb813cf..2126f95 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -203,17 +203,15 @@ <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version> <gmavenplus-plugin-version>1.12.0</gmavenplus-plugin-version> <gmetric4j-version>1.0.10</gmetric4j-version> - <google-guava-version>19.0</google-guava-version> - <google-api-client-version>1.22.0</google-api-client-version> - <google-api-services-drive-version>v2-rev297-1.22.0</google-api-services-drive-version> - <google-api-services-calendar-version>v3-rev291-1.22.0</google-api-services-calendar-version> - <google-api-services-sheets-version>v4-rev551-1.22.0</google-api-services-sheets-version> + <google-guava-version>20.0</google-guava-version> + <google-api-client-version>1.32.1</google-api-client-version> + <google-api-services-drive-version>v2-rev20220110-1.32.1</google-api-services-drive-version> + <google-api-services-calendar-version>v3-rev20211229-1.32.1</google-api-services-calendar-version> + <google-api-services-sheets-version>v4-rev20210629-1.32.1</google-api-services-sheets-version> <google-cloud-bom-version>16.3.0</google-cloud-bom-version> <google-cloud-functions-bom-version>1.0.8</google-cloud-functions-bom-version> <google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version> <google-cloud-guava-version>30.0-jre</google-cloud-guava-version> - <google-mail-guava-version>20.0</google-mail-guava-version> - <google-mail-api-client-version>1.32.1</google-mail-api-client-version> <google-api-services-mail-version>v1-rev20211108-1.32.1</google-api-services-mail-version> <graaljs-version>21.3.0</graaljs-version> <graphql-java-version>14.0</graphql-java-version>