Polish "Fix Liquibase endpoint's output with multiple datasources"

See gh-19171

Author: wilkinsona

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

@@ -25,7 +25,6 @@
 
 import javax.sql.DataSource;
 
-import liquibase.changelog.ChangeLogHistoryService;
 import liquibase.changelog.ChangeSet.ExecType;
 import liquibase.changelog.RanChangeSet;
 import liquibase.changelog.StandardChangeLogHistoryService;
@@ -63,10 +62,8 @@ public ApplicationLiquibaseBeans liquibaseBeans() {
 		while (target != null) {
 			Map<String, LiquibaseBean> liquibaseBeans = new HashMap<>();
 			DatabaseFactory factory = DatabaseFactory.getInstance();
-			this.context.getBeansOfType(SpringLiquibase.class).forEach((name, liquibase) -> {
-				StandardChangeLogHistoryService service = new StandardChangeLogHistoryService();
-				liquibaseBeans.put(name, createReport(liquibase, service, factory));
-			});
+			this.context.getBeansOfType(SpringLiquibase.class)
+					.forEach((name, liquibase) -> liquibaseBeans.put(name, createReport(liquibase, factory)));
 			ApplicationContext parent = target.getParent();
 			contextBeans.put(target.getId(),
 					new ContextLiquibaseBeans(liquibaseBeans, (parent != null) ? parent.getId() : null));
@@ -75,8 +72,7 @@ public ApplicationLiquibaseBeans liquibaseBeans() {
 		return new ApplicationLiquibaseBeans(contextBeans);
 	}
 
-	private LiquibaseBean createReport(SpringLiquibase liquibase, ChangeLogHistoryService service,
-			DatabaseFactory factory) {
+	private LiquibaseBean createReport(SpringLiquibase liquibase, DatabaseFactory factory) {
 		try {
 			DataSource dataSource = liquibase.getDataSource();
 			JdbcConnection connection = new JdbcConnection(dataSource.getConnection());
@@ -89,6 +85,7 @@ private LiquibaseBean createReport(SpringLiquibase liquibase, ChangeLogHistorySe
 				}
 				database.setDatabaseChangeLogTableName(liquibase.getDatabaseChangeLogTable());
 				database.setDatabaseChangeLogLockTableName(liquibase.getDatabaseChangeLogLockTable());
+				StandardChangeLogHistoryService service = new StandardChangeLogHistoryService();
 				service.setDatabase(database);
 				return new LiquibaseBean(
 						service.getRanChangeSets().stream().map(ChangeSet::new).collect(Collectors.toList()));

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

@@ -22,19 +22,19 @@
 
 import javax.sql.DataSource;
 
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
 import liquibase.integration.spring.SpringLiquibase;
 import org.junit.Test;
 
 import org.springframework.boot.actuate.liquibase.LiquibaseEndpoint.LiquibaseBean;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -97,17 +97,18 @@ public void connectionAutoCommitPropertyIsReset() {
 	}
 
 	@Test
-	public void multipleLiquibaseReportIsReturned() {
-		this.contextRunner.withUserConfiguration(Config.class, LiquibaseConfiguration.class).run((context) -> {
-			Map<String, LiquibaseBean> liquibaseBeans = context.getBean(LiquibaseEndpoint.class).liquibaseBeans()
-					.getContexts().get(context.getId()).getLiquibaseBeans();
-			assertThat(liquibaseBeans.get("liquibase").getChangeSets()).hasSize(1);
-			assertThat(liquibaseBeans.get("liquibase").getChangeSets().get(0).getChangeLog())
-					.isEqualTo("classpath:/db/changelog/db.changelog-master.yaml");
-			assertThat(liquibaseBeans.get("liquibaseBackup").getChangeSets()).hasSize(1);
-			assertThat(liquibaseBeans.get("liquibaseBackup").getChangeSets().get(0).getChangeLog())
-					.isEqualTo("classpath:/db/changelog/db.changelog-master-backup.yaml");
-		});
+	public void whenMultipleLiquibaseBeansArePresentChangeSetsAreCorrectlyReportedForEachBean() {
+		this.contextRunner.withUserConfiguration(Config.class, MultipleDataSourceLiquibaseConfiguration.class)
+				.run((context) -> {
+					Map<String, LiquibaseBean> liquibaseBeans = context.getBean(LiquibaseEndpoint.class)
+							.liquibaseBeans().getContexts().get(context.getId()).getLiquibaseBeans();
+					assertThat(liquibaseBeans.get("liquibase").getChangeSets()).hasSize(1);
+					assertThat(liquibaseBeans.get("liquibase").getChangeSets().get(0).getChangeLog())
+							.isEqualTo("classpath:/db/changelog/db.changelog-master.yaml");
+					assertThat(liquibaseBeans.get("liquibaseBackup").getChangeSets()).hasSize(1);
+					assertThat(liquibaseBeans.get("liquibaseBackup").getChangeSets().get(0).getChangeLog())
+							.isEqualTo("classpath:/db/changelog/db.changelog-master-backup.yaml");
+				});
 	}
 
 	private boolean getAutoCommit(DataSource dataSource) throws SQLException {
@@ -127,39 +128,38 @@ public LiquibaseEndpoint endpoint(ApplicationContext context) {
 	}
 
 	@Configuration
-	static class LiquibaseConfiguration {
+	static class MultipleDataSourceLiquibaseConfiguration {
 
 		@Bean
 		DataSource dataSource() {
-			HikariConfig config = new HikariConfig();
-			config.setJdbcUrl("jdbc:hsqldb:mem:test");
-			config.setUsername("sa");
-			return new HikariDataSource(config);
+			return createEmbeddedDatabase();
 		}
 
 		@Bean
 		DataSource dataSourceBackup() {
-			HikariConfig config = new HikariConfig();
-			config.setJdbcUrl("jdbc:hsqldb:mem:testBackup");
-			config.setUsername("sa");
-			return new HikariDataSource(config);
+			return createEmbeddedDatabase();
 		}
 
 		@Bean
 		SpringLiquibase liquibase(DataSource dataSource) {
-			SpringLiquibase liquibase = new SpringLiquibase();
-			liquibase.setChangeLog("classpath:/db/changelog/db.changelog-master.yaml");
-			liquibase.setShouldRun(true);
-			liquibase.setDataSource(dataSource);
-			return liquibase;
+			return createSpringLiquibase("db.changelog-master.yaml", dataSource);
 		}
 
 		@Bean
 		SpringLiquibase liquibaseBackup(DataSource dataSourceBackup) {
+			return createSpringLiquibase("db.changelog-master-backup.yaml", dataSourceBackup);
+		}
+
+		private DataSource createEmbeddedDatabase() {
+			return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+					.setType(EmbeddedDatabaseConnection.HSQL.getType()).build();
+		}
+
+		private SpringLiquibase createSpringLiquibase(String changeLog, DataSource dataSource) {
 			SpringLiquibase liquibase = new SpringLiquibase();
-			liquibase.setChangeLog("classpath:/db/changelog/db.changelog-master-backup.yaml");
+			liquibase.setChangeLog("classpath:/db/changelog/" + changeLog);
 			liquibase.setShouldRun(true);
-			liquibase.setDataSource(dataSourceBackup);
+			liquibase.setDataSource(dataSource);
 			return liquibase;
 		}