Fix YAML load ordering problems. See https://jira.spring.io/browse/SPR-12471

Author: graemerocher

grails-bootstrap/src/main/groovy/grails/config/ConfigMap.groovy

@@ -15,14 +15,14 @@ class ConfigMap implements Map<String, Object>, Cloneable {
     public ConfigMap() {
         rootConfig = this
         path = []
-        delegateMap = [:]
+        delegateMap = new LinkedHashMap<>()
     }
 
     public ConfigMap(ConfigMap rootConfig, List<String> path) {
         super()
         this.rootConfig = rootConfig
         this.path = path
-        delegateMap = [:]
+        delegateMap = new LinkedHashMap<>()
     }
 
     public ConfigMap clone() {

grails-core/src/main/groovy/org/grails/config/PropertySourcesConfig.java

@@ -71,7 +71,7 @@ protected void initializeFromPropertySources(PropertySources propertySources) {
     }
 
     private void mergeEnumerablePropertySource(EnumerablePropertySource enumerablePropertySource) {
-        Map map = new HashMap();
+        Map map = new LinkedHashMap();
         for(String propertyName : enumerablePropertySource.getPropertyNames()) {
             map.put(propertyName, enumerablePropertySource.getProperty(propertyName));
         }

grails-core/src/main/groovy/org/grails/config/yaml/YamlPropertySourceLoader.groovy

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014 original 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.grails.config.yaml
+
+import groovy.transform.CompileStatic
+import org.springframework.beans.factory.config.YamlProcessor
+import org.springframework.boot.env.PropertySourceLoader
+import org.springframework.boot.yaml.SpringProfileDocumentMatcher
+import org.springframework.core.Ordered
+import org.springframework.core.annotation.Order
+import org.springframework.core.env.MapPropertySource
+import org.springframework.core.env.PropertySource
+import org.springframework.core.io.Resource
+import org.springframework.util.ClassUtils
+
+/**
+ * @author Graeme Rocher
+ * @since 3.0
+ */
+@CompileStatic
+@Order(Ordered.HIGHEST_PRECEDENCE)
+class YamlPropertySourceLoader extends YamlProcessor implements PropertySourceLoader {
+    @Override
+    String[] getFileExtensions() {
+        ['yml', 'yaml'] as String[]
+    }
+
+    @Override
+    PropertySource<?> load(String name, Resource resource, String profile) throws IOException {
+        if (ClassUtils.isPresent("org.yaml.snakeyaml.Yaml", null)) {
+            if (profile == null) {
+                matchDefault = true
+                setDocumentMatchers(new SpringProfileDocumentMatcher())
+            }
+            else {
+                matchDefault = false;
+                setDocumentMatchers(new SpringProfileDocumentMatcher(profile))
+            }
+            resources = [resource] as Resource[]
+            def propertySource = new LinkedHashMap<>()
+            process { Properties properties, Map<String, Object> map ->
+                propertySource.putAll(properties)
+                propertySource.putAll(map)
+            }
+            if (!propertySource.isEmpty()) {
+                return new MapPropertySource(name, propertySource);
+            }
+        }
+        return null
+    }
+
+
+}

grails-core/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,4 @@
 # PropertySource Loaders
 org.springframework.boot.env.PropertySourceLoader=\
-org.grails.core.cfg.GroovyConfigPropertySourceLoader
+org.grails.core.cfg.GroovyConfigPropertySourceLoader,\
+org.grails.config.yaml.YamlPropertySourceLoader