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 2022/06/24 04:14:05 UTC
[camel] branch main updated: CAMEL-18170 - Renaming keyResource to serviceAccountKey (Google Mail) (#7870)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a6691ed128c CAMEL-18170 - Renaming keyResource to serviceAccountKey (Google Mail) (#7870)
a6691ed128c is described below
commit a6691ed128c894c9c4c458d0288af59442cc6e5e
Author: Rhuan Rocha <rh...@gmail.com>
AuthorDate: Fri Jun 24 01:13:59 2022 -0300
CAMEL-18170 - Renaming keyResource to serviceAccountKey (Google Mail) (#7870)
* Camel-18170 - Updating the Google Calendar component doc
Signed-off-by: Rhuan Rocha <rh...@gmail.com>
* CAMEL-18170 - Renaming keyResource to serviceAccountKey (Google Mail)
Signed-off-by: Rhuan Rocha <rh...@gmail.com>
---
...GmailUsersDraftsEndpointConfigurationConfigurer.java | 14 +++++++-------
.../mail/GmailUsersEndpointConfigurationConfigurer.java | 14 +++++++-------
...mailUsersHistoryEndpointConfigurationConfigurer.java | 14 +++++++-------
...GmailUsersLabelsEndpointConfigurationConfigurer.java | 14 +++++++-------
...sagesAttachmentsEndpointConfigurationConfigurer.java | 14 +++++++-------
...ailUsersMessagesEndpointConfigurationConfigurer.java | 14 +++++++-------
...mailUsersThreadsEndpointConfigurationConfigurer.java | 14 +++++++-------
.../google/mail/GoogleMailComponentConfigurer.java | 14 +++++++-------
.../google/mail/GoogleMailConfigurationConfigurer.java | 14 +++++++-------
.../google/mail/GoogleMailEndpointConfigurer.java | 14 +++++++-------
.../google/mail/GoogleMailEndpointUriFactory.java | 2 +-
.../apache/camel/component/google/mail/google-mail.json | 8 ++++----
.../google/mail/BatchGoogleMailClientFactory.java | 12 +++++++-----
.../component/google/mail/GoogleMailClientFactory.java | 3 ++-
.../component/google/mail/GoogleMailComponent.java | 4 ++--
.../mail/GoogleMailComponentVerifierExtension.java | 4 ++--
.../component/google/mail/GoogleMailConfiguration.java | 17 +++++++++--------
.../google/mail/AbstractGoogleMailTestSupport.java | 2 +-
.../src/test/resources/test-options.properties | 2 +-
19 files changed, 99 insertions(+), 95 deletions(-)
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfigurationConfigurer.java
index d7c7ddecbb4..e38db520259 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersDraftsEndpointConfigurationConfigurer.java
@@ -28,11 +28,11 @@ public class GmailUsersDraftsEndpointConfigurationConfigurer extends org.apache.
map.put("Content", com.google.api.services.gmail.model.Draft.class);
map.put("Delegate", java.lang.String.class);
map.put("Id", java.lang.String.class);
- map.put("KeyResource", 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.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("UserId", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -57,8 +57,6 @@ public class GmailUsersDraftsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
case "id":
case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(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":
@@ -67,6 +65,8 @@ public class GmailUsersDraftsEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext, java.util.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "userid":
case "UserId": target.setUserId(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
@@ -97,8 +97,6 @@ public class GmailUsersDraftsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": return java.lang.String.class;
case "id":
case "Id": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "mediacontent":
case "MediaContent": return com.google.api.client.http.AbstractInputStreamContent.class;
case "methodname":
@@ -107,6 +105,8 @@ public class GmailUsersDraftsEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "userid":
case "UserId": return java.lang.String.class;
default: return null;
@@ -133,8 +133,6 @@ public class GmailUsersDraftsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": return target.getDelegate();
case "id":
case "Id": return target.getId();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "mediacontent":
case "MediaContent": return target.getMediaContent();
case "methodname":
@@ -143,6 +141,8 @@ public class GmailUsersDraftsEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "userid":
case "UserId": return target.getUserId();
default: return null;
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfigurationConfigurer.java
index 41497dd8397..42b0887355c 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersEndpointConfigurationConfigurer.java
@@ -27,10 +27,10 @@ public class GmailUsersEndpointConfigurationConfigurer extends org.apache.camel.
map.put("ClientSecret", java.lang.String.class);
map.put("Content", com.google.api.services.gmail.model.WatchRequest.class);
map.put("Delegate", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("UserId", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -53,14 +53,14 @@ public class GmailUsersEndpointConfigurationConfigurer extends org.apache.camel.
case "Content": target.setContent(property(camelContext, com.google.api.services.gmail.model.WatchRequest.class, value)); return true;
case "delegate":
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.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.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "userid":
case "UserId": target.setUserId(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
@@ -89,14 +89,14 @@ public class GmailUsersEndpointConfigurationConfigurer extends org.apache.camel.
case "Content": return com.google.api.services.gmail.model.WatchRequest.class;
case "delegate":
case "Delegate": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.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.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "userid":
case "UserId": return java.lang.String.class;
default: return null;
@@ -121,14 +121,14 @@ public class GmailUsersEndpointConfigurationConfigurer extends org.apache.camel.
case "Content": return target.getContent();
case "delegate":
case "Delegate": return target.getDelegate();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "refreshtoken":
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "userid":
case "UserId": return target.getUserId();
default: return null;
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfigurationConfigurer.java
index 4ce237d8e65..edb8c7e8dfb 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersHistoryEndpointConfigurationConfigurer.java
@@ -26,10 +26,10 @@ public class GmailUsersHistoryEndpointConfigurationConfigurer extends org.apache
map.put("ClientId", java.lang.String.class);
map.put("ClientSecret", java.lang.String.class);
map.put("Delegate", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("UserId", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -50,14 +50,14 @@ public class GmailUsersHistoryEndpointConfigurationConfigurer extends org.apache
case "ClientSecret": target.setClientSecret(property(camelContext, java.lang.String.class, value)); return true;
case "delegate":
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.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.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "userid":
case "UserId": target.setUserId(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
@@ -84,14 +84,14 @@ public class GmailUsersHistoryEndpointConfigurationConfigurer extends org.apache
case "ClientSecret": return java.lang.String.class;
case "delegate":
case "Delegate": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.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.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "userid":
case "UserId": return java.lang.String.class;
default: return null;
@@ -114,14 +114,14 @@ public class GmailUsersHistoryEndpointConfigurationConfigurer extends org.apache
case "ClientSecret": return target.getClientSecret();
case "delegate":
case "Delegate": return target.getDelegate();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "refreshtoken":
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "userid":
case "UserId": return target.getUserId();
default: return null;
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfigurationConfigurer.java
index bdd2535b1ef..90ef309bfc2 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersLabelsEndpointConfigurationConfigurer.java
@@ -28,10 +28,10 @@ public class GmailUsersLabelsEndpointConfigurationConfigurer extends org.apache.
map.put("Content", com.google.api.services.gmail.model.Label.class);
map.put("Delegate", java.lang.String.class);
map.put("Id", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("UserId", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -56,14 +56,14 @@ public class GmailUsersLabelsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
case "id":
case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.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.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "userid":
case "UserId": target.setUserId(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
@@ -94,14 +94,14 @@ public class GmailUsersLabelsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": return java.lang.String.class;
case "id":
case "Id": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.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.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "userid":
case "UserId": return java.lang.String.class;
default: return null;
@@ -128,14 +128,14 @@ public class GmailUsersLabelsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": return target.getDelegate();
case "id":
case "Id": return target.getId();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "refreshtoken":
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "userid":
case "UserId": return target.getUserId();
default: return null;
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer.java
index 3cde3e57b59..31a6e69c587 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer.java
@@ -27,11 +27,11 @@ public class GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer extend
map.put("ClientSecret", java.lang.String.class);
map.put("Delegate", java.lang.String.class);
map.put("Id", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MessageId", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("UserId", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -54,8 +54,6 @@ public class GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer extend
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
case "id":
case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "messageid":
case "MessageId": target.setMessageId(property(camelContext, java.lang.String.class, value)); return true;
case "methodname":
@@ -64,6 +62,8 @@ public class GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer extend
case "RefreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext, java.util.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "userid":
case "UserId": target.setUserId(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
@@ -92,8 +92,6 @@ public class GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer extend
case "Delegate": return java.lang.String.class;
case "id":
case "Id": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "messageid":
case "MessageId": return java.lang.String.class;
case "methodname":
@@ -102,6 +100,8 @@ public class GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer extend
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "userid":
case "UserId": return java.lang.String.class;
default: return null;
@@ -126,8 +126,6 @@ public class GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer extend
case "Delegate": return target.getDelegate();
case "id":
case "Id": return target.getId();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "messageid":
case "MessageId": return target.getMessageId();
case "methodname":
@@ -136,6 +134,8 @@ public class GmailUsersMessagesAttachmentsEndpointConfigurationConfigurer extend
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "userid":
case "UserId": return target.getUserId();
default: return null;
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfigurationConfigurer.java
index efe8c75275b..e7bdba436d5 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersMessagesEndpointConfigurationConfigurer.java
@@ -30,12 +30,12 @@ public class GmailUsersMessagesEndpointConfigurationConfigurer extends org.apach
map.put("Content", com.google.api.services.gmail.model.Message.class);
map.put("Delegate", java.lang.String.class);
map.put("Id", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MediaContent", com.google.api.client.http.AbstractInputStreamContent.class);
map.put("MethodName", java.lang.String.class);
map.put("ModifyMessageRequest", com.google.api.services.gmail.model.ModifyMessageRequest.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("UserId", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -64,8 +64,6 @@ public class GmailUsersMessagesEndpointConfigurationConfigurer extends org.apach
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
case "id":
case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(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":
@@ -76,6 +74,8 @@ public class GmailUsersMessagesEndpointConfigurationConfigurer extends org.apach
case "RefreshToken": target.setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext, java.util.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "userid":
case "UserId": target.setUserId(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
@@ -110,8 +110,6 @@ public class GmailUsersMessagesEndpointConfigurationConfigurer extends org.apach
case "Delegate": return java.lang.String.class;
case "id":
case "Id": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "mediacontent":
case "MediaContent": return com.google.api.client.http.AbstractInputStreamContent.class;
case "methodname":
@@ -122,6 +120,8 @@ public class GmailUsersMessagesEndpointConfigurationConfigurer extends org.apach
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "userid":
case "UserId": return java.lang.String.class;
default: return null;
@@ -152,8 +152,6 @@ public class GmailUsersMessagesEndpointConfigurationConfigurer extends org.apach
case "Delegate": return target.getDelegate();
case "id":
case "Id": return target.getId();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "mediacontent":
case "MediaContent": return target.getMediaContent();
case "methodname":
@@ -164,6 +162,8 @@ public class GmailUsersMessagesEndpointConfigurationConfigurer extends org.apach
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "userid":
case "UserId": return target.getUserId();
default: return null;
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfigurationConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfigurationConfigurer.java
index 2fd36d9410e..88bf8907ff2 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GmailUsersThreadsEndpointConfigurationConfigurer.java
@@ -28,10 +28,10 @@ public class GmailUsersThreadsEndpointConfigurationConfigurer extends org.apache
map.put("Content", com.google.api.services.gmail.model.ModifyThreadRequest.class);
map.put("Delegate", java.lang.String.class);
map.put("Id", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("UserId", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -56,14 +56,14 @@ public class GmailUsersThreadsEndpointConfigurationConfigurer extends org.apache
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
case "id":
case "Id": target.setId(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.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.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "userid":
case "UserId": target.setUserId(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
@@ -94,14 +94,14 @@ public class GmailUsersThreadsEndpointConfigurationConfigurer extends org.apache
case "Delegate": return java.lang.String.class;
case "id":
case "Id": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.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.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "userid":
case "UserId": return java.lang.String.class;
default: return null;
@@ -128,14 +128,14 @@ public class GmailUsersThreadsEndpointConfigurationConfigurer extends org.apache
case "Delegate": return target.getDelegate();
case "id":
case "Id": return target.getId();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "refreshtoken":
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "userid":
case "UserId": return target.getUserId();
default: return null;
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailComponentConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailComponentConfigurer.java
index 0332b34ed94..a6788eff752 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailComponentConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailComponentConfigurer.java
@@ -31,8 +31,8 @@ public class GoogleMailComponentConfigurer extends PropertyConfigurerSupport imp
map.put("clientFactory", org.apache.camel.component.google.mail.GoogleMailClientFactory.class);
map.put("accessToken", java.lang.String.class);
map.put("clientSecret", java.lang.String.class);
- map.put("keyResource", java.lang.String.class);
map.put("refreshToken", java.lang.String.class);
+ map.put("serviceAccountKey", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -63,13 +63,13 @@ public class GoogleMailComponentConfigurer extends PropertyConfigurerSupport imp
case "clientSecret": getOrCreateConfiguration(target).setClientSecret(property(camelContext, java.lang.String.class, value)); return true;
case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.google.mail.GoogleMailConfiguration.class, value)); return true;
case "delegate": getOrCreateConfiguration(target).setDelegate(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "keyResource": getOrCreateConfiguration(target).setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
case "refreshtoken":
case "refreshToken": getOrCreateConfiguration(target).setRefreshToken(property(camelContext, java.lang.String.class, value)); return true;
case "scopes": getOrCreateConfiguration(target).setScopes(property(camelContext, java.util.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey": getOrCreateConfiguration(target).setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
}
}
@@ -98,13 +98,13 @@ public class GoogleMailComponentConfigurer extends PropertyConfigurerSupport imp
case "clientSecret": return java.lang.String.class;
case "configuration": return org.apache.camel.component.google.mail.GoogleMailConfiguration.class;
case "delegate": return java.lang.String.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
case "refreshtoken":
case "refreshToken": return java.lang.String.class;
case "scopes": return java.util.Collection.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
default: return null;
}
}
@@ -129,13 +129,13 @@ public class GoogleMailComponentConfigurer extends PropertyConfigurerSupport imp
case "clientSecret": return getOrCreateConfiguration(target).getClientSecret();
case "configuration": return target.getConfiguration();
case "delegate": return getOrCreateConfiguration(target).getDelegate();
- case "keyresource":
- case "keyResource": return getOrCreateConfiguration(target).getKeyResource();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
case "refreshtoken":
case "refreshToken": return getOrCreateConfiguration(target).getRefreshToken();
case "scopes": return getOrCreateConfiguration(target).getScopes();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return getOrCreateConfiguration(target).getServiceAccountKey();
default: return null;
}
}
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailConfigurationConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailConfigurationConfigurer.java
index fa4432b8cf5..21131c9cc35 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailConfigurationConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailConfigurationConfigurer.java
@@ -26,10 +26,10 @@ public class GoogleMailConfigurationConfigurer extends org.apache.camel.support.
map.put("ClientId", java.lang.String.class);
map.put("ClientSecret", java.lang.String.class);
map.put("Delegate", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.Collection.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -49,14 +49,14 @@ public class GoogleMailConfigurationConfigurer extends org.apache.camel.support.
case "ClientSecret": target.setClientSecret(property(camelContext, java.lang.String.class, value)); return true;
case "delegate":
case "Delegate": target.setDelegate(property(camelContext, java.lang.String.class, value)); return true;
- case "keyresource":
- case "KeyResource": target.setKeyResource(property(camelContext, java.lang.String.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.Collection.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": target.setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
default: return false;
}
}
@@ -81,14 +81,14 @@ public class GoogleMailConfigurationConfigurer extends org.apache.camel.support.
case "ClientSecret": return java.lang.String.class;
case "delegate":
case "Delegate": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.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.Collection.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
default: return null;
}
}
@@ -109,14 +109,14 @@ public class GoogleMailConfigurationConfigurer extends org.apache.camel.support.
case "ClientSecret": return target.getClientSecret();
case "delegate":
case "Delegate": return target.getDelegate();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "refreshtoken":
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
default: return null;
}
}
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointConfigurer.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointConfigurer.java
index 881fb4db51b..0f3632dd4bc 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointConfigurer.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointConfigurer.java
@@ -49,8 +49,8 @@ public class GoogleMailEndpointConfigurer extends PropertyConfigurerSupport impl
map.put("useFixedDelay", boolean.class);
map.put("accessToken", java.lang.String.class);
map.put("clientSecret", java.lang.String.class);
- map.put("keyResource", java.lang.String.class);
map.put("refreshToken", java.lang.String.class);
+ map.put("serviceAccountKey", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -85,8 +85,6 @@ public class GoogleMailEndpointConfigurer extends PropertyConfigurerSupport impl
case "inBody": target.setInBody(property(camelContext, java.lang.String.class, value)); return true;
case "initialdelay":
case "initialDelay": target.setInitialDelay(property(camelContext, long.class, value)); return true;
- case "keyresource":
- case "keyResource": target.getConfiguration().setKeyResource(property(camelContext, java.lang.String.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
case "pollstrategy":
@@ -105,6 +103,8 @@ public class GoogleMailEndpointConfigurer extends PropertyConfigurerSupport impl
case "scopes": target.getConfiguration().setScopes(property(camelContext, java.util.Collection.class, value)); return true;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": target.setSendEmptyMessageWhenIdle(property(camelContext, boolean.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey": target.getConfiguration().setServiceAccountKey(property(camelContext, java.lang.String.class, value)); return true;
case "startscheduler":
case "startScheduler": target.setStartScheduler(property(camelContext, boolean.class, value)); return true;
case "timeunit":
@@ -150,8 +150,6 @@ public class GoogleMailEndpointConfigurer extends PropertyConfigurerSupport impl
case "inBody": return java.lang.String.class;
case "initialdelay":
case "initialDelay": return long.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
case "pollstrategy":
@@ -170,6 +168,8 @@ public class GoogleMailEndpointConfigurer extends PropertyConfigurerSupport impl
case "scopes": return java.util.Collection.class;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return boolean.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
case "startscheduler":
case "startScheduler": return boolean.class;
case "timeunit":
@@ -211,8 +211,6 @@ public class GoogleMailEndpointConfigurer extends PropertyConfigurerSupport impl
case "inBody": return target.getInBody();
case "initialdelay":
case "initialDelay": return target.getInitialDelay();
- case "keyresource":
- case "keyResource": return target.getConfiguration().getKeyResource();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
case "pollstrategy":
@@ -231,6 +229,8 @@ public class GoogleMailEndpointConfigurer extends PropertyConfigurerSupport impl
case "scopes": return target.getConfiguration().getScopes();
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return target.isSendEmptyMessageWhenIdle();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return target.getConfiguration().getServiceAccountKey();
case "startscheduler":
case "startScheduler": return target.isStartScheduler();
case "timeunit":
diff --git a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriFactory.java b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriFactory.java
index d0c30ca7781..95d1fde7c27 100644
--- a/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriFactory.java
+++ b/components/camel-google/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriFactory.java
@@ -42,7 +42,6 @@ public class GoogleMailEndpointUriFactory extends org.apache.camel.support.compo
props.add("id");
props.add("inBody");
props.add("initialDelay");
- props.add("keyResource");
props.add("lazyStartProducer");
props.add("mediaContent");
props.add("messageId");
@@ -57,6 +56,7 @@ public class GoogleMailEndpointUriFactory extends org.apache.camel.support.compo
props.add("schedulerProperties");
props.add("scopes");
props.add("sendEmptyMessageWhenIdle");
+ props.add("serviceAccountKey");
props.add("startScheduler");
props.add("timeUnit");
props.add("useFixedDelay");
diff --git a/components/camel-google/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json b/components/camel-google/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
index e398ae00545..03cd484f116 100644
--- a/components/camel-google/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
+++ b/components/camel-google/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
@@ -34,8 +34,8 @@
"clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.mail.GoogleMailClientFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use the GoogleCalendarClientFactory as factory for creating the client. Will by default use BatchGoogleMailClientFactory" },
"accessToken": { "kind": "property", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." },
"clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "Client secret of the mail application" },
- "keyResource": { "kind": "property", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the [...]
+ "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.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the [...]
+ "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "Service account key in json format to authenticate an application as a service account. Accept [...]
},
"properties": {
"apiName": { "kind": "path", "displayName": "Api Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.google.mail.internal.GoogleMailApiName", "enum": [ "THREADS", "MESSAGES", "ATTACHMENTS", "LABELS", "HISTORY", "DRAFTS", "USERS" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "c [...]
@@ -67,8 +67,8 @@
"useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
"accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage." },
"clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "Client secret of the mail application" },
- "keyResource": { "kind": "parameter", "displayName": "Key Resource", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "Sets .json file with credentials for Service account" },
- "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the [...]
+ "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the [...]
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "Service account key in json format to authenticate an application as a service account. Accept [...]
},
"apis": {
"attachments": { "consumerOnly": false, "producerOnly": false, "description": "The attachments collection of methods", "methods": { "get": { "description": "Gets the specified message attachment", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Attachments$Get get(String userId, String messageId, String id)" ] } } },
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
index b3fa0ef62ce..866939818d4 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java
@@ -71,12 +71,13 @@ public class BatchGoogleMailClientFactory implements GoogleMailClientFactory {
@Override
public Gmail makeClient(
- CamelContext camelContext, String keyResource, Collection<String> scopes, String applicationName, String delegate) {
- if (keyResource == null) {
+ CamelContext camelContext, String serviceAccountKey, Collection<String> scopes, String applicationName,
+ String delegate) {
+ if (serviceAccountKey == null) {
throw new IllegalArgumentException("keyResource is required to create Gmail client.");
}
try {
- Credential credential = authorizeServiceAccount(camelContext, keyResource, delegate, scopes);
+ Credential credential = authorizeServiceAccount(camelContext, serviceAccountKey, delegate, scopes);
return new Gmail.Builder(transport, jsonFactory, credential).setApplicationName(applicationName).build();
} catch (Exception e) {
throw new RuntimeCamelException("Could not create Gmail client.", e);
@@ -84,11 +85,12 @@ public class BatchGoogleMailClientFactory implements GoogleMailClientFactory {
}
private Credential authorizeServiceAccount(
- CamelContext camelContext, String keyResource, String delegate, Collection<String> scopes) {
+ CamelContext camelContext, String serviceAccountKey, String delegate, Collection<String> scopes) {
// authorize
try {
GoogleCredential cred = GoogleCredential
- .fromStream(ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext, keyResource), transport,
+ .fromStream(ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext, serviceAccountKey),
+ transport,
jsonFactory)
.createScoped(scopes != null && scopes.size() != 0 ? scopes : null)
.createDelegated(delegate);
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailClientFactory.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailClientFactory.java
index e4cd9ad46a7..96a60a2ccd7 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailClientFactory.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailClientFactory.java
@@ -28,5 +28,6 @@ public interface GoogleMailClientFactory {
String accessToken);
Gmail makeClient(
- CamelContext camelContext, String keyResource, Collection<String> scopes, String applicationName, String delegate);
+ CamelContext camelContext, String serviceAccountKey, Collection<String> scopes, String applicationName,
+ String delegate);
}
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
index e05a8e187ea..fb6bbb16a74 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java
@@ -58,8 +58,8 @@ public class GoogleMailComponent
client = getClientFactory().makeClient(config.getClientId(),
config.getClientSecret(), config.getScopes(),
config.getApplicationName(), config.getRefreshToken(), config.getAccessToken());
- } else if (config.getKeyResource() != null && !config.getKeyResource().isBlank()) {
- client = getClientFactory().makeClient(getCamelContext(), config.getKeyResource(),
+ } else if (config.getServiceAccountKey() != null && !config.getServiceAccountKey().isBlank()) {
+ client = getClientFactory().makeClient(getCamelContext(), config.getServiceAccountKey(),
config.getScopes(), config.getApplicationName(), config.getDelegate());
} else {
throw new IllegalArgumentException(
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtension.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtension.java
index 4f76c9c70e6..23ced87e5e6 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtension.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponentVerifierExtension.java
@@ -66,8 +66,8 @@ public class GoogleMailComponentVerifierExtension extends DefaultComponentVerifi
client = clientFactory.makeClient(configuration.getClientId(), configuration.getClientSecret(),
configuration.getScopes(), configuration.getApplicationName(),
configuration.getRefreshToken(), configuration.getAccessToken());
- } else if (configuration.getKeyResource() != null) {
- client = clientFactory.makeClient(getCamelContext(), configuration.getKeyResource(),
+ } else if (configuration.getServiceAccountKey() != null) {
+ client = clientFactory.makeClient(getCamelContext(), configuration.getServiceAccountKey(),
configuration.getScopes(), configuration.getApplicationName(), configuration.getDelegate());
}
client.users().getProfile((String) parameters.get("userId")).execute();
diff --git a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
index 7b99a497a57..e42e28840af 100644
--- a/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
+++ b/components/camel-google/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
@@ -49,7 +49,7 @@ public class GoogleMailConfiguration {
private String applicationName;
/* Service account */
@UriParam(label = "security")
- private String keyResource;
+ private String serviceAccountKey;
@UriParam
private String delegate;
@UriParam
@@ -133,17 +133,18 @@ public class GoogleMailConfiguration {
this.applicationName = applicationName;
}
- public String getKeyResource() {
- return keyResource;
+ public String getServiceAccountKey() {
+ return serviceAccountKey;
}
/**
- * Sets "*.json" file with credentials for Service account
- *
- * @param keyResource String file, classpath, or http url
+ * Service account key in json format to authenticate an application as a service account. Accept base64 adding the
+ * prefix "base64:"
+ *
+ * @param serviceAccountKey String file, classpath, base64, or http url
*/
- public void setKeyResource(String keyResource) {
- this.keyResource = keyResource;
+ public void setServiceAccountKey(String serviceAccountKey) {
+ this.serviceAccountKey = serviceAccountKey;
}
public String getDelegate() {
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java
index 7715a9862c0..1dfbeebbc5a 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/AbstractGoogleMailTestSupport.java
@@ -57,7 +57,7 @@ public class AbstractGoogleMailTestSupport extends CamelTestSupport {
return !properties.getProperty("clientId", "").isEmpty()
&& !properties.getProperty("clientSecret", "").isEmpty()
&& !properties.getProperty("accessToken", "").isEmpty()
- || !properties.getProperty("keyResource", "").isEmpty();
+ || !properties.getProperty("serviceAccountKey", "").isEmpty();
}
@Override
diff --git a/components/camel-google/camel-google-mail/src/test/resources/test-options.properties b/components/camel-google/camel-google-mail/src/test/resources/test-options.properties
index 1131bc16c44..4b1c29bb12f 100644
--- a/components/camel-google/camel-google-mail/src/test/resources/test-options.properties
+++ b/components/camel-google/camel-google-mail/src/test/resources/test-options.properties
@@ -25,6 +25,6 @@ applicationName=test
accessToken=
refreshToken=
-keyResource=
+serviceAccountKey=
scopes[]=
delegate=
\ No newline at end of file