[camel] 05/06: Regen google-calendar component

[acosentino]

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

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

commit eda5c0eea13af1cd6354581d9f6af055cbe684f6
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jan 14 08:37:18 2021 +0100

    Regen google-calendar component
---
 .../stream/GoogleCalendarStreamEndpointConfigurer.java       | 12 ------------
 .../stream/GoogleCalendarStreamEndpointUriFactory.java       |  6 +-----
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git 
a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointConfigurer.java
 
b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointConfigurer.java
index d8a7969..102d2f0 100644
--- 
a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointConfigurer.java
+++ 
b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointConfigurer.java
@@ -76,12 +76,8 @@ public class GoogleCalendarStreamEndpointConfigurer extends 
PropertyConfigurerSu
         case "sendEmptyMessageWhenIdle": 
target.setSendEmptyMessageWhenIdle(property(camelContext, boolean.class, 
value)); return true;
         case "startscheduler":
         case "startScheduler": target.setStartScheduler(property(camelContext, 
boolean.class, value)); return true;
-<<<<<<< HEAD
-=======
         case "syncflow":
         case "syncFlow": 
target.getConfiguration().setSyncFlow(property(camelContext, boolean.class, 
value)); return true;
-        case "synchronous": target.setSynchronous(property(camelContext, 
boolean.class, value)); return true;
->>>>>>> dca8b31... CAMEL-15961: Extend configuration with 'syncFlow' parameter
         case "timeunit":
         case "timeUnit": target.setTimeUnit(property(camelContext, 
java.util.concurrent.TimeUnit.class, value)); return true;
         case "usefixeddelay":
@@ -149,12 +145,8 @@ public class GoogleCalendarStreamEndpointConfigurer 
extends PropertyConfigurerSu
         case "sendEmptyMessageWhenIdle": return boolean.class;
         case "startscheduler":
         case "startScheduler": return boolean.class;
-<<<<<<< HEAD
-=======
         case "syncflow":
         case "syncFlow": return boolean.class;
-        case "synchronous": return boolean.class;
->>>>>>> dca8b31... CAMEL-15961: Extend configuration with 'syncFlow' parameter
         case "timeunit":
         case "timeUnit": return java.util.concurrent.TimeUnit.class;
         case "usefixeddelay":
@@ -223,12 +215,8 @@ public class GoogleCalendarStreamEndpointConfigurer 
extends PropertyConfigurerSu
         case "sendEmptyMessageWhenIdle": return 
target.isSendEmptyMessageWhenIdle();
         case "startscheduler":
         case "startScheduler": return target.isStartScheduler();
-<<<<<<< HEAD
-=======
         case "syncflow":
         case "syncFlow": return target.getConfiguration().isSyncFlow();
-        case "synchronous": return target.isSynchronous();
->>>>>>> dca8b31... CAMEL-15961: Extend configuration with 'syncFlow' parameter
         case "timeunit":
         case "timeUnit": return target.getTimeUnit();
         case "usefixeddelay":
diff --git 
a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
 
b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
index 6d19e81..1c2da8d 100644
--- 
a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
+++ 
b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
@@ -20,11 +20,7 @@ public class GoogleCalendarStreamEndpointUriFactory extends 
org.apache.camel.sup
     private static final Set<String> PROPERTY_NAMES;
     private static final Set<String> SECRET_PROPERTY_NAMES;
     static {
-<<<<<<< HEAD
-        Set<String> props = new HashSet<>(41);
-=======
-        Set<String> props = new HashSet<>(43);
->>>>>>> dca8b31... CAMEL-15961: Extend configuration with 'syncFlow' parameter
+        Set<String> props = new HashSet<>(42);
         props.add("backoffMultiplier");
         props.add("destination");
         props.add("initialDelay");