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 2023/07/20 08:59:44 UTC

[camel] 02/02: Upgrade google cloud apis to latest 1.32.x versions

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 690216bc27a85ff4b3d8594b41fa63a9a63730bd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 20 10:59:24 2023 +0200

    Upgrade google cloud apis to latest 1.32.x versions
---
 .../CalendarEventsEndpointConfiguration.java       |  2 +-
 .../component/google/calendar/google-calendar.json |  2 +-
 components/camel-google/camel-google-drive/pom.xml | 38 +++++++++++++++++++++
 .../drive/DriveFilesEndpointConfiguration.java     | 39 ++++++++++++++--------
 .../DriveFilesEndpointConfigurationConfigurer.java | 35 +++++++++++--------
 .../drive/GoogleDriveEndpointUriFactory.java       |  5 ++-
 .../google/drive/internal/DriveFilesApiMethod.java | 25 ++++++++++----
 .../camel/component/google/drive/google-drive.json |  4 +--
 parent/pom.xml                                     |  6 ++--
 9 files changed, 113 insertions(+), 43 deletions(-)

diff --git a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
index a97a4ef5404..c6f6a1d4aef 100644
--- a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
+++ b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfiguration.java
@@ -15,7 +15,7 @@ import org.apache.camel.spi.UriParams;
  */
 @ApiParams(apiName = "events", 
            description = "The events collection of methods",
-           apiMethods = {@ApiMethod(methodName = "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)"}), @ApiMethod(methodName = "delete", description="Deletes an event", signatures={"com.google.api.services.calendar.Calendar$Events$Delete delete(String calendarId, String eventId)"}), @ApiMethod(methodName = "get", description= [...]
+           apiMethods = {@ApiMethod(methodName = "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)"}), @ApiMethod(methodName = "delete", description="Deletes an event", signatures={"com.google.api.services.calendar.Calendar$Events$Delete delete(String calendarId, String eventId)"}), @ApiMethod(methodName = "get", description= [...]
 @UriParams
 @Configurer(extended = true)
 public final class CalendarEventsEndpointConfiguration 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 5253e242b46..60d9797c41b 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
@@ -80,7 +80,7 @@
     "acl": { "consumerOnly": false, "producerOnly": false, "description": "The acl collection of methods", "methods": { "delete": { "description": "Deletes an access control rule", "signatures": [ "com.google.api.services.calendar.Calendar$Acl$Delete delete(String calendarId, String ruleId)" ] }, "get": { "description": "Returns an access control rule", "signatures": [ "com.google.api.services.calendar.Calendar$Acl$Get get(String calendarId, String ruleId)" ] }, "insert": { "description" [...]
     "calendars": { "consumerOnly": false, "producerOnly": false, "description": "The calendars collection of methods", "methods": { "clear": { "description": "Clears a primary calendar", "signatures": [ "com.google.api.services.calendar.Calendar$Calendars$Clear clear(String calendarId)" ] }, "delete": { "description": "Deletes a secondary calendar", "signatures": [ "com.google.api.services.calendar.Calendar$Calendars$Delete delete(String calendarId)" ] }, "get": { "description": "Returns [...]
     "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 [...]
+    "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": "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)" ] } } }
diff --git a/components/camel-google/camel-google-drive/pom.xml b/components/camel-google/camel-google-drive/pom.xml
index 28db9cd5d1d..d2e6bcc37c6 100644
--- a/components/camel-google/camel-google-drive/pom.xml
+++ b/components/camel-google/camel-google-drive/pom.xml
@@ -189,6 +189,44 @@
                                     <apiName>drive-files</apiName>
                                     <proxyClass>com.google.api.services.drive.Drive$Files</proxyClass>
                                     <fromJavasource />
+                                    <substitutions>
+                                        <substitution>
+                                            <method>watch|stop</method>
+                                            <argType>com.google.api.services.drive.model.Channel</argType>
+                                            <argName>content</argName>
+                                            <replacement>channel</replacement>
+                                        </substitution>
+                                        <substitution>
+                                            <method>insert</method>
+                                            <argType>com.google.api.services.drive.model.ChildReference</argType>
+                                            <argName>content</argName>
+                                            <replacement>childRef</replacement>
+                                        </substitution>
+                                        <substitution>
+                                            <method>insert|update</method>
+                                            <argType>com.google.api.services.drive.model.Drive</argType>
+                                            <argName>content</argName>
+                                            <replacement>drive</replacement>
+                                        </substitution>
+                                        <substitution>
+                                            <method>insert|patch|update</method>
+                                            <argType>com.google.api.services.drive.model.Comment</argType>
+                                            <argName>content</argName>
+                                            <replacement>comment</replacement>
+                                        </substitution>
+                                        <substitution>
+                                            <method>copy|insert|patch|update</method>
+                                            <argType>com.google.api.services.drive.model.File</argType>
+                                            <argName>content</argName>
+                                            <replacement>file</replacement>
+                                        </substitution>
+                                        <substitution>
+                                            <method>modifyLabels</method>
+                                            <argType>com.google.api.services.drive.model.ModifyLabelsRequest</argType>
+                                            <argName>content</argName>
+                                            <replacement>modifyLabelsRequest</replacement>
+                                        </substitution>
+                                    </substitutions>
                                 </api>
                                 <api>
                                     <apiName>drive-parents</apiName>
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 45bcf7f0290..34252bcf9f6 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
@@ -15,18 +15,18 @@ 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 {
-    @UriParam
-    @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "copy", description="The com.google.api.services.drive.model.File"), @ApiMethod(methodName = "insert", description="The com.google.api.services.drive.model.File media metadata or null if none"), @ApiMethod(methodName = "patch", description="The com.google.api.services.drive.model.File"), @ApiMethod(methodName = "update", description="The com.google.api.services.drive.model.File media metadata or null if none")})
-    private com.google.api.services.drive.model.File content;
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "watch", description="The com.google.api.services.drive.model.Channel")})
-    private com.google.api.services.drive.model.Channel contentChannel;
+    private com.google.api.services.drive.model.Channel channel;
     @UriParam
