root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-07 14:38:52 +02:00
parent 31c7102800 4a1bdc2c05
commit 9cf68a2de4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java vendored
View File

@ -23,6 +23,7 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.BaseConstructor;
import org.yaml.snakeyaml.constructor.Constructor;
@ -64,7 +65,9 @@ class OriginTrackedYamlLoader extends YamlProcessor {
Representer representer = new Representer();
DumperOptions dumperOptions = new DumperOptions();
LimitedResolver resolver = new LimitedResolver();
return new Yaml(constructor, representer, dumperOptions, resolver);
LoaderOptions loaderOptions = new LoaderOptions();
loaderOptions.setAllowDuplicateKeys(false);
return new Yaml(constructor, representer, dumperOptions, loaderOptions, resolver);
}
public List<Map<String, Object>> load() {
@ -76,7 +79,7 @@ class OriginTrackedYamlLoader extends YamlProcessor {
/**
* {@link Constructor} that tracks property origins.
*/
private class OriginTrackingConstructor extends StrictMapAppenderConstructor {
private class OriginTrackingConstructor extends Constructor {
@Override
protected Object constructObject(Node node) {