From ed12f97fda99ee931c6839ee9b9eee91e3bc805d Mon Sep 17 00:00:00 2001 From: Phillip Wirth Date: Tue, 28 Oct 2014 20:42:21 +0100 Subject: [PATCH] Add XML support to PropertiesPropertySourceLoader Fixes gh-1777 Closes 1783 --- .../boot/env/PropertiesPropertySourceLoader.java | 2 +- .../springframework/boot/env/PropertySourcesLoaderTests.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/env/PropertiesPropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/env/PropertiesPropertySourceLoader.java index 39f97764424..7f3eb266681 100644 --- a/spring-boot/src/main/java/org/springframework/boot/env/PropertiesPropertySourceLoader.java +++ b/spring-boot/src/main/java/org/springframework/boot/env/PropertiesPropertySourceLoader.java @@ -34,7 +34,7 @@ public class PropertiesPropertySourceLoader implements PropertySourceLoader { @Override public String[] getFileExtensions() { - return new String[] { "properties" }; + return new String[] { "properties", "xml" }; } @Override diff --git a/spring-boot/src/test/java/org/springframework/boot/env/PropertySourcesLoaderTests.java b/spring-boot/src/test/java/org/springframework/boot/env/PropertySourcesLoaderTests.java index 39dbf9a1e6d..0baa7ee0b6a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/env/PropertySourcesLoaderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/env/PropertySourcesLoaderTests.java @@ -34,6 +34,7 @@ public class PropertySourcesLoaderTests { assertTrue(this.loader.getAllFileExtensions().contains("yml")); assertTrue(this.loader.getAllFileExtensions().contains("yaml")); assertTrue(this.loader.getAllFileExtensions().contains("properties")); + assertTrue(this.loader.getAllFileExtensions().contains("xml")); } }