Repository: camel Updated Branches: refs/heads/camel-2.14.x 10b3aae1e -> bfd3797eb refs/heads/master e2a945d70 -> ebae9b51b
CAMEL-8216 - support all properties in Google API components Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ebae9b51 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ebae9b51 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ebae9b51 Branch: refs/heads/master Commit: ebae9b51b69c857a0c7a4c715b5811f2fad9ac7e Parents: ecd9977 Author: Jonathan Anstey <jans...@gmail.com> Authored: Wed Jan 7 15:16:52 2015 -0330 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Wed Jan 7 15:16:58 2015 -0330 ---------------------------------------------------------------------- .../google/calendar/GoogleCalendarConsumer.java | 15 ++++++--------- .../google/calendar/GoogleCalendarProducer.java | 15 ++++++--------- .../google/drive/GoogleDriveConsumer.java | 19 ++++++++----------- .../google/drive/GoogleDriveProducer.java | 17 +++++++---------- .../google/mail/GoogleMailConsumer.java | 16 ++++++---------- .../google/mail/GoogleMailProducer.java | 16 ++++++---------- 6 files changed, 39 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ebae9b51/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConsumer.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConsumer.java index bfe455d..7ad2bbf 100644 --- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConsumer.java +++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConsumer.java @@ -17,11 +17,13 @@ package org.apache.camel.component.google.calendar; import java.util.Map; +import java.util.Map.Entry; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.TypeConverter; import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiName; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.component.AbstractApiConsumer; @@ -39,19 +41,14 @@ public class GoogleCalendarConsumer extends AbstractApiConsumer<GoogleCalendarAp protected Object doInvokeMethod(Map<String, Object> properties) throws RuntimeCamelException { AbstractGoogleClientRequest request = (AbstractGoogleClientRequest) super.doInvokeMethod(properties); try { - setProperty(properties, request, "q"); - setProperty(properties, request, "maxResults"); - setProperty(properties, request, "pageToken"); - setProperty(properties, request, "fields"); + TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter(); + for (Entry<String, Object> p : properties.entrySet()) { + IntrospectionSupport.setProperty(typeConverter, request, p.getKey(), p.getValue()); + } return request.execute(); } catch (Exception e) { throw new RuntimeCamelException(e); } } - private void setProperty(Map<String, Object> properties, AbstractGoogleClientRequest request, String key) throws Exception { - if (properties.containsKey(key)) { - IntrospectionSupport.setProperty(getEndpoint().getCamelContext().getTypeConverter(), request, key, properties.get(key)); - } - } } http://git-wip-us.apache.org/repos/asf/camel/blob/ebae9b51/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarProducer.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarProducer.java index 92f8e5b..4ae9f25 100644 --- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarProducer.java +++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarProducer.java @@ -17,10 +17,12 @@ package org.apache.camel.component.google.calendar; import java.util.Map; +import java.util.Map.Entry; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.TypeConverter; import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiName; import org.apache.camel.component.google.calendar.internal.GoogleCalendarPropertiesHelper; import org.apache.camel.util.IntrospectionSupport; @@ -40,19 +42,14 @@ public class GoogleCalendarProducer extends AbstractApiProducer<GoogleCalendarAp protected Object doInvokeMethod(ApiMethod method, Map<String, Object> properties) throws RuntimeCamelException { AbstractGoogleClientRequest request = (AbstractGoogleClientRequest) super.doInvokeMethod(method, properties); try { - setProperty(properties, request, "q"); - setProperty(properties, request, "maxResults"); - setProperty(properties, request, "pageToken"); - setProperty(properties, request, "fields"); + TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter(); + for (Entry<String, Object> p : properties.entrySet()) { + IntrospectionSupport.setProperty(typeConverter, request, p.getKey(), p.getValue()); + } return request.execute(); } catch (Exception e) { throw new RuntimeCamelException(e); } } - private void setProperty(Map<String, Object> properties, AbstractGoogleClientRequest request, String key) throws Exception { - if (properties.containsKey(key)) { - IntrospectionSupport.setProperty(getEndpoint().getCamelContext().getTypeConverter(), request, key, properties.get(key)); - } - } } http://git-wip-us.apache.org/repos/asf/camel/blob/ebae9b51/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java index 6f11ff3..c032313 100644 --- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java +++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConsumer.java @@ -17,11 +17,13 @@ package org.apache.camel.component.google.drive; import java.util.Map; +import java.util.Map.Entry; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.TypeConverter; import org.apache.camel.component.google.drive.internal.GoogleDriveApiName; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.component.AbstractApiConsumer; @@ -43,19 +45,14 @@ public class GoogleDriveConsumer extends AbstractApiConsumer<GoogleDriveApiName, protected Object doInvokeMethod(Map<String, Object> properties) throws RuntimeCamelException { AbstractGoogleClientRequest request = (AbstractGoogleClientRequest) super.doInvokeMethod(properties); try { - setProperty(properties, request, "q"); - setProperty(properties, request, "maxResults"); - setProperty(properties, request, "pageToken"); - setProperty(properties, request, "fields"); + TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter(); + for (Entry<String, Object> p : properties.entrySet()) { + IntrospectionSupport.setProperty(typeConverter, request, p.getKey(), p.getValue()); + } return request.execute(); } catch (Exception e) { throw new RuntimeCamelException(e); } - } - - private void setProperty(Map<String, Object> properties, AbstractGoogleClientRequest request, String key) throws Exception { - if (properties.containsKey(key)) { - IntrospectionSupport.setProperty(getEndpoint().getCamelContext().getTypeConverter(), request, key, properties.get(key)); - } - } + } + } http://git-wip-us.apache.org/repos/asf/camel/blob/ebae9b51/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java index 83038bd..de5afe5 100644 --- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java +++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveProducer.java @@ -17,10 +17,12 @@ package org.apache.camel.component.google.drive; import java.util.Map; +import java.util.Map.Entry; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.TypeConverter; import org.apache.camel.component.google.drive.internal.GoogleDriveApiName; import org.apache.camel.component.google.drive.internal.GoogleDriveConstants; import org.apache.camel.component.google.drive.internal.GoogleDrivePropertiesHelper; @@ -41,23 +43,18 @@ public class GoogleDriveProducer extends AbstractApiProducer<GoogleDriveApiName, protected Object doInvokeMethod(ApiMethod method, Map<String, Object> properties) throws RuntimeCamelException { AbstractGoogleClientRequest request = (AbstractGoogleClientRequest) super.doInvokeMethod(method, properties); try { - setProperty(properties, request, "q"); - setProperty(properties, request, "maxResults"); - setProperty(properties, request, "pageToken"); - setProperty(properties, request, "fields"); + TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter(); + for (Entry<String, Object> p : properties.entrySet()) { + IntrospectionSupport.setProperty(typeConverter, request, p.getKey(), p.getValue()); + } return request.execute(); } catch (Exception e) { throw new RuntimeCamelException(e); } } - + protected String getThreadProfileName() { return GoogleDriveConstants.THREAD_PROFILE_NAME; } - private void setProperty(Map<String, Object> properties, AbstractGoogleClientRequest request, String key) throws Exception { - if (properties.containsKey(key)) { - IntrospectionSupport.setProperty(getEndpoint().getCamelContext().getTypeConverter(), request, key, properties.get(key)); - } - } } http://git-wip-us.apache.org/repos/asf/camel/blob/ebae9b51/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java index 704063d..769cde6 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConsumer.java @@ -17,11 +17,13 @@ package org.apache.camel.component.google.mail; import java.util.Map; +import java.util.Map.Entry; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.TypeConverter; import org.apache.camel.component.google.mail.internal.GoogleMailApiName; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.component.AbstractApiConsumer; @@ -39,20 +41,14 @@ public class GoogleMailConsumer extends AbstractApiConsumer<GoogleMailApiName, G protected Object doInvokeMethod(Map<String, Object> properties) throws RuntimeCamelException { AbstractGoogleClientRequest request = (AbstractGoogleClientRequest) super.doInvokeMethod(properties); try { - setProperty(properties, request, "q"); - setProperty(properties, request, "maxResults"); - setProperty(properties, request, "pageToken"); - setProperty(properties, request, "format"); - setProperty(properties, request, "fields"); + TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter(); + for (Entry<String, Object> p : properties.entrySet()) { + IntrospectionSupport.setProperty(typeConverter, request, p.getKey(), p.getValue()); + } return request.execute(); } catch (Exception e) { throw new RuntimeCamelException(e); } } - private void setProperty(Map<String, Object> properties, AbstractGoogleClientRequest request, String key) throws Exception { - if (properties.containsKey(key)) { - IntrospectionSupport.setProperty(getEndpoint().getCamelContext().getTypeConverter(), request, key, properties.get(key)); - } - } } http://git-wip-us.apache.org/repos/asf/camel/blob/ebae9b51/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java index 868d881..3e6bdad 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailProducer.java @@ -17,10 +17,12 @@ package org.apache.camel.component.google.mail; import java.util.Map; +import java.util.Map.Entry; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.TypeConverter; import org.apache.camel.component.google.mail.internal.GoogleMailApiName; import org.apache.camel.component.google.mail.internal.GoogleMailPropertiesHelper; import org.apache.camel.util.IntrospectionSupport; @@ -40,20 +42,14 @@ public class GoogleMailProducer extends AbstractApiProducer<GoogleMailApiName, G protected Object doInvokeMethod(ApiMethod method, Map<String, Object> properties) throws RuntimeCamelException { AbstractGoogleClientRequest request = (AbstractGoogleClientRequest) super.doInvokeMethod(method, properties); try { - setProperty(properties, request, "q"); - setProperty(properties, request, "maxResults"); - setProperty(properties, request, "pageToken"); - setProperty(properties, request, "format"); - setProperty(properties, request, "fields"); + TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter(); + for (Entry<String, Object> p : properties.entrySet()) { + IntrospectionSupport.setProperty(typeConverter, request, p.getKey(), p.getValue()); + } return request.execute(); } catch (Exception e) { throw new RuntimeCamelException(e); } } - private void setProperty(Map<String, Object> properties, AbstractGoogleClientRequest request, String key) throws Exception { - if (properties.containsKey(key)) { - IntrospectionSupport.setProperty(getEndpoint().getCamelContext().getTypeConverter(), request, key, properties.get(key)); - } - } }
