Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-05-06 11:12:06 +02:00
parent 21536f64e1 daf0b081e7
commit b167a03b3d
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/env/PropertiesPropertySourceLoader.java vendored
View File

@@ -22,7 +22,6 @@ import java.util.Properties;
import org.springframework.core.env.PropertiesPropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.EncodedResource;
import org.springframework.core.io.support.PropertiesLoaderUtils;
/**
@@ -42,8 +41,7 @@ public class PropertiesPropertySourceLoader implements PropertySourceLoader {
public PropertySource<?> load(String name, Resource resource, String profile)
throws IOException {
if (profile == null) {
Properties properties = PropertiesLoaderUtils
.loadProperties(new EncodedResource(resource, "UTF-8"));
Properties properties = PropertiesLoaderUtils.loadProperties(resource);
if (!properties.isEmpty()) {
return new PropertiesPropertySource(name, properties);
}

19
spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* 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.
@@ -21,7 +21,8 @@ import org.junit.Test;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
/**
* Tests for {@link PropertiesPropertySourceLoader}.
@@ -34,28 +35,22 @@ public class PropertiesPropertySourceLoaderTests {
@Test
public void getFileExtensions() throws Exception {
assertThat(this.loader.getFileExtensions()).containsExactly("properties", "xml");
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")).isEqualTo("properties");
}
@Test
public void loadPropertiesEncoded() throws Exception {
PropertySource<?> source = this.loader.load("encoded.properties",
new ClassPathResource("test-encoded.properties", getClass()), null);
assertThat(source.getProperty("test")).isEqualTo("prकperties");
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")).isEqualTo("xml");
assertThat(source.getProperty("test"), equalTo((Object) "xml"));
}
}

1
spring-boot/src/test/resources/org/springframework/boot/env/test-encoded.properties vendored
View File

@@ -1 +0,0 @@
test=prकperties