From ed12f97fda99ee931c6839ee9b9eee91e3bc805d Mon Sep 17 00:00:00 2001 From: Phillip Wirth Date: Tue, 28 Oct 2014 20:42:21 +0100 Subject: [PATCH 1/2] 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")); } } From 907f60e8719fc7861d30ba0fd15f66a3e8f9eb6c Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 4 Nov 2014 09:31:36 -0800 Subject: [PATCH 2/2] Add PropertiesPropertySourceLoader test --- .../PropertiesPropertySourceLoaderTests.java | 55 +++++++++++++++++++ .../boot/env/test-properties.properties | 1 + .../org/springframework/boot/env/test-xml.xml | 5 ++ 3 files changed, 61 insertions(+) create mode 100644 spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java create mode 100644 spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties create mode 100644 spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml diff --git a/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java b/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java new file mode 100644 index 00000000000..2f0287c1102 --- /dev/null +++ b/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java @@ -0,0 +1,55 @@ +/* + * Copyright 2012-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.env; + +import org.junit.Test; +import org.springframework.core.env.PropertySource; +import org.springframework.core.io.ClassPathResource; + +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; + +/** + * Tests for {@link PropertiesPropertySourceLoader}. + * + * @author Phillip Webb + */ +public class PropertiesPropertySourceLoaderTests { + + private PropertiesPropertySourceLoader loader = new PropertiesPropertySourceLoader(); + + @Test + public void getFileExtensions() throws Exception { + assertThat(this.loader.getFileExtensions(), equalTo(new String[] { "properties", + "xml" })); + } + + @Test + public void loadProperties() throws Exception { + PropertySource source = this.loader.load("test.properties", + new ClassPathResource("test-properties.properties", getClass()), null); + assertThat(source.getProperty("test"), equalTo((Object) "properties")); + } + + @Test + public void loadXml() throws Exception { + PropertySource source = this.loader.load("test.xml", new ClassPathResource( + "test-xml.xml", getClass()), null); + assertThat(source.getProperty("test"), equalTo((Object) "xml")); + } + +} diff --git a/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties b/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties new file mode 100644 index 00000000000..1ddbab8c1e2 --- /dev/null +++ b/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties @@ -0,0 +1 @@ +test=properties diff --git a/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml b/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml new file mode 100644 index 00000000000..5d3350e81fb --- /dev/null +++ b/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml @@ -0,0 +1,5 @@ + + + + xml +