@EnableTransactionManagement and co get detected on superclasses as well

Issue: SPR-10864

Author: jhoeller

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java

@@ -61,8 +61,9 @@ final class ConfigurationClass {
 	private final Map<String, Class<? extends BeanDefinitionReader>> importedResources =
 			new LinkedHashMap<String, Class<? extends BeanDefinitionReader>>();
 
-	private final Set<ImportBeanDefinitionRegistrar> importBeanDefinitionRegistrars =
-			new LinkedHashSet<ImportBeanDefinitionRegistrar>();
+	private final Map<ImportBeanDefinitionRegistrar, AnnotationMetadata> importBeanDefinitionRegistrars =
+			new LinkedHashMap<ImportBeanDefinitionRegistrar, AnnotationMetadata>();
+
 
 	/**
 	 * Create a new {@link ConfigurationClass} with the given name.
@@ -175,12 +176,12 @@ public void addImportedResource(String importedResource, Class<? extends BeanDef
 		this.importedResources.put(importedResource, readerClass);
 	}
 
-	public void addImportBeanDefinitionRegistrar(ImportBeanDefinitionRegistrar registrar) {
-		this.importBeanDefinitionRegistrars.add(registrar);
+	public void addImportBeanDefinitionRegistrar(ImportBeanDefinitionRegistrar registrar, AnnotationMetadata importingClassMetadata) {
+		this.importBeanDefinitionRegistrars.put(registrar, importingClassMetadata);
 	}
 
-	public Set<ImportBeanDefinitionRegistrar> getImportBeanDefinitionRegistrars() {
-		return Collections.unmodifiableSet(this.importBeanDefinitionRegistrars);
+	public Map<ImportBeanDefinitionRegistrar, AnnotationMetadata> getImportBeanDefinitionRegistrars() {
+		return this.importBeanDefinitionRegistrars;
 	}
 
 	public Map<String, Class<? extends BeanDefinitionReader>> getImportedResources() {

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java

@@ -136,7 +136,7 @@ private void loadBeanDefinitionsForConfigurationClass(ConfigurationClass configC
 			loadBeanDefinitionsForBeanMethod(beanMethod);
 		}
 		loadBeanDefinitionsFromImportedResources(configClass.getImportedResources());
-		loadBeanDefinitionsFromRegistrars(configClass.getMetadata(), configClass.getImportBeanDefinitionRegistrars());
+		loadBeanDefinitionsFromRegistrars(configClass.getImportBeanDefinitionRegistrars());
 	}
 
 	private void removeBeanDefinition(ConfigurationClass configClass) {
@@ -314,11 +314,9 @@ private void loadBeanDefinitionsFromImportedResources(
 		}
 	}
 
-	private void loadBeanDefinitionsFromRegistrars(AnnotationMetadata importingClassMetadata,
-			Set<ImportBeanDefinitionRegistrar> importBeanDefinitionRegistrars) {
-
-		for (ImportBeanDefinitionRegistrar registrar : importBeanDefinitionRegistrars) {
-			registrar.registerBeanDefinitions(importingClassMetadata, this.registry);
+	private void loadBeanDefinitionsFromRegistrars(Map<ImportBeanDefinitionRegistrar, AnnotationMetadata> registrars) {
+		for (Map.Entry<ImportBeanDefinitionRegistrar, AnnotationMetadata> entry : registrars.entrySet()) {
+			entry.getKey().registerBeanDefinitions(entry.getValue(), this.registry);
 		}
 	}
 

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java

@@ -223,8 +223,7 @@ protected final SourceClass doProcessConfigurationClass(ConfigurationClass confi
 
 		// process any @PropertySource annotations
 		for (AnnotationAttributes propertySource : AnnotationConfigUtils.attributesForRepeatable(
-				sourceClass.getMetadata(), PropertySources.class,
-				org.springframework.context.annotation.PropertySource.class)) {
+				sourceClass.getMetadata(), PropertySources.class, org.springframework.context.annotation.PropertySource.class)) {
 			processPropertySource(propertySource);
 		}
 
@@ -246,7 +245,7 @@ protected final SourceClass doProcessConfigurationClass(ConfigurationClass confi
 		}
 
 		// process any @Import annotations
-		processImports(configClass, getImports(sourceClass), true);
+		processImports(configClass, sourceClass, getImports(sourceClass), true);
 
 		// process any @ImportResource annotations
 		if (sourceClass.getMetadata().isAnnotated(ImportResource.class.getName())) {
@@ -378,7 +377,7 @@ private void processDeferredImportSelectors() {
 			try {
 				ConfigurationClass configClass = deferredImport.getConfigurationClass();
 				String[] imports = deferredImport.getImportSelector().selectImports(configClass.getMetadata());
-				processImports(configClass, asSourceClasses(imports), false);
+				processImports(configClass, asSourceClass(configClass), asSourceClasses(imports), false);
 			}
 			catch (Exception ex) {
 				throw new BeanDefinitionStoreException("Failed to load bean class: ", ex);
@@ -387,20 +386,19 @@ private void processDeferredImportSelectors() {
 		this.deferredImportSelectors.clear();
 	}
 
-	private void processImports(ConfigurationClass configClass, Collection<SourceClass> sourceClasses, boolean checkForCircularImports)
-			throws IOException {
+	private void processImports(ConfigurationClass configClass, SourceClass currentSourceClass,
+			Collection<SourceClass> importCandidates, boolean checkForCircularImports) throws IOException {
 
-		if (sourceClasses.isEmpty()) {
+		if (importCandidates.isEmpty()) {
 			return;
 		}
 		if (checkForCircularImports && this.importStack.contains(configClass)) {
 			this.problemReporter.error(new CircularImportProblem(configClass, this.importStack, configClass.getMetadata()));
 		}
 		else {
 			this.importStack.push(configClass);
-			AnnotationMetadata importingClassMetadata = configClass.getMetadata();
 			try {
-				for (SourceClass candidate : sourceClasses) {
+				for (SourceClass candidate : importCandidates) {
 					if (candidate.isAssignable(ImportSelector.class)) {
 						// the candidate class is an ImportSelector -> delegate to it to determine imports
 						Class<?> candidateClass = candidate.loadClass();
@@ -410,21 +408,21 @@ private void processImports(ConfigurationClass configClass, Collection<SourceCla
 							this.deferredImportSelectors.add(new DeferredImportSelectorHolder(configClass, (DeferredImportSelector) selector));
 						}
 						else {
-							String[] importClassNames = selector.selectImports(importingClassMetadata);
+							String[] importClassNames = selector.selectImports(currentSourceClass.getMetadata());
 							Collection<SourceClass> importSourceClasses = asSourceClasses(importClassNames);
-							processImports(configClass, importSourceClasses, false);
+							processImports(configClass, currentSourceClass, importSourceClasses, false);
 						}
 					}
 					else if (candidate.isAssignable(ImportBeanDefinitionRegistrar.class)) {
 						// the candidate class is an ImportBeanDefinitionRegistrar -> delegate to it to register additional bean definitions
 						Class<?> candidateClass = candidate.loadClass();
 						ImportBeanDefinitionRegistrar registrar = BeanUtils.instantiateClass(candidateClass, ImportBeanDefinitionRegistrar.class);
 						invokeAwareMethods(registrar);
-						configClass.addImportBeanDefinitionRegistrar(registrar);
+						configClass.addImportBeanDefinitionRegistrar(registrar, currentSourceClass.getMetadata());
 					}
 					else {
 						// candidate class not an ImportSelector or ImportBeanDefinitionRegistrar -> process it as a @Configuration class
-						this.importStack.registerImport(importingClassMetadata, candidate.getMetadata().getClassName());
+						this.importStack.registerImport(currentSourceClass.getMetadata(), candidate.getMetadata().getClassName());
 						processConfigurationClass(candidate.asConfigClass(configClass));
 					}
 				}
@@ -485,8 +483,7 @@ public List<PropertySource<?>> getPropertySources() {
 		return propertySources;
 	}
 
-	private PropertySource<?> collatePropertySources(String name,
-			List<PropertySource<?>> propertySources) {
+	private PropertySource<?> collatePropertySources(String name, List<PropertySource<?>> propertySources) {
 		if (propertySources.size() == 1) {
 			return propertySources.get(0);
 		}
@@ -558,7 +555,6 @@ public SourceClass asSourceClass(String className) throws IOException, ClassNotF
 	interface ImportRegistry {
 
 		AnnotationMetadata getImportingClassFor(String importedClass);
-
 	}
 
 

spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java

@@ -52,6 +52,17 @@ public void transactionProxyIsCreated() {
 		assertThat("Stereotype annotation not visible", services.containsKey("testBean"), is(true));
 	}
 
+	@Test
+	public void transactionProxyIsCreatedWithEnableOnSuperclass() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(InheritedEnableTxConfig.class, TxManagerConfig.class);
+		ctx.refresh();
+		TransactionalTestBean bean = ctx.getBean(TransactionalTestBean.class);
+		assertThat("testBean is not a proxy", AopUtils.isAopProxy(bean), is(true));
+		Map<?,?> services = ctx.getBeansWithAnnotation(Service.class);
+		assertThat("Stereotype annotation not visible", services.containsKey("testBean"), is(true));
+	}
+
 	@Test
 	public void txManagerIsResolvedOnInvocationOfTransactionalMethod() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
@@ -97,6 +108,11 @@ static class EnableTxConfig {
 	}
 
 
+	@Configuration
+	static class InheritedEnableTxConfig extends EnableTxConfig {
+	}
+
+
 	@Configuration
 	@EnableTransactionManagement(mode=AdviceMode.ASPECTJ)
 	static class EnableAspectJTxConfig {