From 4164cad0779730c00bdafdf667eea27dc83e3346 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 9 Dec 2014 14:51:44 +0100 Subject: [PATCH] Add meta-data for banner keys Fixes gh-2093 --- .../org/springframework/boot/SpringApplication.java | 2 +- .../additional-spring-configuration-metadata.json | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 15a92972de..098d8e4450 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -468,7 +468,7 @@ public class SpringApplication { /** * Print a custom banner message to the console, optionally extracting its location or * content from the Environment (banner.location and banner.charset). The defaults are - * banner.location=classpath:banner.txt, banner.charest=UTF-8. If the banner file does + * banner.location=classpath:banner.txt, banner.charset=UTF-8. If the banner file does * not exist or cannot be printed, a simple default is created. * @see #setShowBanner(boolean) * @see #printBanner() diff --git a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 72a57d798e..504497d8ab 100644 --- a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -4,6 +4,18 @@ "type": "org.springframework.boot.logging.LoggingApplicationListener" } ],"properties": [ + { + "name": "banner.charset", + "type": "java.nio.charset.Charset", + "description": "Banner file encoding.", + "defaultValue": "UTF-8" + }, + { + "name": "banner.location", + "type": "java.lang.String", + "description": "Banner file location.", + "defaultValue": "classpath:banner.txt" + }, { "name": "debug", "type": "java.lang.Boolean",