Update Spring to catch SPR-11069

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java

@@ -96,9 +96,7 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
  */
 @Configuration
 @ConditionalOnClass({ EnableWebSecurity.class })
-// TODO: re-enable this when SPR-11069 is fixed
-// @ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
-@ConditionalOnMissingBean(SecurityAutoConfiguration.class)
+@ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
 @EnableConfigurationProperties
 public class SecurityAutoConfiguration {
 

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java

@@ -21,7 +21,6 @@ import org.springframework.boot.TestUtils;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -46,7 +45,7 @@ public class SecurityAutoConfigurationTests {
 	public void testWebConfiguration() throws Exception {
 		this.context = new AnnotationConfigWebApplicationContext();
 		this.context.setServletContext(new MockServletContext());
-		this.context.register(SecurityConfiguration.class,
+		this.context.register(SecurityAutoConfiguration.class,
 				EndpointAutoConfiguration.class,
 				ManagementServerPropertiesAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class);
@@ -61,7 +60,7 @@ public class SecurityAutoConfigurationTests {
 	public void testDisableIgnoredStaticApplicationPaths() throws Exception {
 		this.context = new AnnotationConfigWebApplicationContext();
 		this.context.setServletContext(new MockServletContext());
-		this.context.register(SecurityConfiguration.class,
+		this.context.register(SecurityAutoConfiguration.class,
 				EndpointAutoConfiguration.class,
 				ManagementServerPropertiesAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class);
@@ -76,7 +75,7 @@ public class SecurityAutoConfigurationTests {
 	public void testDisableBasicAuthOnApplicationPaths() throws Exception {
 		this.context = new AnnotationConfigWebApplicationContext();
 		this.context.setServletContext(new MockServletContext());
-		this.context.register(SecurityConfiguration.class,
+		this.context.register(SecurityAutoConfiguration.class,
 				EndpointAutoConfiguration.class,
 				ManagementServerPropertiesAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class);
@@ -100,12 +99,6 @@ public class SecurityAutoConfigurationTests {
 				this.context.getBean(AuthenticationManager.class));
 	}
 
-	// Use this while SPR-11069 prevents us from checking OnMissingBean by annotation
-	@Configuration
-	@Import(SecurityAutoConfiguration.class)
-	protected static class SecurityConfiguration {
-	}
-
 	@Configuration
 	protected static class TestConfiguration {
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

@@ -21,7 +21,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryUtils;
@@ -154,8 +153,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
 			@SuppressWarnings("unchecked")
 			Class<? extends Annotation> typeClass = (Class<? extends Annotation>) ClassUtils
 					.forName(type, classLoader);
-			Map<String, Object> annotated = beanFactory.getBeansWithAnnotation(typeClass);
-			result = annotated.keySet().toArray(new String[annotated.size()]);
+			result = beanFactory.getBeanNamesForAnnotation(typeClass);
 			if (considerHierarchy) {
 				if (beanFactory.getParentBeanFactory() instanceof ConfigurableListableBeanFactory) {
 					String[] parentResult = getBeanNamesForAnnotation(

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java

@@ -17,10 +17,14 @@
 package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Test;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.util.Assert;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
@@ -93,6 +97,18 @@ public class ConditionalOnMissingBeanTests {
 		assertEquals("foo", this.context.getBean("foo"));
 	}
 
+	// Rigorous test for SPR-11069
+	@Test
+	public void testAnnotationOnMissingBeanConditionWithEagerFactoryBean() {
+		this.context.register(FooConfiguration.class, OnAnnotationConfiguration.class,
+				ConfigurationWithFactoryBean.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+		assertFalse(this.context.containsBean("bar"));
+		assertTrue(this.context.containsBean("example"));
+		assertEquals("foo", this.context.getBean("foo"));
+	}
+
 	@Configuration
 	@ConditionalOnMissingBean(name = "foo")
 	protected static class OnBeanNameConfiguration {
@@ -111,6 +127,11 @@ public class ConditionalOnMissingBeanTests {
 		}
 	}
 
+	@Configuration
+	@ImportResource("org/springframework/boot/autoconfigure/condition/factorybean.xml")
+	protected static class ConfigurationWithFactoryBean {
+	}
+
 	@Configuration
 	@EnableScheduling
 	protected static class FooConfiguration {
@@ -159,4 +180,27 @@ public class ConditionalOnMissingBeanTests {
 
 	public static class ExampleBean {
 	}
+
+	public static class ExampleFactoryBean implements FactoryBean<ExampleBean> {
+
+		public ExampleFactoryBean(String value) {
+			Assert.state(!value.contains("$"));
+		}
+
+		@Override
+		public ExampleBean getObject() throws Exception {
+			return new ExampleBean();
+		}
+
+		@Override
+		public Class<?> getObjectType() {
+			return ExampleBean.class;
+		}
+
+		@Override
+		public boolean isSingleton() {
+			return false;
+		}
+
+	}
 }

spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/condition/factorybean.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<bean id="example"
+		class="org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBeanTests.ExampleFactoryBean">
+		<constructor-arg value="${value:bar}" />
+	</bean>
+
+</beans>

spring-boot-dependencies/pom.xml

@@ -34,7 +34,7 @@
 		<slf4j.version>1.7.5</slf4j.version>
 		<snakeyaml.version>1.12</snakeyaml.version>
 		<spock.version>0.7-groovy-2.0</spock.version>
-		<spring.version>4.0.0.RC1</spring.version>
+		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
 		<spring-integration.version>2.2.4.RELEASE</spring-integration.version>
 		<spring-integration-groovydsl.version>1.0.0.M1</spring-integration-groovydsl.version>
 		<spring-batch.version>2.2.2.RELEASE</spring-batch.version>