[camel] branch master updated: CAMEL-13214 Add headerFilterStrategy option to component level

[da...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e3172f5  CAMEL-13214 Add headerFilterStrategy option to component level
e3172f5 is described below

commit e3172f5c8d148ef5a2a5b638d3ec4210a180275d
Author: soilworker01 <cg...@850-CGIERA.mic.co.at>
AuthorDate: Wed Mar 6 14:23:20 2019 +0100

    CAMEL-13214 Add headerFilterStrategy option to component level
---
 .../src/main/java/org/apache/camel/component/mail/MailComponent.java | 5 +++--
 .../src/main/java/org/apache/camel/component/mail/MailEndpoint.java  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
index 1273fc8..70e0a88 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
@@ -29,7 +29,7 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.SSLContextParametersAware;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
+import org.apache.camel.support.HeaderFilterStrategyComponent;
 import org.apache.camel.support.IntrospectionSupport;
 import org.apache.camel.util.StringHelper;
 
@@ -37,7 +37,7 @@ import org.apache.camel.util.StringHelper;
  * Component for JavaMail.
  */
 @Component("imap,imaps,pop3,pop3s,smtp,smtps")
-public class MailComponent extends DefaultComponent implements SSLContextParametersAware {
+public class MailComponent extends HeaderFilterStrategyComponent implements SSLContextParametersAware {
 
     @Metadata(label = "advanced")
     private MailConfiguration configuration;
@@ -100,6 +100,7 @@ public class MailComponent extends DefaultComponent implements SSLContextParamet
         }
 
         endpoint.setContentTypeResolver(contentTypeResolver);
+        setEndpointHeaderFilterStrategy(endpoint);
         setProperties(endpoint.getConfiguration(), parameters);
         setProperties(endpoint, parameters);
 
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
index 99991c2..c0abe6f 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.spi.HeaderFilterStrategyAware;
 import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
@@ -36,7 +37,7 @@ import org.apache.camel.support.ScheduledPollEndpoint;
 @UriEndpoint(firstVersion = "1.0.0", scheme = "imap,imaps,pop3,pop3s,smtp,smtps", title = "IMAP,IMAPS,POP3,POP3S,SMTP,SMTPS",
         syntax = "imap:host:port", alternativeSyntax = "imap:username:password@host:port",
         label = "mail")
-public class MailEndpoint extends ScheduledPollEndpoint {
+public class MailEndpoint extends ScheduledPollEndpoint implements HeaderFilterStrategyAware {
 
     @UriParam(optionalPrefix = "consumer.", defaultValue = "" + MailConsumer.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
             description = "Milliseconds before the next poll.")