diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java index 2a886020c9c..165b103768f 100644 --- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java @@ -546,12 +546,11 @@ public abstract class CollectionUtils { } /** - * Return a map that combines the provided maps. Invoking - * {@link Map#put(Object, Object)} on the returned map will apply - * {@code putFunction}, or will throw an - * {@link UnsupportedOperationException} {@code putFunction} is - * {@code null}. The same applies to {@link Map#putAll(Map)} and - * {@code putAllFunction}. + * Return a map that combines the provided maps. + *
Invoking {@link Map#put(Object, Object)} on the returned map will apply + * {@code putFunction}, or will throw an {@link UnsupportedOperationException} + * if {@code putFunction} is {@code null}. The same applies to + * {@link Map#putAll(Map)} and {@code putAllFunction}. *
In the case of a key collision, {@code first} takes precedence over
* {@code second}. In other words, entries in {@code second} with a key
* that is also mapped by {@code first} are effectively ignored.
diff --git a/spring-core/src/main/java/org/springframework/util/CompositeMap.java b/spring-core/src/main/java/org/springframework/util/CompositeMap.java
index 5af883f269e..9f01cf286c3 100644
--- a/spring-core/src/main/java/org/springframework/util/CompositeMap.java
+++ b/spring-core/src/main/java/org/springframework/util/CompositeMap.java
@@ -77,22 +77,12 @@ final class CompositeMap