You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/12/05 10:22:14 UTC

[camel] 06/43: Use given exchange pattern when creating the exchange for incoming mail events

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

acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 16a793a04fd4b8d6fd240d292f87cd76cc6a6e77
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Thu Nov 22 09:15:54 2018 +0100

    Use given exchange pattern when creating the exchange for incoming mail events
---
 .../mail/stream/GoogleMailStreamEndpoint.java      | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java
index 7ad816f..f08d3a9 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java
@@ -16,13 +16,10 @@
  */
 package org.apache.camel.component.google.mail.stream;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.mail.internet.AddressException;
-
 import com.google.api.client.util.Base64;
 import com.google.api.services.gmail.Gmail;
 import com.google.api.services.gmail.model.Label;
@@ -30,7 +27,6 @@ import com.google.api.services.gmail.model.ListLabelsResponse;
 import com.google.api.services.gmail.model.MessagePart;
 import com.google.api.services.gmail.model.MessagePartHeader;
 import com.google.common.base.Splitter;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -46,10 +42,10 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * The google-mail component provides access to Google Mail.
  */
-@UriEndpoint(firstVersion = "2.22.0", 
-             scheme = "google-mail-stream", 
-             title = "Google Mail Stream", 
-             syntax = "google-mail-stream:index", 
+@UriEndpoint(firstVersion = "2.22.0",
+             scheme = "google-mail-stream",
+             title = "Google Mail Stream",
+             syntax = "google-mail-stream:index",
              consumerClass = GoogleMailStreamConsumer.class,
              consumerOnly = true,
              label = "api,cloud,mail")
@@ -116,14 +112,14 @@ public class GoogleMailStreamEndpoint extends ScheduledPollEndpoint {
         return true;
     }
 
-    public Exchange createExchange(ExchangePattern pattern, com.google.api.services.gmail.model.Message mail) throws UnsupportedEncodingException {
+    public Exchange createExchange(ExchangePattern pattern, com.google.api.services.gmail.model.Message mail) {
 
-        Exchange exchange = super.createExchange();
+        Exchange exchange = super.createExchange(pattern);
         Message message = exchange.getIn();
         exchange.getIn().setHeader(GoogleMailStreamConstants.MAIL_ID, mail.getId());
         List<MessagePart> parts = mail.getPayload().getParts();
         if (parts != null && parts.get(0).getBody().getData() != null) {
-            byte[] bodyBytes = Base64.decodeBase64(parts.get(0).getBody().getData().trim().toString()); 
+            byte[] bodyBytes = Base64.decodeBase64(parts.get(0).getBody().getData().trim());
             String body = new String(bodyBytes, StandardCharsets.UTF_8);
             message.setBody(body);
         }
@@ -151,8 +147,8 @@ public class GoogleMailStreamEndpoint extends ScheduledPollEndpoint {
             }
         }
     }
-    
-    private List<String> splitLabels(String labels) throws AddressException {
+
+    private List<String> splitLabels(String labels) {
         return Splitter.on(',').splitToList(labels);
     }
 }