Skip to content

Commit e9c4665

Browse files
sdeleuzesdeleuze
committed
Merge branch '6.2.x'
2 parents b94ab90 + a946fe2 commit e9c4665

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

Diff for: ‎framework-docs/modules/ROOT/pages/web/webmvc-functional.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ ServerResponse.async(asyncResponse);
276276
----
277277
======
278278

279-
https://www.w3.org/TR/eventsource/[Server-Sent Events] can be provided via the
279+
https://html.spec.whatwg.org/multipage/server-sent-events.html[Server-Sent Events] can be provided via the
280280
static `sse` method on `ServerResponse`. The builder provided by that method
281281
allows you to send Strings, or other objects as JSON. For example:
282282

Diff for: ‎framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-async.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ invokes the configured exception resolvers and completes the request.
281281
=== SSE
282282

283283
`SseEmitter` (a subclass of `ResponseBodyEmitter`) provides support for
284-
https://www.w3.org/TR/eventsource/[Server-Sent Events], where events sent from the server
284+
https://html.spec.whatwg.org/multipage/server-sent-events.html[Server-Sent Events], where events sent from the server
285285
are formatted according to the W3C SSE specification. To produce an SSE
286286
stream from a controller, return `SseEmitter`, as the following example shows:
287287

Diff for: ‎spring-web/src/main/java/org/springframework/http/MediaType.java

+2-2
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.
@@ -308,7 +308,7 @@ public class MediaType extends MimeType implements Serializable {
308308
/**
309309
* Media type for {@code text/event-stream}.
310310
* @since 4.3.6
311-
* @see <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events W3C recommendation</a>
311+
* @see <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">Server-Sent Events</a>
312312
*/
313313
public static final MediaType TEXT_EVENT_STREAM;
314314

Diff for: ‎spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java

+2-2
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.
@@ -33,7 +33,7 @@
3333
* @since 5.0
3434
* @param <T> the type of data that this event contains
3535
* @see ServerSentEventHttpMessageWriter
36-
* @see <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events W3C recommendation</a>
36+
* @see <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">Server-Sent Events</a>
3737
*/
3838
public final class ServerSentEvent<T> {
3939

Diff for: ‎spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public static <T extends Resource> BodyInserter<T, ReactiveHttpOutputMessage> fr
241241
* @param eventsPublisher the {@code ServerSentEvent} publisher to write to the response body
242242
* @param <T> the type of the data elements in the {@link ServerSentEvent}
243243
* @return the inserter to write a {@code ServerSentEvent} publisher
244-
* @see <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events W3C recommendation</a>
244+
* @see <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">Server-Sent Events</a>
245245
*/
246246
// Parameterized for server-side use
247247
public static <T, S extends Publisher<ServerSentEvent<T>>> BodyInserter<S, ServerHttpResponse> fromServerSentEvents(

Diff for: ‎spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java

+3-3
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.
@@ -284,7 +284,7 @@ static ServerResponse async(Object asyncResponse, Duration timeout) {
284284
* @param consumer consumer that will be provided with an event builder
285285
* @return the server-side event response
286286
* @since 5.3.2
287-
* @see <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events</a>
287+
* @see <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">Server-Sent Events</a>
288288
*/
289289
static ServerResponse sse(Consumer<SseBuilder> consumer) {
290290
return SseServerResponse.create(consumer, null);
@@ -314,7 +314,7 @@ static ServerResponse sse(Consumer<SseBuilder> consumer) {
314314
* @param timeout maximum time period to wait before timing out
315315
* @return the server-side event response
316316
* @since 5.3.2
317-
* @see <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events</a>
317+
* @see <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">Server-Sent Events</a>
318318
*/
319319
static ServerResponse sse(Consumer<SseBuilder> consumer, Duration timeout) {
320320
return SseServerResponse.create(consumer, timeout);

Diff for: ‎spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
/**
4848
* Implementation of {@link ServerResponse} for sending
49-
* <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events</a>.
49+
* <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">Server-Sent Events</a>.
5050
*
5151
* @author Arjen Poutsma
5252
* @author Sebastien Deleuze

Diff for: ‎spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java

+2-2
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.
@@ -35,7 +35,7 @@
3535

3636
/**
3737
* A specialization of {@link ResponseBodyEmitter} for sending
38-
* <a href="https://www.w3.org/TR/eventsource/">Server-Sent Events</a>.
38+
* <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">Server-Sent Events</a>.
3939
*
4040
* @author Rossen Stoyanchev
4141
* @author Juergen Hoeller

Diff for: ‎spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/EventSourceTransportHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 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.
@@ -31,7 +31,7 @@
3131

3232
/**
3333
* A TransportHandler for sending messages via Server-Sent Events:
34-
* <a href="https://dev.w3.org/html5/eventsource/">https://dev.w3.org/html5/eventsource/</a>.
34+
* <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">Server-Sent Events</a>.
3535
*
3636
* @author Rossen Stoyanchev
3737
* @since 4.0

0 commit comments

Comments
 (0)