Removed transaction configuration settings from AbstractEndpoint. Configuration is now a responsibility of more specific classes (e.g. AbstractPollingEndpoint).
This commit is contained in:
@@ -25,8 +25,6 @@ import org.springframework.integration.ConfigurationException;
|
||||
import org.springframework.integration.channel.MessageChannelTemplate;
|
||||
import org.springframework.integration.scheduling.TaskScheduler;
|
||||
import org.springframework.integration.scheduling.TaskSchedulerAware;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.TransactionDefinition;
|
||||
|
||||
/**
|
||||
* The base class for Message Endpoint implementations.
|
||||
@@ -41,10 +39,6 @@ public abstract class AbstractEndpoint implements MessageEndpoint, TaskScheduler
|
||||
|
||||
private volatile TaskScheduler taskScheduler;
|
||||
|
||||
private volatile PlatformTransactionManager transactionManager;
|
||||
|
||||
private volatile TransactionDefinition transactionDefinition;
|
||||
|
||||
private final MessageChannelTemplate channelTemplate = new MessageChannelTemplate();
|
||||
|
||||
|
||||
@@ -60,14 +54,6 @@ public abstract class AbstractEndpoint implements MessageEndpoint, TaskScheduler
|
||||
this.taskScheduler = taskScheduler;
|
||||
}
|
||||
|
||||
public void setTransactionManager(PlatformTransactionManager transactionManager) {
|
||||
this.transactionManager = transactionManager;
|
||||
}
|
||||
|
||||
public void setTransactionDefinition(TransactionDefinition transactionDefinition) {
|
||||
this.transactionDefinition= transactionDefinition;
|
||||
}
|
||||
|
||||
protected MessageChannelTemplate getChannelTemplate() {
|
||||
return this.channelTemplate;
|
||||
}
|
||||
@@ -90,15 +76,6 @@ public abstract class AbstractEndpoint implements MessageEndpoint, TaskScheduler
|
||||
protected void initialize() throws Exception {
|
||||
}
|
||||
|
||||
protected final void configureTransactionSettingsForPoller(AbstractPoller poller) {
|
||||
if (this.transactionManager != null) {
|
||||
poller.setTransactionManager(this.transactionManager);
|
||||
}
|
||||
if (this.transactionDefinition != null) {
|
||||
poller.setTransactionDefinition(this.transactionDefinition);
|
||||
}
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return (this.name != null) ? this.name : super.toString();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user