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

INT-1903 polishing

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-05-16 22:08:16 -04:00
parent 5e9204343f
commit 6eff068ca1
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-integration-core/src/main/java/org/springframework/integration/config/IdGeneratorConfigurer.java
View File

@@ -21,7 +21,6 @@ import java.lang.reflect.Field;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener;
@@ -30,6 +29,7 @@ import org.springframework.context.event.ContextClosedEvent;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.MessageHeaders.IdGenerator;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
@@ -45,21 +45,19 @@ public final class IdGeneratorConfigurer implements ApplicationListener<Applicat
public void onApplicationEvent(ApplicationContextEvent event) {
ApplicationContext contex = event.getApplicationContext();
ApplicationContext context = event.getApplicationContext();
if (event instanceof ContextRefreshedEvent){
if (!StringUtils.hasText(IdGeneratorConfigurer.generatorContextId)){
if (this.setIdGenerator(contex)){
IdGeneratorConfigurer.generatorContextId = contex.getId();
}
}
else if (contex.getBeanNamesForType(IdGenerator.class).length > 0) {
throw new BeanDefinitionStoreException(
"'MessageHeaders.idGenerator' has already been set and can not be set again");
boolean contextHasIdGenerator = context.getBeanNamesForType(IdGenerator.class).length > 0;
if (contextHasIdGenerator) {
Assert.state(!StringUtils.hasText(IdGeneratorConfigurer.generatorContextId),
"'MessageHeaders.idGenerator' has already been set and can not be set again");
if (this.setIdGenerator(context)) {
IdGeneratorConfigurer.generatorContextId = context.getId();
}
}
}
else if (event instanceof ContextClosedEvent){
if (contex.getId().equals(IdGeneratorConfigurer.generatorContextId)){
if (context.getId().equals(IdGeneratorConfigurer.generatorContextId)){
this.unsetIdGenerator();
IdGeneratorConfigurer.generatorContextId = null;
}

3
spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java
View File

@@ -25,7 +25,6 @@ import java.util.UUID;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.context.support.GenericXmlApplicationContext;
import org.springframework.integration.MessageChannel;
@@ -125,7 +124,7 @@ public class MessageIdGenerationTests {
parent.close();
}
@Test(expected=BeanDefinitionStoreException.class)
@Test(expected=IllegalStateException.class)
public void testCustomIdGenerationWithParentChileIndependentCreationTwoChildrenTwoRegistrars(){
ClassPathXmlApplicationContext parent = new ClassPathXmlApplicationContext("MessageIdGenerationTests-context-withGenerator.xml", this.getClass());