Merge pull request #34729 from Ferioney

* pr/34729: Polish "Fix hint to include all Liquibase resources in default location" Fix hint to include all Liquibase resources in default location Closes gh-34729
spring-projects · Apr 11, 2023 · 164ab51 · 164ab51
2 parents 308e527 + 03d42de
commit 164ab51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
@@ -175,7 +175,7 @@ static class LiquibaseAutoConfigurationRuntimeHints implements RuntimeHintsRegis
 
 		@Override
 		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-			hints.resources().registerPattern("db/changelog/db.changelog-master.yaml");
+			hints.resources().registerPattern("db/changelog/*");
 		}
 
 	}

diff --git a/...ava/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/...ava/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
@@ -423,8 +423,10 @@ void whenCustomSpringLiquibaseIsDefinedThenJooqDslContextDependsOnSpringLiquibas
 	void shouldRegisterHints() {
 		RuntimeHints hints = new RuntimeHints();
 		new LiquibaseAutoConfigurationRuntimeHints().registerHints(hints, getClass().getClassLoader());
+		assertThat(RuntimeHintsPredicates.resource().forResource("db/changelog/")).accepts(hints);
 		assertThat(RuntimeHintsPredicates.resource().forResource("db/changelog/db.changelog-master.yaml"))
 			.accepts(hints);
+		assertThat(RuntimeHintsPredicates.resource().forResource("db/changelog/tables/init.sql")).accepts(hints);
 	}
 
 	private ContextConsumer<AssertableApplicationContext> assertLiquibase(Consumer<SpringLiquibase> consumer) {