Author: cmueller
Date: Mon Jan  3 22:57:34 2011
New Revision: 1054815

URL: http://svn.apache.org/viewvc?rev=1054815&view=rev
Log:
MailConsumer and MailProducer now use the endpoint reference from its super 
class and doesn'n manager its own instance variable

Modified:
    
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
    
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java

Modified: 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=1054815&r1=1054814&r2=1054815&view=diff
==============================================================================
--- 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
 (original)
+++ 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
 Mon Jan  3 22:57:34 2011
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail;
 
 import java.util.LinkedList;
 import java.util.Queue;
+
 import javax.mail.Flags;
 import javax.mail.Folder;
 import javax.mail.FolderNotFoundException;
@@ -49,7 +50,6 @@ public class MailConsumer extends Schedu
     public static final long DEFAULT_CONSUMER_DELAY = 60 * 1000L;
     private static final transient Log LOG = 
LogFactory.getLog(MailConsumer.class);
 
-    private final MailEndpoint endpoint;
     private final JavaMailSenderImpl sender;
     private Folder folder;
     private Store store;
@@ -59,7 +59,6 @@ public class MailConsumer extends Schedu
 
     public MailConsumer(MailEndpoint endpoint, Processor processor, 
JavaMailSenderImpl sender) {
         super(endpoint, processor);
-        this.endpoint = endpoint;
         this.sender = sender;
     }
 
@@ -89,14 +88,14 @@ public class MailConsumer extends Schedu
 
         if (store == null || folder == null) {
             throw new IllegalStateException("MailConsumer did not connect 
properly to the MailStore: "
-                    + 
endpoint.getConfiguration().getMailStoreLogInformation());
+                    + 
getEndpoint().getConfiguration().getMailStoreLogInformation());
         }
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("Polling mailfolder: " + 
endpoint.getConfiguration().getMailStoreLogInformation());
+            LOG.debug("Polling mailfolder: " + 
getEndpoint().getConfiguration().getMailStoreLogInformation());
         }
 
-        if (endpoint.getConfiguration().getFetchSize() == 0) {
+        if (getEndpoint().getConfiguration().getFetchSize() == 0) {
             LOG.warn("Fetch size is 0 meaning the configuration is set to poll 
no new messages at all. Camel will skip this poll.");
             return;
         }
@@ -112,7 +111,7 @@ public class MailConsumer extends Schedu
                 Message[] messages;
 
                 // should we process all messages or only unseen messages
-                if (endpoint.getConfiguration().isUnseen()) {
+                if (getEndpoint().getConfiguration().isUnseen()) {
                     messages = folder.search(new FlagTerm(new 
Flags(Flags.Flag.SEEN), false));
                 } else {
                     messages = folder.getMessages();
@@ -226,7 +225,7 @@ public class MailConsumer extends Schedu
     protected Queue<Exchange> createExchanges(Message[] messages) throws 
MessagingException {
         Queue<Exchange> answer = new LinkedList<Exchange>();
 
-        int fetchSize = endpoint.getConfiguration().getFetchSize();
+        int fetchSize = getEndpoint().getConfiguration().getFetchSize();
         int count = fetchSize == -1 ? messages.length : Math.min(fetchSize, 
messages.length);
 
         if (LOG.isDebugEnabled()) {
@@ -236,7 +235,7 @@ public class MailConsumer extends Schedu
         for (int i = 0; i < count; i++) {
             Message message = messages[i];
             if (!message.getFlags().contains(Flags.Flag.DELETED)) {
-                Exchange exchange = endpoint.createExchange(message);
+                Exchange exchange = getEndpoint().createExchange(message);
                 answer.add(exchange);
             } else {
                 if (LOG.isDebugEnabled()) {
@@ -267,7 +266,7 @@ public class MailConsumer extends Schedu
      */
     protected void processCommit(Message mail, Exchange exchange) {
         try {
-            if (endpoint.getConfiguration().isDelete()) {
+            if (getEndpoint().getConfiguration().isDelete()) {
                 LOG.debug("Exchange processed, so flagging message as 
DELETED");
                 mail.setFlag(Flags.Flag.DELETED, true);
             } else {
@@ -296,7 +295,7 @@ public class MailConsumer extends Schedu
     }
 
     private void ensureIsConnected() throws MessagingException {
-        MailConfiguration config = endpoint.getConfiguration();
+        MailConfiguration config = getEndpoint().getConfiguration();
 
         boolean connected = false;
         try {
@@ -305,7 +304,7 @@ public class MailConsumer extends Schedu
             }
         } catch (Exception e) {
             LOG.debug("Exception while testing for is connected to MailStore: "
-                    + endpoint.getConfiguration().getMailStoreLogInformation()
+                    + 
getEndpoint().getConfiguration().getMailStoreLogInformation()
                     + ". Caused by: " + e.getMessage(), e);
         }
 
@@ -315,7 +314,7 @@ public class MailConsumer extends Schedu
             folder = null;
 
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Connecting to MailStore: " + 
endpoint.getConfiguration().getMailStoreLogInformation());
+                LOG.debug("Connecting to MailStore: " + 
getEndpoint().getConfiguration().getMailStoreLogInformation());
             }
             store = sender.getSession().getStore(config.getProtocol());
             store.connect(config.getHost(), config.getPort(), 
config.getUsername(), config.getPassword());
@@ -332,4 +331,8 @@ public class MailConsumer extends Schedu
         }
     }
 
-}
+    @Override
+    public MailEndpoint getEndpoint() {
+        return (MailEndpoint) super.getEndpoint();
+    }
+}
\ No newline at end of file

Modified: 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java?rev=1054815&r1=1054814&r2=1054815&view=diff
==============================================================================
--- 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
 (original)
+++ 
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
 Mon Jan  3 22:57:34 2011
@@ -33,23 +33,26 @@ import org.springframework.mail.javamail
  */
 public class MailProducer extends DefaultProducer {
     private static final transient Log LOG = 
LogFactory.getLog(MailProducer.class);
-    private final MailEndpoint endpoint;
     private final JavaMailSender sender;
 
     public MailProducer(MailEndpoint endpoint, JavaMailSender sender) {
         super(endpoint);
-        this.endpoint = endpoint;
         this.sender = sender;
     }
 
     public void process(final Exchange exchange) {
         sender.send(new MimeMessagePreparator() {
             public void prepare(MimeMessage mimeMessage) throws Exception {
-                endpoint.getBinding().populateMailMessage(endpoint, 
mimeMessage, exchange);
+                getEndpoint().getBinding().populateMailMessage(getEndpoint(), 
mimeMessage, exchange);
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Sending MimeMessage: " + 
MailUtils.dumpMessage(mimeMessage));
                 }
             }
         });
     }
-}
+    
+    @Override
+    public MailEndpoint getEndpoint() {
+        return (MailEndpoint) super.getEndpoint();
+    }
+}
\ No newline at end of file


Reply via email to