-    @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "copy", description="The ID of the file to copy"), @ApiMethod(methodName = "delete", description="The ID of the file to delete"), @ApiMethod(methodName = "export", description="The ID of the file"), @ApiMethod(methodName = "get", description="The ID for the file in question"), @ApiMethod(methodName = "patch", description="The ID of the file to update"), @ApiMethod(methodName = "touch", description="The ID of the file t [...]
+    @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "copy", description="The com.google.api.services.drive.model.File"), @ApiMethod(methodName = "insert", description="The com.google.api.services.drive.model.File media metadata or null if none"), @ApiMethod(methodName = "patch", description="The com.google.api.services.drive.model.File"), @ApiMethod(methodName = "update", description="The com.google.api.services.drive.model.File media metadata or null if none")})
+    private com.google.api.services.drive.model.File file;
+    @UriParam
+    @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "copy", description="The ID of the file to copy"), @ApiMethod(methodName = "delete", description="The ID of the file to delete"), @ApiMethod(methodName = "export", description="The ID of the file"), @ApiMethod(methodName = "get", description="The ID for the file in question"), @ApiMethod(methodName = "listLabels", description="The ID of the file"), @ApiMethod(methodName = "modifyLabels", description="The ID of the file [...]
     private String fileId;
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "insert", description="The media HTTP content or null if none"), @ApiMethod(methodName = "update", description="The media HTTP content or null if none")})
@@ -34,21 +34,24 @@ public final class DriveFilesEndpointConfiguration extends GoogleDriveConfigurat
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "export", description="The MIME type of the format requested for this export")})
     private String mimeType;
+    @UriParam
+    @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "modifyLabels", description="The com.google.api.services.drive.model.ModifyLabelsRequest")})
+    private com.google.api.services.drive.model.ModifyLabelsRequest modifyLabelsRequest;
 
