Merge branch '2.6.x' into 2.7.x

spring-projects · Jul 27, 2022 · 2382e83 · 2382e83
2 parents 5a52220 + 2709f77
commit 2382e83
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...or/src/main/java/org/springframework/boot/actuate/health/NamedContributorsMapAdapter.java b/...or/src/main/java/org/springframework/boot/actuate/health/NamedContributorsMapAdapter.java
@@ -18,10 +18,10 @@
 
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.springframework.util.Assert;
 
@@ -43,8 +43,9 @@ abstract class NamedContributorsMapAdapter<V, C> implements NamedContributors<C>
 		Assert.notNull(map, "Map must not be null");
 		Assert.notNull(valueAdapter, "ValueAdapter must not be null");
 		map.keySet().forEach(this::validateKey);
-		this.map = Collections.unmodifiableMap(map.entrySet().stream()
-				.collect(Collectors.toMap(Entry::getKey, (entry) -> adapt(entry.getValue(), valueAdapter))));
+		this.map = Collections.unmodifiableMap(map.entrySet().stream().collect(LinkedHashMap::new,
+				(result, entry) -> result.put(entry.getKey(), adapt(entry.getValue(), valueAdapter)), Map::putAll));
+
 	}
 
 	private void validateKey(String value) {