From 8721d01ed88efd1185054457352b2543c73d8fbc Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Tue, 23 Feb 2021 13:35:46 -0500 Subject: [PATCH] Updated sample to support allowed properties list resolves #144 --- transition-sample/pom.xml | 7 ++++++- ...-configuration-metadata-whitelist.properties | 1 + .../spring/taskapp/TaskappApplicationTests.java | 17 ++++++++--------- 3 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 transition-sample/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties diff --git a/transition-sample/pom.xml b/transition-sample/pom.xml index fe28e67..f137b23 100644 --- a/transition-sample/pom.xml +++ b/transition-sample/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.RELEASE + 2.4.2 io.spring @@ -27,6 +27,11 @@ org.springframework.boot spring-boot-starter-data-jdbc + + org.springframework.boot + spring-boot-configuration-processor + true + org.springframework.cloud spring-cloud-starter-task diff --git a/transition-sample/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties b/transition-sample/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties new file mode 100644 index 0000000..cea2ced --- /dev/null +++ b/transition-sample/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties @@ -0,0 +1 @@ +configuration-properties.classes=io.spring.taskapp.configuration.TaskAppProperties diff --git a/transition-sample/src/test/java/io/spring/taskapp/TaskappApplicationTests.java b/transition-sample/src/test/java/io/spring/taskapp/TaskappApplicationTests.java index fe05141..60d6ef4 100644 --- a/transition-sample/src/test/java/io/spring/taskapp/TaskappApplicationTests.java +++ b/transition-sample/src/test/java/io/spring/taskapp/TaskappApplicationTests.java @@ -16,25 +16,24 @@ package io.spring.taskapp; -import org.junit.Rule; -import org.junit.Test; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.SpringApplication; -import org.springframework.boot.test.system.OutputCaptureRule; +import org.springframework.boot.test.system.CapturedOutput; +import org.springframework.boot.test.system.OutputCaptureExtension; import static org.assertj.core.api.Assertions.assertThat; +@ExtendWith(OutputCaptureExtension.class) public class TaskappApplicationTests { - @Rule - public OutputCaptureRule outputCapture = new OutputCaptureRule(); - @Test - public void contextLoads() { + public void contextLoads(CapturedOutput output) { String[] args = {"--taskapp.exitMessage=FOO"}; SpringApplication.run(TaskappApplication.class, args); - - String output = this.outputCapture.toString(); + assertThat(output).contains(" exitMessage='FOO', errorMessage='null'"); }