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 e728bc645e1 Camel 18170 - Renaming keyResource to serviceAccountKey
to camel-google-calendar (#7799)
e728bc645e1 is described below
commit e728bc645e19253401cd4a0aa734570f1d33ddd6
Author: Rhuan Rocha <[email protected]>
AuthorDate: Wed Jun 15 16:20:40 2022 -0300
Camel 18170 - Renaming keyResource to serviceAccountKey to
camel-google-calendar (#7799)
* CAMEL-18170 - Renaming keyResource to serviceAccountKey
Signed-off-by: Rhuan Rocha <[email protected]>
* CAMEL-18170 - Renaming keyResource to serviceAccountKey
Signed-off-by: Rhuan Rocha <[email protected]>
---
.../CalendarAclEndpointConfigurationConfigurer.java | 14 +++++++-------
...ndarCalendarListEndpointConfigurationConfigurer.java | 14 +++++++-------
...alendarCalendarsEndpointConfigurationConfigurer.java | 14 +++++++-------
...CalendarChannelsEndpointConfigurationConfigurer.java | 14 +++++++-------
.../CalendarColorsEndpointConfigurationConfigurer.java | 14 +++++++-------
.../CalendarEventsEndpointConfigurationConfigurer.java | 14 +++++++-------
...CalendarFreebusyEndpointConfigurationConfigurer.java | 14 +++++++-------
...CalendarSettingsEndpointConfigurationConfigurer.java | 14 +++++++-------
.../calendar/GoogleCalendarComponentConfigurer.java | 14 +++++++-------
.../calendar/GoogleCalendarConfigurationConfigurer.java | 14 +++++++-------
.../calendar/GoogleCalendarEndpointConfigurer.java | 14 +++++++-------
.../calendar/GoogleCalendarEndpointUriFactory.java | 2 +-
.../stream/GoogleCalendarStreamComponentConfigurer.java | 12 ++++++------
.../stream/GoogleCalendarStreamEndpointConfigurer.java | 12 ++++++------
.../stream/GoogleCalendarStreamEndpointUriFactory.java | 2 +-
.../component/google/calendar/google-calendar.json | 4 ++--
.../google/calendar/stream/google-calendar-stream.json | 4 ++--
.../calendar/BatchGoogleCalendarClientFactory.java | 12 +++++++-----
.../google/calendar/GoogleCalendarClientFactory.java | 3 ++-
.../google/calendar/GoogleCalendarComponent.java | 4 ++--
.../google/calendar/GoogleCalendarConfiguration.java | 17 +++++++++--------
.../calendar/stream/GoogleCalendarStreamComponent.java | 4 ++--
.../stream/GoogleCalendarStreamConfiguration.java | 17 +++++++++--------
.../calendar/AbstractGoogleCalendarTestSupport.java | 2 +-
.../src/test/resources/test-options.properties | 2 +-
25 files changed, 128 insertions(+), 123 deletions(-)
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfigurationConfigurer.java
index 5163eccceb8..e09148165f3 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarAclEndpointConfigurationConfigurer.java
@@ -30,12 +30,12 @@ public class CalendarAclEndpointConfigurationConfigurer
extends org.apache.camel
map.put("ContentChannel",
com.google.api.services.calendar.model.Channel.class);
map.put("Delegate", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("RuleId", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -64,8 +64,6 @@ public class CalendarAclEndpointConfigurationConfigurer
extends org.apache.camel
case "Delegate": target.setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "EmailAddress": target.setEmailAddress(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 "p12filename":
@@ -76,6 +74,8 @@ public class CalendarAclEndpointConfigurationConfigurer
extends org.apache.camel
case "RuleId": target.setRuleId(property(camelContext,
java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext,
java.util.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "user":
case "User": target.setUser(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -110,8 +110,6 @@ public class CalendarAclEndpointConfigurationConfigurer
extends org.apache.camel
case "Delegate": return java.lang.String.class;
case "emailaddress":
case "EmailAddress": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -122,6 +120,8 @@ public class CalendarAclEndpointConfigurationConfigurer
extends org.apache.camel
case "RuleId": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "user":
case "User": return java.lang.String.class;
default: return null;
@@ -152,8 +152,6 @@ public class CalendarAclEndpointConfigurationConfigurer
extends org.apache.camel
case "Delegate": return target.getDelegate();
case "emailaddress":
case "EmailAddress": return target.getEmailAddress();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -164,6 +162,8 @@ public class CalendarAclEndpointConfigurationConfigurer
extends org.apache.camel
case "RuleId": return target.getRuleId();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "user":
case "User": return target.getUser();
default: return null;
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfigurationConfigurer.java
index a15dde505ac..cec6dcbc4c4 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarListEndpointConfigurationConfigurer.java
@@ -30,11 +30,11 @@ public class
CalendarCalendarListEndpointConfigurationConfigurer extends org.apa
map.put("ContentChannel",
com.google.api.services.calendar.model.Channel.class);
map.put("Delegate", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -63,8 +63,6 @@ public class
CalendarCalendarListEndpointConfigurationConfigurer extends org.apa
case "Delegate": target.setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "EmailAddress": target.setEmailAddress(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 "p12filename":
@@ -73,6 +71,8 @@ public class
CalendarCalendarListEndpointConfigurationConfigurer extends org.apa
case "RefreshToken": target.setRefreshToken(property(camelContext,
java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext,
java.util.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "user":
case "User": target.setUser(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -107,8 +107,6 @@ public class
CalendarCalendarListEndpointConfigurationConfigurer extends org.apa
case "Delegate": return java.lang.String.class;
case "emailaddress":
case "EmailAddress": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -117,6 +115,8 @@ public class
CalendarCalendarListEndpointConfigurationConfigurer extends org.apa
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "user":
case "User": return java.lang.String.class;
default: return null;
@@ -147,8 +147,6 @@ public class
CalendarCalendarListEndpointConfigurationConfigurer extends org.apa
case "Delegate": return target.getDelegate();
case "emailaddress":
case "EmailAddress": return target.getEmailAddress();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -157,6 +155,8 @@ public class
CalendarCalendarListEndpointConfigurationConfigurer extends org.apa
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "user":
case "User": return target.getUser();
default: return null;
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfigurationConfigurer.java
index a2f687cece8..249744899b3 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarCalendarsEndpointConfigurationConfigurer.java
@@ -29,11 +29,11 @@ public class
CalendarCalendarsEndpointConfigurationConfigurer extends org.apache
map.put("Content",
com.google.api.services.calendar.model.Calendar.class);
map.put("Delegate", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -60,8 +60,6 @@ public class CalendarCalendarsEndpointConfigurationConfigurer
extends org.apache
case "Delegate": target.setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "EmailAddress": target.setEmailAddress(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 "p12filename":
@@ -70,6 +68,8 @@ public class CalendarCalendarsEndpointConfigurationConfigurer
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.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "user":
case "User": target.setUser(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -102,8 +102,6 @@ public class
CalendarCalendarsEndpointConfigurationConfigurer extends org.apache
case "Delegate": return java.lang.String.class;
case "emailaddress":
case "EmailAddress": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -112,6 +110,8 @@ public class
CalendarCalendarsEndpointConfigurationConfigurer extends org.apache
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "user":
case "User": return java.lang.String.class;
default: return null;
@@ -140,8 +140,6 @@ public class
CalendarCalendarsEndpointConfigurationConfigurer extends org.apache
case "Delegate": return target.getDelegate();
case "emailaddress":
case "EmailAddress": return target.getEmailAddress();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -150,6 +148,8 @@ public class
CalendarCalendarsEndpointConfigurationConfigurer extends org.apache
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "user":
case "User": return target.getUser();
default: return null;
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfigurationConfigurer.java
index 36e51cb28d1..756759d947d 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarChannelsEndpointConfigurationConfigurer.java
@@ -28,11 +28,11 @@ public class
CalendarChannelsEndpointConfigurationConfigurer extends org.apache.
map.put("ContentChannel",
com.google.api.services.calendar.model.Channel.class);
map.put("Delegate", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -57,8 +57,6 @@ public class CalendarChannelsEndpointConfigurationConfigurer
extends org.apache.
case "Delegate": target.setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "EmailAddress": target.setEmailAddress(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 "p12filename":
@@ -67,6 +65,8 @@ public class CalendarChannelsEndpointConfigurationConfigurer
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.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "user":
case "User": target.setUser(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -97,8 +97,6 @@ public class CalendarChannelsEndpointConfigurationConfigurer
extends org.apache.
case "Delegate": return java.lang.String.class;
case "emailaddress":
case "EmailAddress": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -107,6 +105,8 @@ public class
CalendarChannelsEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "user":
case "User": return java.lang.String.class;
default: return null;
@@ -133,8 +133,6 @@ public class
CalendarChannelsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": return target.getDelegate();
case "emailaddress":
case "EmailAddress": return target.getEmailAddress();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -143,6 +141,8 @@ public class
CalendarChannelsEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "user":
case "User": return target.getUser();
default: return null;
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfigurationConfigurer.java
index 2bdd3526d85..b0e74d1d683 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarColorsEndpointConfigurationConfigurer.java
@@ -27,11 +27,11 @@ public class CalendarColorsEndpointConfigurationConfigurer
extends org.apache.ca
map.put("ClientSecret", java.lang.String.class);
map.put("Delegate", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -54,8 +54,6 @@ public class CalendarColorsEndpointConfigurationConfigurer
extends org.apache.ca
case "Delegate": target.setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "EmailAddress": target.setEmailAddress(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 "p12filename":
@@ -64,6 +62,8 @@ public class CalendarColorsEndpointConfigurationConfigurer
extends org.apache.ca
case "RefreshToken": target.setRefreshToken(property(camelContext,
java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext,
java.util.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "user":
case "User": target.setUser(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -92,8 +92,6 @@ public class CalendarColorsEndpointConfigurationConfigurer
extends org.apache.ca
case "Delegate": return java.lang.String.class;
case "emailaddress":
case "EmailAddress": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -102,6 +100,8 @@ public class CalendarColorsEndpointConfigurationConfigurer
extends org.apache.ca
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "user":
case "User": return java.lang.String.class;
default: return null;
@@ -126,8 +126,6 @@ public class CalendarColorsEndpointConfigurationConfigurer
extends org.apache.ca
case "Delegate": return target.getDelegate();
case "emailaddress":
case "EmailAddress": return target.getEmailAddress();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -136,6 +134,8 @@ public class CalendarColorsEndpointConfigurationConfigurer
extends org.apache.ca
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "user":
case "User": return target.getUser();
default: return null;
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfigurationConfigurer.java
index ce4bec171c2..243d4dd2ade 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarEventsEndpointConfigurationConfigurer.java
@@ -32,11 +32,11 @@ public class CalendarEventsEndpointConfigurationConfigurer
extends org.apache.ca
map.put("Destination", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
map.put("EventId", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("Text", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
@@ -70,8 +70,6 @@ public class CalendarEventsEndpointConfigurationConfigurer
extends org.apache.ca
case "EmailAddress": target.setEmailAddress(property(camelContext,
java.lang.String.class, value)); return true;
case "eventid":
case "EventId": target.setEventId(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 "p12filename":
@@ -80,6 +78,8 @@ public class CalendarEventsEndpointConfigurationConfigurer
extends org.apache.ca
case "RefreshToken": target.setRefreshToken(property(camelContext,
java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext,
java.util.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "text":
case "Text": target.setText(property(camelContext,
java.lang.String.class, value)); return true;
case "user":
@@ -120,8 +120,6 @@ public class CalendarEventsEndpointConfigurationConfigurer
extends org.apache.ca
case "EmailAddress": return java.lang.String.class;
case "eventid":
case "EventId": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -130,6 +128,8 @@ public class CalendarEventsEndpointConfigurationConfigurer
extends org.apache.ca
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "text":
case "Text": return java.lang.String.class;
case "user":
@@ -166,8 +166,6 @@ public class CalendarEventsEndpointConfigurationConfigurer
extends org.apache.ca
case "EmailAddress": return target.getEmailAddress();
case "eventid":
case "EventId": return target.getEventId();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -176,6 +174,8 @@ public class CalendarEventsEndpointConfigurationConfigurer
extends org.apache.ca
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "text":
case "Text": return target.getText();
case "user":
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfigurationConfigurer.java
index 31971525409..fcc923f4bac 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarFreebusyEndpointConfigurationConfigurer.java
@@ -28,11 +28,11 @@ public class
CalendarFreebusyEndpointConfigurationConfigurer extends org.apache.
map.put("Content",
com.google.api.services.calendar.model.FreeBusyRequest.class);
map.put("Delegate", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -57,8 +57,6 @@ public class CalendarFreebusyEndpointConfigurationConfigurer
extends org.apache.
case "Delegate": target.setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "EmailAddress": target.setEmailAddress(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 "p12filename":
@@ -67,6 +65,8 @@ public class CalendarFreebusyEndpointConfigurationConfigurer
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.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "user":
case "User": target.setUser(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -97,8 +97,6 @@ public class CalendarFreebusyEndpointConfigurationConfigurer
extends org.apache.
case "Delegate": return java.lang.String.class;
case "emailaddress":
case "EmailAddress": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -107,6 +105,8 @@ public class
CalendarFreebusyEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "user":
case "User": return java.lang.String.class;
default: return null;
@@ -133,8 +133,6 @@ public class
CalendarFreebusyEndpointConfigurationConfigurer extends org.apache.
case "Delegate": return target.getDelegate();
case "emailaddress":
case "EmailAddress": return target.getEmailAddress();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -143,6 +141,8 @@ public class
CalendarFreebusyEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "user":
case "User": return target.getUser();
default: return null;
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfigurationConfigurer.java
index a3b2784ed59..38ba8375d88 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/CalendarSettingsEndpointConfigurationConfigurer.java
@@ -28,11 +28,11 @@ public class
CalendarSettingsEndpointConfigurationConfigurer extends org.apache.
map.put("ContentChannel",
com.google.api.services.calendar.model.Channel.class);
map.put("Delegate", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("Setting", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
@@ -58,8 +58,6 @@ public class CalendarSettingsEndpointConfigurationConfigurer
extends org.apache.
case "Delegate": target.setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "EmailAddress": target.setEmailAddress(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 "p12filename":
@@ -68,6 +66,8 @@ public class CalendarSettingsEndpointConfigurationConfigurer
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.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "setting":
case "Setting": target.setSetting(property(camelContext,
java.lang.String.class, value)); return true;
case "user":
@@ -100,8 +100,6 @@ public class
CalendarSettingsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": return java.lang.String.class;
case "emailaddress":
case "EmailAddress": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -110,6 +108,8 @@ public class
CalendarSettingsEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "setting":
case "Setting": return java.lang.String.class;
case "user":
@@ -138,8 +138,6 @@ public class
CalendarSettingsEndpointConfigurationConfigurer extends org.apache.
case "Delegate": return target.getDelegate();
case "emailaddress":
case "EmailAddress": return target.getEmailAddress();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -148,6 +146,8 @@ public class
CalendarSettingsEndpointConfigurationConfigurer extends org.apache.
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "setting":
case "Setting": return target.getSetting();
case "user":
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarComponentConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarComponentConfigurer.java
index 3308285273d..abd6bfa10e4 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarComponentConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarComponentConfigurer.java
@@ -32,9 +32,9 @@ public class GoogleCalendarComponentConfigurer extends
PropertyConfigurerSupport
map.put("accessToken", java.lang.String.class);
map.put("clientSecret", java.lang.String.class);
map.put("emailAddress", java.lang.String.class);
- map.put("keyResource", java.lang.String.class);
map.put("p12FileName", java.lang.String.class);
map.put("refreshToken", java.lang.String.class);
+ map.put("serviceAccountKey", java.lang.String.class);
map.put("user", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -68,8 +68,6 @@ public class GoogleCalendarComponentConfigurer extends
PropertyConfigurerSupport
case "delegate":
getOrCreateConfiguration(target).setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "emailAddress":
getOrCreateConfiguration(target).setEmailAddress(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 "p12filename":
@@ -77,6 +75,8 @@ public class GoogleCalendarComponentConfigurer extends
PropertyConfigurerSupport
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.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey":
getOrCreateConfiguration(target).setServiceAccountKey(property(camelContext,
java.lang.String.class, value)); return true;
case "user":
getOrCreateConfiguration(target).setUser(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
}
@@ -108,8 +108,6 @@ public class GoogleCalendarComponentConfigurer extends
PropertyConfigurerSupport
case "delegate": return java.lang.String.class;
case "emailaddress":
case "emailAddress": return java.lang.String.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
case "p12filename":
@@ -117,6 +115,8 @@ public class GoogleCalendarComponentConfigurer extends
PropertyConfigurerSupport
case "refreshtoken":
case "refreshToken": return java.lang.String.class;
case "scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
case "user": return java.lang.String.class;
default: return null;
}
@@ -144,8 +144,6 @@ public class GoogleCalendarComponentConfigurer extends
PropertyConfigurerSupport
case "delegate": return getOrCreateConfiguration(target).getDelegate();
case "emailaddress":
case "emailAddress": return
getOrCreateConfiguration(target).getEmailAddress();
- case "keyresource":
- case "keyResource": return
getOrCreateConfiguration(target).getKeyResource();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
case "p12filename":
@@ -153,6 +151,8 @@ public class GoogleCalendarComponentConfigurer extends
PropertyConfigurerSupport
case "refreshtoken":
case "refreshToken": return
getOrCreateConfiguration(target).getRefreshToken();
case "scopes": return getOrCreateConfiguration(target).getScopes();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return
getOrCreateConfiguration(target).getServiceAccountKey();
case "user": return getOrCreateConfiguration(target).getUser();
default: return null;
}
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarConfigurationConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarConfigurationConfigurer.java
index 00a788d6191..090dd0b1e4c 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarConfigurationConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarConfigurationConfigurer.java
@@ -27,11 +27,11 @@ public class GoogleCalendarConfigurationConfigurer extends
org.apache.camel.supp
map.put("ClientSecret", java.lang.String.class);
map.put("Delegate", java.lang.String.class);
map.put("EmailAddress", java.lang.String.class);
- map.put("KeyResource", java.lang.String.class);
map.put("MethodName", java.lang.String.class);
map.put("P12FileName", java.lang.String.class);
map.put("RefreshToken", java.lang.String.class);
map.put("Scopes", java.util.List.class);
+ map.put("ServiceAccountKey", java.lang.String.class);
map.put("User", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -54,8 +54,6 @@ public class GoogleCalendarConfigurationConfigurer extends
org.apache.camel.supp
case "Delegate": target.setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "EmailAddress": target.setEmailAddress(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 "p12filename":
@@ -64,6 +62,8 @@ public class GoogleCalendarConfigurationConfigurer extends
org.apache.camel.supp
case "RefreshToken": target.setRefreshToken(property(camelContext,
java.lang.String.class, value)); return true;
case "scopes":
case "Scopes": target.setScopes(property(camelContext,
java.util.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "ServiceAccountKey":
target.setServiceAccountKey(property(camelContext, java.lang.String.class,
value)); return true;
case "user":
case "User": target.setUser(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -92,8 +92,6 @@ public class GoogleCalendarConfigurationConfigurer extends
org.apache.camel.supp
case "Delegate": return java.lang.String.class;
case "emailaddress":
case "EmailAddress": return java.lang.String.class;
- case "keyresource":
- case "KeyResource": return java.lang.String.class;
case "methodname":
case "MethodName": return java.lang.String.class;
case "p12filename":
@@ -102,6 +100,8 @@ public class GoogleCalendarConfigurationConfigurer extends
org.apache.camel.supp
case "RefreshToken": return java.lang.String.class;
case "scopes":
case "Scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return java.lang.String.class;
case "user":
case "User": return java.lang.String.class;
default: return null;
@@ -126,8 +126,6 @@ public class GoogleCalendarConfigurationConfigurer extends
org.apache.camel.supp
case "Delegate": return target.getDelegate();
case "emailaddress":
case "EmailAddress": return target.getEmailAddress();
- case "keyresource":
- case "KeyResource": return target.getKeyResource();
case "methodname":
case "MethodName": return target.getMethodName();
case "p12filename":
@@ -136,6 +134,8 @@ public class GoogleCalendarConfigurationConfigurer extends
org.apache.camel.supp
case "RefreshToken": return target.getRefreshToken();
case "scopes":
case "Scopes": return target.getScopes();
+ case "serviceaccountkey":
+ case "ServiceAccountKey": return target.getServiceAccountKey();
case "user":
case "User": return target.getUser();
default: return null;
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointConfigurer.java
index 5e18ccace7c..9386a170d5d 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointConfigurer.java
@@ -50,9 +50,9 @@ public class GoogleCalendarEndpointConfigurer extends
PropertyConfigurerSupport
map.put("accessToken", java.lang.String.class);
map.put("clientSecret", java.lang.String.class);
map.put("emailAddress", java.lang.String.class);
- map.put("keyResource", java.lang.String.class);
map.put("p12FileName", java.lang.String.class);
map.put("refreshToken", java.lang.String.class);
+ map.put("serviceAccountKey", java.lang.String.class);
map.put("user", java.lang.String.class);
ALL_OPTIONS = map;
}
@@ -90,8 +90,6 @@ public class GoogleCalendarEndpointConfigurer extends
PropertyConfigurerSupport
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 "p12filename":
@@ -112,6 +110,8 @@ public class GoogleCalendarEndpointConfigurer extends
PropertyConfigurerSupport
case "scopes":
target.getConfiguration().setScopes(property(camelContext,
java.util.List.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":
@@ -160,8 +160,6 @@ public class GoogleCalendarEndpointConfigurer extends
PropertyConfigurerSupport
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 "p12filename":
@@ -182,6 +180,8 @@ public class GoogleCalendarEndpointConfigurer extends
PropertyConfigurerSupport
case "scopes": return java.util.List.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":
@@ -226,8 +226,6 @@ public class GoogleCalendarEndpointConfigurer extends
PropertyConfigurerSupport
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 "p12filename":
@@ -248,6 +246,8 @@ public class GoogleCalendarEndpointConfigurer extends
PropertyConfigurerSupport
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-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriFactory.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriFactory.java
index 87c697efdb5..1c1d97a8c12 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriFactory.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriFactory.java
@@ -44,7 +44,6 @@ public class GoogleCalendarEndpointUriFactory extends
org.apache.camel.support.c
props.add("greedy");
props.add("inBody");
props.add("initialDelay");
- props.add("keyResource");
props.add("lazyStartProducer");
props.add("methodName");
props.add("p12FileName");
@@ -58,6 +57,7 @@ public class GoogleCalendarEndpointUriFactory extends
org.apache.camel.support.c
props.add("schedulerProperties");
props.add("scopes");
props.add("sendEmptyMessageWhenIdle");
+ props.add("serviceAccountKey");
props.add("setting");
props.add("startScheduler");
props.add("text");
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponentConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponentConfigurer.java
index 7898b1379db..deb5e4b4332 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponentConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponentConfigurer.java
@@ -52,8 +52,6 @@ public class GoogleCalendarStreamComponentConfigurer extends
PropertyConfigurerS
case "delegate":
getOrCreateConfiguration(target).setDelegate(property(camelContext,
java.lang.String.class, value)); return true;
case "emailaddress":
case "emailAddress":
getOrCreateConfiguration(target).setEmailAddress(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 "maxresults":
case "maxResults":
getOrCreateConfiguration(target).setMaxResults(property(camelContext,
int.class, value)); return true;
case "p12filename":
@@ -62,6 +60,8 @@ public class GoogleCalendarStreamComponentConfigurer extends
PropertyConfigurerS
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.List.class, value)); return true;
+ case "serviceaccountkey":
+ case "serviceAccountKey":
getOrCreateConfiguration(target).setServiceAccountKey(property(camelContext,
java.lang.String.class, value)); return true;
case "syncflow":
case "syncFlow":
getOrCreateConfiguration(target).setSyncFlow(property(camelContext,
boolean.class, value)); return true;
case "user":
getOrCreateConfiguration(target).setUser(property(camelContext,
java.lang.String.class, value)); return true;
@@ -96,8 +96,6 @@ public class GoogleCalendarStreamComponentConfigurer extends
PropertyConfigurerS
case "delegate": return java.lang.String.class;
case "emailaddress":
case "emailAddress": return java.lang.String.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "maxresults":
case "maxResults": return int.class;
case "p12filename":
@@ -106,6 +104,8 @@ public class GoogleCalendarStreamComponentConfigurer
extends PropertyConfigurerS
case "refreshtoken":
case "refreshToken": return java.lang.String.class;
case "scopes": return java.util.List.class;
+ case "serviceaccountkey":
+ case "serviceAccountKey": return java.lang.String.class;
case "syncflow":
case "syncFlow": return boolean.class;
case "user": return java.lang.String.class;
@@ -141,8 +141,6 @@ public class GoogleCalendarStreamComponentConfigurer
extends PropertyConfigurerS
case "delegate": return getOrCreateConfiguration(target).getDelegate();
case "emailaddress":
case "emailAddress": return
getOrCreateConfiguration(target).getEmailAddress();
- case "keyresource":
- case "keyResource": return
getOrCreateConfiguration(target).getKeyResource();
case "maxresults":
case "maxResults": return
getOrCreateConfiguration(target).getMaxResults();
case "p12filename":
@@ -151,6 +149,8 @@ public class GoogleCalendarStreamComponentConfigurer
extends PropertyConfigurerS
case "refreshtoken":
case "refreshToken": return
getOrCreateConfiguration(target).getRefreshToken();
case "scopes": return getOrCreateConfiguration(target).getScopes();
+ case "serviceaccountkey":
+ case "serviceAccountKey": return
getOrCreateConfiguration(target).getServiceAccountKey();
case "syncflow":
case "syncFlow": return getOrCreateConfiguration(target).isSyncFlow();
case "user": return getOrCreateConfiguration(target).getUser();
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointConfigurer.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointConfigurer.java
index 61a49d38622..4dc70f9c56e 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointConfigurer.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointConfigurer.java
@@ -54,8 +54,6 @@ public class GoogleCalendarStreamEndpointConfigurer extends
PropertyConfigurerSu
case "greedy": target.setGreedy(property(camelContext, boolean.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 "maxresults":
case "maxResults":
target.getConfiguration().setMaxResults(property(camelContext, int.class,
value)); return true;
case "p12filename":
@@ -77,6 +75,8 @@ public class GoogleCalendarStreamEndpointConfigurer extends
PropertyConfigurerSu
case "scopes":
target.getConfiguration().setScopes(property(camelContext,
java.util.List.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 "syncflow":
@@ -126,8 +126,6 @@ public class GoogleCalendarStreamEndpointConfigurer extends
PropertyConfigurerSu
case "greedy": return boolean.class;
case "initialdelay":
case "initialDelay": return long.class;
- case "keyresource":
- case "keyResource": return java.lang.String.class;
case "maxresults":
case "maxResults": return int.class;
case "p12filename":
@@ -149,6 +147,8 @@ public class GoogleCalendarStreamEndpointConfigurer extends
PropertyConfigurerSu
case "scopes": return java.util.List.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 "syncflow":
@@ -199,8 +199,6 @@ public class GoogleCalendarStreamEndpointConfigurer extends
PropertyConfigurerSu
case "greedy": return target.isGreedy();
case "initialdelay":
case "initialDelay": return target.getInitialDelay();
- case "keyresource":
- case "keyResource": return target.getConfiguration().getKeyResource();
case "maxresults":
case "maxResults": return target.getConfiguration().getMaxResults();
case "p12filename":
@@ -222,6 +220,8 @@ public class GoogleCalendarStreamEndpointConfigurer extends
PropertyConfigurerSu
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 "syncflow":
diff --git
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
index 87f9ce782b6..b0c44d2ee21 100644
---
a/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
+++
b/components/camel-google/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
@@ -41,7 +41,6 @@ public class GoogleCalendarStreamEndpointUriFactory extends
org.apache.camel.sup
props.add("greedy");
props.add("index");
props.add("initialDelay");
- props.add("keyResource");
props.add("maxResults");
props.add("p12FileName");
props.add("pollStrategy");
@@ -54,6 +53,7 @@ public class GoogleCalendarStreamEndpointUriFactory extends
org.apache.camel.sup
props.add("schedulerProperties");
props.add("scopes");
props.add("sendEmptyMessageWhenIdle");
+ props.add("serviceAccountKey");
props.add("startScheduler");
props.add("syncFlow");
props.add("timeUnit");
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 9367a363c80..3a30ea0b2dd 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
@@ -35,9 +35,9 @@
"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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "OAuth 2 access token.
This typically expires after an hour so refreshToken is recommended for long te
[...]
"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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "Client secret of the
calendar application" },
"emailAddress": { "kind": "property", "displayName": "Email Address",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "The emailAddress of the
Google Service Account." },
- "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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "Sets .json file with
credentials for Service account" },
"p12FileName": { "kind": "property", "displayName": "P12 File Name",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "The name of the p12 file
which has the private key to use with the Google 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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "OAuth 2 refresh token.
Using this, the Google Calendar component can obtain a new accessToken whene
[...]
+ "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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "Service account key in
json format to authenticate an application as a service account. [...]
"user": { "kind": "property", "displayName": "User", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": true,
"configurationClass":
"org.apache.camel.component.google.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "The email address of the
user the application is trying to impersonate in the service account flow" }
},
"properties": {
@@ -71,9 +71,9 @@
"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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "OAuth 2 access token.
This typically expires after an hour so refreshToken is recommended for long t
[...]
"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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "Client secret of the
calendar application" },
"emailAddress": { "kind": "parameter", "displayName": "Email Address",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "The emailAddress of the
Google Service Account." },
- "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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "Sets .json file with
credentials for Service account" },
"p12FileName": { "kind": "parameter", "displayName": "P12 File Name",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "The name of the p12 file
which has the private key to use with the Google 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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "OAuth 2 refresh token.
Using this, the Google Calendar component can obtain a new accessToken when
[...]
+ "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.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "Service account key in
json format to authenticate an application as a service account [...]
"user": { "kind": "parameter", "displayName": "User", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": true,
"configurationClass":
"org.apache.camel.component.google.calendar.GoogleCalendarConfiguration",
"configurationField": "configuration", "description": "The email address of the
user the application is trying to impersonate in the service account flow" }
},
"apis": {
diff --git
a/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
b/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
index ffa43465484..df5901a5fc7 100644
---
a/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
+++
b/components/camel-google/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
@@ -39,9 +39,9 @@
"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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "OAuth 2 access token.
This typically expires after an hour so refreshToken is recommende [...]
"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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "Client secret of the
calendar application" },
"emailAddress": { "kind": "property", "displayName": "Email Address",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "The emailAddress of the
Google Service Account." },
- "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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "Sets .json file with
credentials for Service account" },
"p12FileName": { "kind": "property", "displayName": "P12 File Name",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "The name of the p12
file which has the private key to use with the Google 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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "OAuth 2 refresh token.
Using this, the Google Calendar component can obtain a new acce [...]
+ "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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "Service account key in
json format to authenticate an application as a ser [...]
"user": { "kind": "property", "displayName": "User", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": true,
"configurationClass":
"org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "The email address of
the user the application is trying to impersonate in the service account flow."
}
},
"headers": {
@@ -81,9 +81,9 @@
"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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "OAuth 2 access token.
This typically expires after an hour so refreshToken is recommend [...]
"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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "Client secret of the
calendar application" },
"emailAddress": { "kind": "parameter", "displayName": "Email Address",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "The emailAddress of the
Google Service Account." },
- "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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "Sets .json file with
credentials for Service account" },
"p12FileName": { "kind": "parameter", "displayName": "P12 File Name",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "The name of the p12
file which has the private key to use with the Google Service Acco [...]
"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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "OAuth 2 refresh token.
Using this, the Google Calendar component can obtain a new acc [...]
+ "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.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "Service account key in
json format to authenticate an application as a se [...]
"user": { "kind": "parameter", "displayName": "User", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": true,
"configurationClass":
"org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration",
"configurationField": "configuration", "description": "The email address of
the user the application is trying to impersonate in the service account flow."
}
}
}
diff --git
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
index 866c64d203b..784c33fed40 100644
---
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
+++
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
@@ -106,12 +106,13 @@ public class BatchGoogleCalendarClientFactory implements
GoogleCalendarClientFac
@Override
public Calendar 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 Google Calendar client.");
}
try {
- Credential credential = authorizeServiceAccount(camelContext,
keyResource, delegate, scopes);
+ Credential credential = authorizeServiceAccount(camelContext,
serviceAccountKey, delegate, scopes);
return new Calendar.Builder(transport, jsonFactory,
credential).setApplicationName(applicationName).build();
} catch (Exception e) {
throw new RuntimeCamelException("Could not create Google Calendar
client.", e);
@@ -120,11 +121,12 @@ public class BatchGoogleCalendarClientFactory implements
GoogleCalendarClientFac
// authorize with JSON-Credentials
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);
cred.refreshToken();
diff --git
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarClientFactory.java
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarClientFactory.java
index a1dc9dbf267..f558db76759 100644
---
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarClientFactory.java
+++
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarClientFactory.java
@@ -29,5 +29,6 @@ public interface GoogleCalendarClientFactory {
String p12FileName, String user);
Calendar 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-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
index 5e66ba32ab1..6d5e0a3c904 100644
---
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
+++
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarComponent.java
@@ -56,8 +56,8 @@ public class GoogleCalendarComponent
client = getClientFactory().makeClient(config.getClientId(),
config.getClientSecret(), config.getScopes(),
config.getApplicationName(), config.getRefreshToken(),
config.getAccessToken(), config.getEmailAddress(),
config.getP12FileName(), config.getUser());
- } else if (config.getKeyResource() != null &&
!config.getKeyResource().isBlank()) {
- client = getClientFactory().makeClient(getCamelContext(),
config.getKeyResource(), config.getScopes(),
+ } 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-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java
index 00df53a1dba..8b8ce1e4479 100644
---
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java
+++
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java
@@ -59,7 +59,7 @@ public class GoogleCalendarConfiguration {
private String user;
/* Service account */
@UriParam(label = "security")
- private String keyResource;
+ private String serviceAccountKey;
@UriParam
private String delegate;
@@ -186,17 +186,18 @@ public class GoogleCalendarConfiguration {
this.user = user;
}
- 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-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
index 2ee5314fe1e..03198914c7c 100644
---
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
+++
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
@@ -53,8 +53,8 @@ public class GoogleCalendarStreamComponent extends
DefaultComponent {
client = getClientFactory().makeClient(config.getClientId(),
config.getClientSecret(), config.getScopes(),
config.getApplicationName(), config.getRefreshToken(),
config.getAccessToken(), config.getEmailAddress(),
config.getP12FileName(), config.getUser());
- } else if (config.getKeyResource() != null) {
- client = getClientFactory().makeClient(getCamelContext(),
config.getKeyResource(), config.getScopes(),
+ } else if (config.getServiceAccountKey() != null) {
+ client = getClientFactory().makeClient(getCamelContext(),
config.getServiceAccountKey(), config.getScopes(),
config.getApplicationName(), config.getDelegate());
} else {
throw new IllegalArgumentException(
diff --git
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
index e0635337893..e28450ec102 100644
---
a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
+++
b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
@@ -68,7 +68,7 @@ public class GoogleCalendarStreamConfiguration implements
Cloneable {
private boolean syncFlow;
/* Service account */
@UriParam(label = "security")
- private String keyResource;
+ private String serviceAccountKey;
@UriParam
private String delegate;
@@ -252,17 +252,18 @@ public class GoogleCalendarStreamConfiguration implements
Cloneable {
this.considerLastUpdate = considerLastUpdate;
}
- 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-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java
b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java
index 1d7c4c8db0e..12c33ff5a16 100644
---
a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java
+++
b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java
@@ -67,7 +67,7 @@ public class AbstractGoogleCalendarTestSupport extends
CamelTestSupport {
return !properties.getProperty("clientId", "").isEmpty()
&& !properties.getProperty("clientSecret", "").isEmpty()
&& !properties.getProperty("accessToken", "").isEmpty()
- || !properties.getProperty("keyResource", "").isEmpty();
+ || !properties.getProperty("serviceAccountKey", "").isEmpty();
}
@BeforeEach
diff --git
a/components/camel-google/camel-google-calendar/src/test/resources/test-options.properties
b/components/camel-google/camel-google-calendar/src/test/resources/test-options.properties
index b71858cd318..8300ebf79e7 100644
---
a/components/camel-google/camel-google-calendar/src/test/resources/test-options.properties
+++
b/components/camel-google/camel-google-calendar/src/test/resources/test-options.properties
@@ -27,6 +27,6 @@ refreshToken=
emailAddress=
p12FileName=
-keyResource=
+serviceAccountKey=
scopes[]=
delegate=
\ No newline at end of file
