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

INT-786 initial cleanup, removed MetaPersister in favor of injecting a Map which could be anything (e.g., cache etc.)

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-10-16 08:03:00 -04:00
parent 75d9e701e1
commit 3c5218ec67
9 changed files with 260 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java
View File

@@ -18,15 +18,12 @@ package org.springframework.integration.context;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.convert.ConversionService;
import org.springframework.integration.context.metadata.MetadataPersister;
import org.springframework.integration.context.metadata.PropertiesBasedMetadataPersister;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -50,8 +47,6 @@ public abstract class IntegrationObjectSupport implements BeanNameAware, NamedCo
* Logger that is available to subclasses
*/
protected final Log logger = LogFactory.getLog(getClass());
private volatile MetadataPersister<?> metadataPersister;
private volatile String beanName;
@@ -119,27 +114,6 @@ public abstract class IntegrationObjectSupport implements BeanNameAware, NamedCo
return this.beanFactory;
}
protected MetadataPersister getRequiredMetadataPersister() {
if (this.metadataPersister == null && this.beanFactory != null) {
this.metadataPersister = IntegrationContextUtils.getMetadataPersister(this.beanFactory);
}
if (this.metadataPersister == null) {
PropertiesBasedMetadataPersister mp = new PropertiesBasedMetadataPersister();
try {
mp.afterPropertiesSet();
}
catch (Exception e) {
if (e instanceof RuntimeException) {
throw (RuntimeException) e;
}
throw new BeanInitializationException("failed to obtain reference to MetadataPersister strategy implementation.", e);
}
this.metadataPersister = mp;
}
return this.metadataPersister;
}
protected TaskScheduler getTaskScheduler() {
if (this.taskScheduler == null && this.beanFactory != null) {
this.taskScheduler = IntegrationContextUtils.getTaskScheduler(this.beanFactory);