Merge branch '1.5.x'

Author: wilkinsona

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

@@ -151,7 +151,7 @@ public void handlerMapping(MvcEndpoints endpoints,
 
 	@Configuration
 	@ConditionalOnClass({ EnableWebSecurity.class, Filter.class })
-	@ConditionalOnBean(name = "springSecurityFilterChain", search = SearchStrategy.PARENTS)
+	@ConditionalOnBean(name = "springSecurityFilterChain", search = SearchStrategy.ANCESTORS)
 	public static class EndpointWebMvcChildContextSecurityConfiguration {
 
 		@Bean

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

@@ -126,7 +126,7 @@ else if (!hasSingleAutowireCandidate(context.getBeanFactory(), matching,
 	private List<String> getMatchingBeans(ConditionContext context,
 			BeanSearchSpec beans) {
 		ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-		if (beans.getStrategy() == SearchStrategy.PARENTS) {
+		if (beans.getStrategy() == SearchStrategy.ANCESTORS) {
 			BeanFactory parent = beanFactory.getParentBeanFactory();
 			Assert.isInstanceOf(ConfigurableListableBeanFactory.class, parent,
 					"Unable to use SearchStrategy.PARENTS");

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

@@ -29,9 +29,9 @@ public enum SearchStrategy {
 	CURRENT,
 
 	/**
-	 * Search all parents and ancestors, but not the current context.
+	 * Search all ancestors, but not the current context.
 	 */
-	PARENTS,
+	ANCESTORS,
 
 	/**
 	 * Search the entire hierarchy.

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

@@ -258,7 +258,7 @@ public void testOnMissingBeanConditionWithIgnoredSubclassByName() {
 	}
 
 	@Test
-	public void grandparentIsConsideredWhenUsingParentsStrategy() {
+	public void grandparentIsConsideredWhenUsingAncestorsStrategy() {
 		this.context.register(ExampleBeanConfiguration.class);
 		this.context.refresh();
 		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
@@ -267,29 +267,29 @@ public void grandparentIsConsideredWhenUsingParentsStrategy() {
 		AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();
 		child.setParent(parent);
 		child.register(ExampleBeanConfiguration.class,
-				OnBeanInParentsConfiguration.class);
+				OnBeanInAncestorsConfiguration.class);
 		child.refresh();
 		assertThat(child.getBeansOfType(ExampleBean.class)).hasSize(1);
 		child.close();
 		parent.close();
 	}
 
 	@Test
-	public void currentContextIsIgnoredWhenUsingParentsStrategy() {
+	public void currentContextIsIgnoredWhenUsingAncestorsStrategy() {
 		this.context.refresh();
 		AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();
 		child.register(ExampleBeanConfiguration.class,
-				OnBeanInParentsConfiguration.class);
+				OnBeanInAncestorsConfiguration.class);
 		child.setParent(this.context);
 		child.refresh();
 		assertThat(child.getBeansOfType(ExampleBean.class)).hasSize(2);
 	}
 
 	@Configuration
-	protected static class OnBeanInParentsConfiguration {
+	protected static class OnBeanInAncestorsConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean(search = SearchStrategy.PARENTS)
+		@ConditionalOnMissingBean(search = SearchStrategy.ANCESTORS)
 		public ExampleBean exampleBean2() {
 			return new ExampleBean("test");
 		}

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

@@ -63,22 +63,22 @@ public void singleCandidateOneCandidate() {
 	}
 
 	@Test
-	public void singleCandidateInParentsOneCandidateInCurrent() {
+	public void singleCandidateInAncestorsOneCandidateInCurrent() {
 		load();
 		AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();
 		child.register(FooConfiguration.class,
-				OnBeanSingleCandidateInParentsConfiguration.class);
+				OnBeanSingleCandidateInAncestorsConfiguration.class);
 		child.setParent(this.context);
 		child.refresh();
 		assertThat(child.containsBean("baz")).isFalse();
 		child.close();
 	}
 
 	@Test
-	public void singleCandidateInParentsOneCandidateInParent() {
+	public void singleCandidateInAncestorsOneCandidateInParent() {
 		load(FooConfiguration.class);
 		AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();
-		child.register(OnBeanSingleCandidateInParentsConfiguration.class);
+		child.register(OnBeanSingleCandidateInAncestorsConfiguration.class);
 		child.setParent(this.context);
 		child.refresh();
 		assertThat(child.containsBean("baz")).isTrue();
@@ -87,13 +87,13 @@ public void singleCandidateInParentsOneCandidateInParent() {
 	}
 
 	@Test
-	public void singleCandidateInParentsOneCandidateInGrandparent() {
+	public void singleCandidateInAncestorsOneCandidateInGrandparent() {
 		load(FooConfiguration.class);
 		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
 		parent.setParent(this.context);
 		parent.refresh();
 		AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();
-		child.register(OnBeanSingleCandidateInParentsConfiguration.class);
+		child.register(OnBeanSingleCandidateInAncestorsConfiguration.class);
 		child.setParent(parent);
 		child.refresh();
 		assertThat(child.containsBean("baz")).isTrue();
@@ -177,8 +177,8 @@ public String baz(String s) {
 	}
 
 	@Configuration
-	@ConditionalOnSingleCandidate(value = String.class, search = SearchStrategy.PARENTS)
-	protected static class OnBeanSingleCandidateInParentsConfiguration {
+	@ConditionalOnSingleCandidate(value = String.class, search = SearchStrategy.ANCESTORS)
+	protected static class OnBeanSingleCandidateInAncestorsConfiguration {
 
 		@Bean
 		public String baz(String s) {