-    public com.google.api.services.drive.model.File getContent() {
-        return content;
+    public com.google.api.services.drive.model.Channel getChannel() {
+        return channel;
     }
 
-    public void setContent(com.google.api.services.drive.model.File content) {
-        this.content = content;
+    public void setChannel(com.google.api.services.drive.model.Channel channel) {
+        this.channel = channel;
     }
 
-    public com.google.api.services.drive.model.Channel getContentChannel() {
-        return contentChannel;
+    public com.google.api.services.drive.model.File getFile() {
+        return file;
     }
 
-    public void setContentChannel(com.google.api.services.drive.model.Channel contentChannel) {
-        this.contentChannel = contentChannel;
+    public void setFile(com.google.api.services.drive.model.File file) {
+        this.file = file;
     }
 
     public String getFileId() {
@@ -74,4 +77,12 @@ public final class DriveFilesEndpointConfiguration extends GoogleDriveConfigurat
     public void setMimeType(String mimeType) {
         this.mimeType = mimeType;
     }
+
+    public com.google.api.services.drive.model.ModifyLabelsRequest getModifyLabelsRequest() {
+        return modifyLabelsRequest;
+    }
+
+    public void setModifyLabelsRequest(com.google.api.services.drive.model.ModifyLabelsRequest modifyLabelsRequest) {
+        this.modifyLabelsRequest = modifyLabelsRequest;
+    }
 }
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfigurationConfigurer.java
index 9488f4c4d7b..842b351e492 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/DriveFilesEndpointConfigurationConfigurer.java
@@ -23,15 +23,16 @@ public class DriveFilesEndpointConfigurationConfigurer extends org.apache.camel.
         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("Channel", com.google.api.services.drive.model.Channel.class);
         map.put("ClientId", java.lang.String.class);
         map.put("ClientSecret", java.lang.String.class);
-        map.put("Content", com.google.api.services.drive.model.File.class);
-        map.put("ContentChannel", com.google.api.services.drive.model.Channel.class);
         map.put("Delegate", java.lang.String.class);
+        map.put("File", com.google.api.services.drive.model.File.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("MimeType", java.lang.String.class);
+        map.put("ModifyLabelsRequest", com.google.api.services.drive.model.ModifyLabelsRequest.class);
         map.put("RefreshToken", java.lang.String.class);
         map.put("Scopes", java.util.List.class);
         map.put("ServiceAccountKey", java.lang.String.class);
@@ -48,16 +49,16 @@ public class DriveFilesEndpointConfigurationConfigurer extends org.apache.camel.
         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 "channel":
+        case "Channel": target.setChannel(property(camelContext, com.google.api.services.drive.model.Channel.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 "content":
-        case "Content": target.setContent(property(camelContext, com.google.api.services.drive.model.File.class, value)); return true;
-        case "contentchannel":
-        case "ContentChannel": target.setContentChannel(property(camelContext, com.google.api.services.drive.model.Channel.class, value)); return true;
         case "delegate":
         case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
+        case "file":
+        case "File": target.setFile(property(camelContext, com.google.api.services.drive.model.File.class, value)); return true;
         case "fileid":
         case "FileId": target.setFileId(property(camelContext, java.lang.String.class, value)); return true;
         case "mediacontent":
@@ -66,6 +67,8 @@ public class DriveFilesEndpointConfigurationConfigurer extends org.apache.camel.
         case "MethodName": target.setMethodName(property(camelContext, java.lang.String.class, value)); return true;
         case "mimetype":
         case "MimeType": target.setMimeType(property(camelContext, java.lang.String.class, value)); return true;
+        case "modifylabelsrequest":
+        case "ModifyLabelsRequest": target.setModifyLabelsRequest(property(camelContext, com.google.api.services.drive.model.ModifyLabelsRequest.class, value)); return true;
         case "refreshtoken":
         case "RefreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
         case "scopes":
@@ -90,16 +93,16 @@ public class DriveFilesEndpointConfigurationConfigurer extends org.apache.camel.
         case "ApiName": return org.apache.camel.component.google.drive.internal.GoogleDriveApiName.class;
         case "applicationname":
         case "ApplicationName": return java.lang.String.class;
+        case "channel":
+        case "Channel": return com.google.api.services.drive.model.Channel.class;
         case "clientid":
         case "ClientId": return java.lang.String.class;
         case "clientsecret":
         case "ClientSecret": return java.lang.String.class;
-        case "content":
-        case "Content": return com.google.api.services.drive.model.File.class;
-        case "contentchannel":
-        case "ContentChannel": return com.google.api.services.drive.model.Channel.class;
         case "delegate":
         case "Delegate": return java.lang.String.class;
+        case "file":
+        case "File": return com.google.api.services.drive.model.File.class;
         case "fileid":
         case "FileId": return java.lang.String.class;
         case "mediacontent":
@@ -108,6 +111,8 @@ public class DriveFilesEndpointConfigurationConfigurer extends org.apache.camel.
         case "MethodName": return java.lang.String.class;
         case "mimetype":
         case "MimeType": return java.lang.String.class;
+        case "modifylabelsrequest":
+        case "ModifyLabelsRequest": return com.google.api.services.drive.model.ModifyLabelsRequest.class;
         case "refreshtoken":
         case "RefreshToken": return java.lang.String.class;
         case "scopes":
@@ -128,16 +133,16 @@ public class DriveFilesEndpointConfigurationConfigurer extends org.apache.camel.
         case "ApiName": return target.getApiName();
         case "applicationname":
         case "ApplicationName": return target.getApplicationName();
+        case "channel":
+        case "Channel": return target.getChannel();
         case "clientid":
         case "ClientId": return target.getClientId();
         case "clientsecret":
         case "ClientSecret": return target.getClientSecret();
-        case "content":
-        case "Content": return target.getContent();
-        case "contentchannel":
-        case "ContentChannel": return target.getContentChannel();
         case "delegate":
         case "Delegate": return target.getDelegate();
+        case "file":
+        case "File": return target.getFile();
         case "fileid":
         case "FileId": return target.getFileId();
         case "mediacontent":
@@ -146,6 +151,8 @@ public class DriveFilesEndpointConfigurationConfigurer extends org.apache.camel.
         case "MethodName": return target.getMethodName();
         case "mimetype":
         case "MimeType": return target.getMimeType();
+        case "modifylabelsrequest":
+        case "ModifyLabelsRequest": return target.getModifyLabelsRequest();
         case "refreshtoken":
         case "RefreshToken": return target.getRefreshToken();
         case "scopes":
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriFactory.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriFactory.java
index efbb20d3ed7..1e237e34cca 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriFactory.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriFactory.java
@@ -21,7 +21,7 @@ public class GoogleDriveEndpointUriFactory extends org.apache.camel.support.comp
     private static final Set<String> SECRET_PROPERTY_NAMES;
     private static final Set<String> MULTI_VALUE_PREFIXES;
     static {
-        Set<String> props = new HashSet<>(51);
+        Set<String> props = new HashSet<>(54);
         props.add("accessToken");
         props.add("apiName");
         props.add("appId");
@@ -31,6 +31,7 @@ public class GoogleDriveEndpointUriFactory extends org.apache.camel.support.comp
         props.add("backoffMultiplier");
         props.add("bridgeErrorHandler");
         props.add("changeId");
+        props.add("channel");
         props.add("childId");
         props.add("clientFactory");
         props.add("clientId");
@@ -44,6 +45,7 @@ public class GoogleDriveEndpointUriFactory extends org.apache.camel.support.comp
         props.add("email");
         props.add("exceptionHandler");
         props.add("exchangePattern");
+        props.add("file");
         props.add("fileId");
         props.add("folderId");
         props.add("greedy");
@@ -53,6 +55,7 @@ public class GoogleDriveEndpointUriFactory extends org.apache.camel.support.comp
         props.add("mediaContent");
         props.add("methodName");
         props.add("mimeType");
+        props.add("modifyLabelsRequest");
         props.add("parentId");
         props.add("permissionId");
         props.add("pollStrategy");
diff --git a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveFilesApiMethod.java b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveFilesApiMethod.java
index c03b9ced524..f995dcff254 100644
--- a/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveFilesApiMethod.java
+++ b/components/camel-google/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/internal/DriveFilesApiMethod.java
@@ -23,7 +23,7 @@ public enum DriveFilesApiMethod implements ApiMethod {
         com.google.api.services.drive.Drive.Files.Copy.class,
         "copy",
         arg("fileId", String.class),
-        arg("content", com.google.api.services.drive.model.File.class)),
+        arg("file", com.google.api.services.drive.model.File.class)),
 
     DELETE(
         com.google.api.services.drive.Drive.Files.Delete.class,
@@ -52,23 +52,34 @@ public enum DriveFilesApiMethod implements ApiMethod {
     INSERT(
         com.google.api.services.drive.Drive.Files.Insert.class,
         "insert",
-        arg("content", com.google.api.services.drive.model.File.class)),
+        arg("file", com.google.api.services.drive.model.File.class)),
 
     INSERT_1(
         com.google.api.services.drive.Drive.Files.Insert.class,
         "insert",
-        arg("content", com.google.api.services.drive.model.File.class),
+        arg("file", com.google.api.services.drive.model.File.class),
         arg("mediaContent", com.google.api.client.http.AbstractInputStreamContent.class)),
 
     LIST(
         com.google.api.services.drive.Drive.Files.List.class,
         "list"),
 
+    LIST_LABELS(
+        com.google.api.services.drive.Drive.Files.ListLabels.class,
+        "listLabels",
+        arg("fileId", String.class)),
+
+    MODIFY_LABELS(
+        com.google.api.services.drive.Drive.Files.ModifyLabels.class,
+        "modifyLabels",
+        arg("fileId", String.class),
+        arg("modifyLabelsRequest", com.google.api.services.drive.model.ModifyLabelsRequest.class)),
+
     PATCH(
         com.google.api.services.drive.Drive.Files.Patch.class,
         "patch",
         arg("fileId", String.class),
-        arg("content", com.google.api.services.drive.model.File.class)),
+        arg("file", com.google.api.services.drive.model.File.class)),
 
     TOUCH(
         com.google.api.services.drive.Drive.Files.Touch.class,
@@ -89,20 +100,20 @@ public enum DriveFilesApiMethod implements ApiMethod {
         com.google.api.services.drive.Drive.Files.Update.class,
         "update",
         arg("fileId", String.class),
-        arg("content", com.google.api.services.drive.model.File.class)),
+        arg("file", com.google.api.services.drive.model.File.class)),
 
     UPDATE_1(
         com.google.api.services.drive.Drive.Files.Update.class,
         "update",
         arg("fileId", String.class),
-        arg("content", com.google.api.services.drive.model.File.class),
+        arg("file", com.google.api.services.drive.model.File.class),
         arg("mediaContent", com.google.api.client.http.AbstractInputStreamContent.class)),
 
     WATCH(
         com.google.api.services.drive.Drive.Files.Watch.class,
         "watch",
         arg("fileId", String.class),
-        arg("contentChannel", com.google.api.services.drive.model.Channel.class));
+        arg("channel", com.google.api.services.drive.model.Channel.class));
 
     private final ApiMethod apiMethod;
 
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 e766dc9c12d..ef89165034f 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
@@ -78,7 +78,7 @@
     "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-drives": { "consumerOnly": false, "producerOnly": false, "description": "The drives collection of methods", "methods": { "delete": { "description": "Permanently deletes a shared drive for which the user is an organizer", "signatures": [ "com.google.api.services.drive.Drive$Drives$Delete delete(String driveId)" ] }, "get": { "description": "Gets a shared drive's metadata by ID", "signatures": [ "com.google.api.services.drive.Drive$Drives$Get get(String driveId)" ] }, "hide": {  [...]
-    "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 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 [...]
@@ -93,7 +93,7 @@
     "drive-children": { "methods": { "delete": { "properties": { "childId": { "index": 0, "kind": "parameter", "displayName": "Child Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the child", "optional": false }, "folderId": { "index": 1, "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "s [...]
     "drive-comments": { "methods": { "delete": { "properties": { "commentId": { "index": 0, "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": { "index": 1, "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type":  [...]
     "drive-drives": { "methods": { "delete": { "properties": { "driveId": { "index": 0, "kind": "parameter", "displayName": "Drive Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The ID of the shared drive", "optional": false } } }, "get": { "properties": { "driveId": { "index": 0, "kind": "parameter", "displayName": "Drive Id", "group": "common", "label": " [...]
-    "drive-files": { "methods": { "copy": { "properties": { "content": { "index": 0, "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": { "index": 1, "kind": "parameter", "displayName": "File Id", "group": "common", "la [...]
+    "drive-files": { "methods": { "copy": { "properties": { "file": { "index": 0, "kind": "parameter", "displayName": "File", "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": { "index": 1, "kind": "parameter", "displayName": "File Id", "group": "common", "label":  [...]
     "drive-parents": { "methods": { "delete": { "properties": { "fileId": { "index": 0, "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": { "index": 1, "kind": "parameter", "displayName": "Parent Id", "group": "common", "label": "", "required": false, "type": "strin [...]
     "drive-permissions": { "methods": { "delete": { "properties": { "fileId": { "index": 0, "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": { "index": 1, "kind": "parameter", "displayName": "Permission Id", "group": "common", "label": "", "req [...]
     "drive-properties": { "methods": { "delete": { "properties": { "fileId": { "index": 0, "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": { "index": 1, "kind": "parameter", "displayName": "Property Key", "group": "common", "label": "", "required": false, "type [...]
diff --git a/parent/pom.xml b/parent/pom.xml
index 9846a136bde..5c4c16c73cb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -174,10 +174,10 @@
         <gmavenplus-plugin-version>3.0.0</gmavenplus-plugin-version>
         <google-auth-library-oauth2-http-version>1.19.0</google-auth-library-oauth2-http-version>
         <google-api-client-version>1.35.2</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-drive-version>v2-rev20220709-1.32.1</google-api-services-drive-version>
+        <google-api-services-calendar-version>v3-rev20220715-1.32.1</google-api-services-calendar-version>
         <google-api-services-sheets-version>v4-rev20210629-1.32.1</google-api-services-sheets-version>
-        <google-api-services-mail-version>v1-rev20211108-1.32.1</google-api-services-mail-version>
+        <google-api-services-mail-version>v1-rev20220404-1.32.1</google-api-services-mail-version>
         <google-oauth-client-version>1.34.1</google-oauth-client-version>
         <google-cloud-bom-version>26.19.0</google-cloud-bom-version>
         <google-cloud-functions-bom-version>2.23.0</google-cloud-functions-bom-version>