Skip to content

Commit c067919

Browse files
committed
Ensure Fragment can merge attributes
Use a new map when merging as the original may be immutable. Closes gh-34848
1 parent ac773d9 commit c067919

File tree

2 files changed

+51
-4
lines changed
  • spring-webflux/src

2 files changed

+51
-4
lines changed

spring-webflux/src/main/java/org/springframework/web/reactive/result/view/Fragment.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -91,9 +91,7 @@ public void mergeAttributes(Model model) {
9191
if (CollectionUtils.isEmpty(model.asMap())) {
9292
return;
9393
}
94-
if (this.model == null) {
95-
this.model = new LinkedHashMap<>();
96-
}
94+
this.model = new LinkedHashMap<>(this.model != null ? this.model : Collections.emptyMap());
9795
model.asMap().forEach((key, value) -> this.model.putIfAbsent(key, value));
9896
}
9997

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*
2+
* Copyright 2002-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.web.reactive.result.view;
18+
19+
import java.util.Map;
20+
21+
import org.junit.jupiter.api.Test;
22+
23+
import org.springframework.ui.ConcurrentModel;
24+
25+
import static org.assertj.core.api.Assertions.assertThat;
26+
27+
/**
28+
* Unit tests for {@link Fragment}.
29+
* @author Rossen Stoyanchev
30+
*/
31+
public class FragmentTests {
32+
33+
@Test
34+
void mergeAttributes() {
35+
Fragment fragment = Fragment.create("myView", Map.of("fruit", "apple"));
36+
fragment.mergeAttributes(new ConcurrentModel("vegetable", "pepper"));
37+
38+
assertThat(fragment.model()).containsExactly(Map.entry("fruit", "apple"), Map.entry("vegetable", "pepper"));
39+
}
40+
41+
@Test
42+
void mergeAttributesCollision() {
43+
Fragment fragment = Fragment.create("myView", Map.of("fruit", "apple"));
44+
fragment.mergeAttributes(new ConcurrentModel("fruit", "orange"));
45+
46+
assertThat(fragment.model()).containsExactly(Map.entry("fruit", "apple"));
47+
}
48+
49+
}

0 commit comments

Comments
 (0)