Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: davsclaus@apache.org
To: commits@camel.apache.org
Date: Thu, 05 May 2016 16:18:52 -0000
Message-Id: <5ad8dd1673e1449e91bd1457a0294073@git.apache.org>
Subject: [1/2] camel git commit: CAMEL-7536: Possible to use custom resolver
 for attachments to resolve what content-type-encoding to use. Thanks to
 Christoph Giera for the patch.
archived-at: Thu, 05 May 2016 16:18:55 -0000

Repository: camel
Updated Branches:
  refs/heads/master 6035880f7 -> 78ab36d22


CAMEL-7536: Possible to use custom resolver for attachments to resolve what content-type-encoding to use. Thanks to Christoph Giera for the patch.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/144b07a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/144b07a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/144b07a5

Branch: refs/heads/master
Commit: 144b07a5777c2175595bb00eb7932ea66fc262f7
Parents: 6035880
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu May 5 18:16:00 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu May 5 18:18:10 2016 +0200

----------------------------------------------------------------------
 ...achmentsContentTransferEncodingResolver.java | 40 ++++++++++++++++++++
 .../camel/component/mail/MailBinding.java       | 22 +++++++++--
 .../camel/component/mail/MailConfiguration.java | 13 +++++++
 3 files changed, 71 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/144b07a5/components/camel-mail/src/main/java/org/apache/camel/component/mail/AttachmentsContentTransferEncodingResolver.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/AttachmentsContentTransferEncodingResolver.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/AttachmentsContentTransferEncodingResolver.java
new file mode 100644
index 0000000..4bcdf97
--- /dev/null
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/AttachmentsContentTransferEncodingResolver.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mail;
+
+import javax.mail.BodyPart;
+
+/**
+ * Resolver to determine Content-Transfer-Encoding for file attachments.
+ * <br/>
+ * Normally this will be determined automatically, this resolver can be used to
+ * override this behavior.
+ */
+public interface AttachmentsContentTransferEncodingResolver {
+
+    /**
+     * Resolves the content-transfer-encoding.
+     * <p/>
+     * Return <tt>null</tt> if you cannot resolve a content-transfer-encoding or
+     * want to rely on the mail provider to resolve it for you.
+     *
+     * @param messageBodyPart the body part
+     * @return the content-transfer-encoding or <tt>null</tt> to rely on the mail provider
+     */
+    String resolveContentTransferEncoding(BodyPart messageBodyPart);
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/144b07a5/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
index 9b46695..79f4066 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
@@ -446,13 +446,15 @@ public class MailBinding {
         multipart.setSubType("mixed");
         addBodyToMultipart(configuration, multipart, exchange);
         String partDisposition = configuration.isUseInlineAttachments() ? Part.INLINE : Part.ATTACHMENT;
+        AttachmentsContentTransferEncodingResolver contentTransferEncodingResolver = configuration.getAttachmentsContentTransferEncodingResolver();
         if (exchange.getIn().hasAttachments()) {
-            addAttachmentsToMultipart(multipart, partDisposition, exchange);
+            addAttachmentsToMultipart(multipart, partDisposition, contentTransferEncodingResolver, exchange);
         }
         return multipart;
     }
 
-    protected void addAttachmentsToMultipart(MimeMultipart multipart, String partDisposition, Exchange exchange) throws MessagingException {
+    protected void addAttachmentsToMultipart(MimeMultipart multipart, String partDisposition,
+                                             AttachmentsContentTransferEncodingResolver encodingResolver, Exchange exchange) throws MessagingException {
         LOG.trace("Adding attachments +++ start +++");
         int i = 0;
         for (Map.Entry<String, DataHandler> entry : exchange.getIn().getAttachments().entrySet()) {
@@ -494,6 +496,8 @@ public class MailBinding {
                         }
                     }
 
+                    // set Content-Transfer-Encoding using resolver if possible
+                    resolveContentTransferEncoding(encodingResolver, i, messageBodyPart);
                     // Set Disposition
                     messageBodyPart.setDisposition(partDisposition);
                     // Add part to multipart
@@ -509,6 +513,16 @@ public class MailBinding {
         LOG.trace("Adding attachments +++ done +++");
     }
 
+    protected void resolveContentTransferEncoding(AttachmentsContentTransferEncodingResolver resolver, int i, BodyPart messageBodyPart) throws MessagingException {
+        if (resolver != null) {
+            String contentTransferEncoding = resolver.resolveContentTransferEncoding(messageBodyPart);
+            LOG.trace("Attachment #{}: Using content transfer encoding resolver: {} resolved content transfer encoding as: {}", i, resolver, contentTransferEncoding);
+            if (contentTransferEncoding != null) {
+                messageBodyPart.setHeader("Content-Transfer-Encoding", contentTransferEncoding);
+            }
+        }
+    }
+
     protected void createMultipartAlternativeMessage(MimeMessage mimeMessage, MailConfiguration configuration, Exchange exchange)
         throws MessagingException, IOException {
 
@@ -541,8 +555,8 @@ public class MailBinding {
                 multipartAlternative.addBodyPart(related);
 
                 addBodyToMultipart(configuration, multipartRelated, exchange);
-
-                addAttachmentsToMultipart(multipartRelated, Part.INLINE, exchange);
+                AttachmentsContentTransferEncodingResolver resolver = configuration.getAttachmentsContentTransferEncodingResolver();
+                addAttachmentsToMultipart(multipartRelated, Part.INLINE, resolver, exchange);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/144b07a5/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index a34449f..93b7a94 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -113,6 +113,8 @@ public class MailConfiguration implements Cloneable {
     private SSLContextParameters sslContextParameters;
     @UriParam(label = "advanced", prefix = "mail.", multiValue = true)
     private Properties additionalJavaMailProperties;
+    @UriParam(label = "advanced")
+    private AttachmentsContentTransferEncodingResolver attachmentsContentTransferEncodingResolver;
 
     public MailConfiguration() {
     }
@@ -726,4 +728,15 @@ public class MailConfiguration implements Cloneable {
     public void setHandleFailedMessage(boolean handleFailedMessage) {
         this.handleFailedMessage = handleFailedMessage;
     }
+
+    public AttachmentsContentTransferEncodingResolver getAttachmentsContentTransferEncodingResolver() {
+        return attachmentsContentTransferEncodingResolver;
+    }
+
+    /**
+     * To use a custom AttachmentsContentTransferEncodingResolver to resolve what content-type-encoding to use for attachments.
+     */
+    public void setAttachmentsContentTransferEncodingResolver(AttachmentsContentTransferEncodingResolver attachmentsContentTransferEncodingResolver) {
+        this.attachmentsContentTransferEncodingResolver = attachmentsContentTransferEncodingResolver;
+    }
 }