Merge branch '6.2.x'

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,9 +86,7 @@ public final class Fragment {
 		if (CollectionUtils.isEmpty(model.asMap())) {
 			return;
 		}
-		if (this.model == null) {
+		this.model = new LinkedHashMap<>(this.model != null ? this.model : Collections.emptyMap());
-			this.model = new LinkedHashMap<>();
-		}
 		model.asMap().forEach((key, value) -> this.model.putIfAbsent(key, value));
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,65 +23,69 @@ import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
 
 /**
- * Handler for a WebSocket session.
+ * Handler for a WebSocket messages. You can use it as follows:
- *
+ * <ul>
- * <p>A server {@code WebSocketHandler} is mapped to requests with
+ * <li>On the server side, {@code WebSocketHandler} is mapped to requests with
  * {@link org.springframework.web.reactive.handler.SimpleUrlHandlerMapping
  * SimpleUrlHandlerMapping} and
  * {@link org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter
- * WebSocketHandlerAdapter}. A client {@code WebSocketHandler} is passed to the
+ * WebSocketHandlerAdapter}.
+ * <li>On the client side, {@code WebSocketHandler} is passed into the
  * {@link org.springframework.web.reactive.socket.client.WebSocketClient
  * WebSocketClient} execute method.
+ * </ul>
  *
- * <p>Use {@link WebSocketSession#receive() session.receive()} to compose on
+ * <p>{@link WebSocketSession#receive() session.receive()} handles inbound
- * the inbound message stream, and {@link WebSocketSession#send(Publisher)
+ * messages, while {@link WebSocketSession#send(Publisher) session.send}
- * session.send(publisher)} for the outbound message stream. Below is an
+ * sends outbound messages. Below is an example of handling inbound messages
- * example, combined flow to process inbound and to send outbound messages:
+ * and responding to every message:
  *
  * <pre class="code">
- * class ExampleHandler implements WebSocketHandler {
+ *	class ExampleHandler implements WebSocketHandler {
- *
+ *
- * 	&#064;Override
+ *		&#064;Override
- * 	public Mono&lt;Void&gt; handle(WebSocketSession session) {
+ *		public Mono&lt;Void&gt; handle(WebSocketSession session) {
- *
+ *			Flux&lt;WebSocketMessage&gt; output = session.receive()
- * 		Flux&lt;WebSocketMessage&gt; output = session.receive()
+ * 				.doOnNext(message -&gt; {
- *			.doOnNext(message -&gt; {
+ * 					// Imperative calls without a return value:
- * 				// ...
+ * 					// perform access checks, log, validate, update metrics.
- * 			})
+ * 					// ...
- * 			.concatMap(message -&gt; {
+ * 				})
- * 				// ...
+ * 				.concatMap(message -&gt; {
- * 			})
+ * 					// Async, non-blocking calls:
- * 			.map(value -&gt; session.textMessage("Echo " + value));
+ * 					// parse messages, call a database, make remote calls.
- *
+ * 					// Return the same message, or a transformed value
- * 		return session.send(output);
+ * 					// ...
- * 	}
+ * 				});
- * }
+ * 			return session.send(output);
+ *		}
+ *	}
  * </pre>
  *
  * <p>If processing inbound and sending outbound messages are independent
  * streams, they can be joined together with the "zip" operator:
  *
  * <pre class="code">
- * class ExampleHandler implements WebSocketHandler {
+ *	class ExampleHandler implements WebSocketHandler {
- *
+ *
- * 	&#064;Override
+ *		&#064;Override
- * 	public Mono&lt;Void&gt; handle(WebSocketSession session) {
+ *		public Mono&lt;Void&gt; handle(WebSocketSession session) {
- *
+ *
- * 		Mono&lt;Void&gt; input = session.receive()
+ *			Mono&lt;Void&gt; input = session.receive()
- *			.doOnNext(message -&gt; {
+ *				.doOnNext(message -&gt; {
- * 				// ...
+ * 					// ...
- * 			})
+ * 				})
- * 			.concatMap(message -&gt; {
+ * 				.concatMap(message -&gt; {
- * 				// ...
+ * 					// ...
- * 			})
+ * 				})
- * 			.then();
+ * 				.then();
- *
+ *
- *		Flux&lt;String&gt; source = ... ;
+ *			Flux&lt;String&gt; source = ... ;
- * 		Mono&lt;Void&gt; output = session.send(source.map(session::textMessage));
+ * 			Mono&lt;Void&gt; output = session.send(source.map(session::textMessage));
- *
+ *
- * 		return Mono.zip(input, output).then();
+ * 			return Mono.zip(input, output).then();
- * 	}
+ *		}
- * }
+ *	}
  * </pre>
  *
  * <p>A {@code WebSocketHandler} must compose the inbound and outbound streams

spring-webflux/src/test/java/org/springframework/web/reactive/result/view/FragmentTests.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2002-2025 the original author or 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
+ *
+ *      https://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.springframework.web.reactive.result.view;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.ui.ConcurrentModel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Unit tests for {@link Fragment}.
+ * @author Rossen Stoyanchev
+ */
+public class FragmentTests {
+
+	@Test
+	void mergeAttributes() {
+		Fragment fragment = Fragment.create("myView", Map.of("fruit", "apple"));
+		fragment.mergeAttributes(new ConcurrentModel("vegetable", "pepper"));
+
+		assertThat(fragment.model()).containsExactly(Map.entry("fruit", "apple"), Map.entry("vegetable", "pepper"));
+	}
+
+	@Test
+	void mergeAttributesCollision() {
+		Fragment fragment = Fragment.create("myView", Map.of("fruit", "apple"));
+		fragment.mergeAttributes(new ConcurrentModel("fruit", "orange"));
+
+		assertThat(fragment.model()).containsExactly(Map.entry("fruit", "apple"));
+	}
+
+}