diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 801aaf4786f..e1f01ca9427 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -165,6 +165,17 @@ "deprecated": true } ],"hints": [ + { + "name": "liquibase.change-log", + "providers": [ + { + "name": "handle-as", + "parameters": { + "target": "org.springframework.core.io.Resource" + } + } + ] + }, { "name": "server.jsp-servlet.class-name", "providers": [ diff --git a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc index c41c6c06554..0c95fb128d6 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc @@ -487,17 +487,17 @@ property that defines the `SQLDialect` class name to use: ---- {"hints": [ { - "name": "spring.jooq.sql-dialect", + "name": "liquibase.change-log", "providers": [ - { - "name": "handle-as", - "parameters": { - "target": "org.jooq.SQLDialect" + { + "name": "handle-as", + "parameters": { + "target": "org.springframework.core.io.Resource" + } } - } ] - }, - ]} + } + ]} ---- diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index 5730836f6b2..d2b6663181e 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -366,6 +366,11 @@ public class ConfigurationMetadataAnnotationProcessorTests { writeAdditionalHints(ItemHint.newHint("simple.the-name", new ItemHint.ValueHint( "boot", "Bla bla"), new ItemHint.ValueHint("spring", null))); ConfigurationMetadata metadata = compile(SimpleProperties.class); + assertThat(metadata, + containsProperty("simple.the-name", String.class) + .fromSource(SimpleProperties.class) + .withDescription("The name of this simple properties.") + .withDefaultValue(is("boot")).withDeprecated()); assertThat(metadata, containsHint("simple.the-name").withValue(0, "boot", "Bla bla") .withValue(1, "spring", null)); @@ -376,6 +381,11 @@ public class ConfigurationMetadataAnnotationProcessorTests { writeAdditionalHints(ItemHint.newHint("simple.theName", new ItemHint.ValueHint( "boot", "Bla bla"))); ConfigurationMetadata metadata = compile(SimpleProperties.class); + assertThat(metadata, + containsProperty("simple.the-name", String.class) + .fromSource(SimpleProperties.class) + .withDescription("The name of this simple properties.") + .withDefaultValue(is("boot")).withDeprecated()); assertThat(metadata, containsHint("simple.the-name").withValue(0, "boot", "Bla bla")); } @@ -388,6 +398,11 @@ public class ConfigurationMetadataAnnotationProcessorTests { . singletonMap("target", "org.foo")), new ItemHint.ValueProvider("second", null)))); ConfigurationMetadata metadata = compile(SimpleProperties.class); + assertThat(metadata, + containsProperty("simple.the-name", String.class) + .fromSource(SimpleProperties.class) + .withDescription("The name of this simple properties.") + .withDefaultValue(is("boot")).withDeprecated()); assertThat(metadata, containsHint("simple.the-name") .withProvider("first", "target", "org.foo")