Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AbstractEndpoint is no longer TaskScheduler aware. The ListeningMailSource now provides its own taskExecutor property and uses a SimpleAsyncTaskExecutor by default.

Browse Source
This commit is contained in:
Mark Fisher
2008-10-10 00:28:40 +00:00
parent cfcbad200a
commit 01c9efef66
4 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultFolderConnection.java
View File

@@ -66,11 +66,11 @@ public class DefaultFolderConnection implements Lifecycle, DisposableBean, Folde
public DefaultFolderConnection(String storeUri, MonitoringStrategy monitoringStrategy, boolean polling) {
Assert.notNull(storeUri, "storeUri must not be null");
Assert.notNull(monitoringStrategy, "monitoringStrategy must not ne null");
this.storeUri = new URLName(storeUri);
this.monitoringStrategy = monitoringStrategy;
this.polling = polling;
Assert.notNull(storeUri, "storeUri is required");
Assert.notNull(monitoringStrategy, "monitoringStrategy is required");
if (!polling && monitoringStrategy.getClass().isAssignableFrom(AsyncMonitoringStrategy.class)) {
throw new ConfigurationException(
"Folder connection requires an AsyncMonitoringStrategy if polling is disabled.");
@@ -96,6 +96,11 @@ public class DefaultFolderConnection implements Lifecycle, DisposableBean, Folde
}
}
@Override
public String toString() {
return this.storeUri.toString();
}
public void destroy() throws Exception {
this.stop();
}

30
org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/ListeningMailSource.java
View File

@@ -16,8 +16,6 @@
package org.springframework.integration.mail;
import java.util.Date;
import javax.mail.Message;
import org.apache.commons.logging.Log;
@@ -25,10 +23,11 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.Lifecycle;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.endpoint.AbstractMessageProducingEndpoint;
import org.springframework.integration.mail.monitor.AsyncMonitoringStrategy;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.scheduling.Trigger;
import org.springframework.util.Assert;
/**
@@ -44,6 +43,8 @@ public class ListeningMailSource extends AbstractMessageProducingEndpoint implem
private final Log logger = LogFactory.getLog(this.getClass());
private volatile TaskExecutor taskExecutor;
private final MonitorRunnable monitorRunnable;
private volatile boolean monitorRunning = false;
@@ -64,28 +65,30 @@ public class ListeningMailSource extends AbstractMessageProducingEndpoint implem
public void start() {
this.startMonitor();
if (logger.isInfoEnabled()) {
logger.info("started monitoring mailbox");
logger.info("started monitoring mailbox ["
+ this.monitorRunnable.folderConnection + "]");
}
}
public void stop() {
this.stopMonitor();
if (logger.isInfoEnabled()) {
logger.info("stopped monitoring mailbox");
logger.info("stopped monitoring mailbox ["
+ this.monitorRunnable.folderConnection + "]");
}
}
protected void startMonitor() {
synchronized (this.monitorRunnable) {
if (!this.monitorRunning) {
Assert.state(this.getTaskScheduler() != null, "TaskScheduler is required");
this.getTaskScheduler().schedule(this.monitorRunnable,
new Trigger() {
public Date getNextRunTime(Date lastScheduledRunTime, Date lastCompleteTime) {
return new Date();
}
}
);
if (this.taskExecutor == null) {
if (logger.isInfoEnabled()) {
logger.info("No TaskExecutor has been provided, will use a ["
+ SimpleAsyncTaskExecutor.class + "] as the default.");
}
this.taskExecutor = new SimpleAsyncTaskExecutor();
}
this.taskExecutor.execute(this.monitorRunnable);
}
this.monitorRunning = true;
}
@@ -113,6 +116,7 @@ public class ListeningMailSource extends AbstractMessageProducingEndpoint implem
private MonitorRunnable(FolderConnection folderConnection) {
Assert.notNull(folderConnection, "folderConnection must not be null");
this.folderConnection = folderConnection;
}