Merge pull request #22681 from biergit

* gh-22681:
  Polish "Look in correct context when finding Liquibase beans"
  Look in correct context when finding Liquibase beans

Closes gh-22681

Author: wilkinsona

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ public ApplicationLiquibaseBeans liquibaseBeans() {
 		while (target != null) {
 			Map<String, LiquibaseBean> liquibaseBeans = new HashMap<>();
 			DatabaseFactory factory = DatabaseFactory.getInstance();
-			this.context.getBeansOfType(SpringLiquibase.class)
+			target.getBeansOfType(SpringLiquibase.class)
 					.forEach((name, liquibase) -> liquibaseBeans.put(name, createReport(liquibase, factory)));
 			ApplicationContext parent = target.getParent();
 			contextBeans.put(target.getId(),

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java

@@ -62,6 +62,17 @@ void liquibaseReportIsReturned() {
 		});
 	}
 
+	@Test
+	void liquibaseReportIsReturnedForContextHierarchy() {
+		this.contextRunner.withUserConfiguration().run((parent) -> {
+			this.contextRunner.withUserConfiguration(Config.class).withParent(parent).run((context) -> {
+				Map<String, LiquibaseBean> liquibaseBeans = context.getBean(LiquibaseEndpoint.class).liquibaseBeans()
+						.getContexts().get(parent.getId()).getLiquibaseBeans();
+				assertThat(liquibaseBeans.get("liquibase").getChangeSets()).hasSize(1);
+			});
+		});
+	}
+
 	@Test
 	void invokeWithCustomSchema() {
 		this.contextRunner.withUserConfiguration(Config.class)