Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Sam Brannen
2025-04-10 16:49:43 +02:00
parent 1795b234e4 cd987fc104
commit df4868bf83
35 changed files with 112 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
View File

@@ -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.
@@ -161,13 +161,13 @@ public class ResourceWebHandler implements WebHandler, InitializingBean {
}
/**
* Return the {@code List} of {@code Resource} paths to use as sources
* for serving static resources.
* Return the {@code List} of {@code Resource} paths to use as sources for
* serving static resources.
* <p>Note that if {@link #setLocationValues(List) locationValues} are provided,
* instead of loaded Resource-based locations, this method will return
* empty until after initialization via {@link #afterPropertiesSet()}.
* <p><strong>Note:</strong> As of 5.3.11 the list of locations may be filtered to
* exclude those that don't actually exist and therefore the list returned from this
* instead of loaded Resource-based locations, this method will return empty
* until after initialization via {@link #afterPropertiesSet()}.
* <p><strong>Note:</strong> The list of locations may be filtered to exclude
* those that don't actually exist and therefore the list returned from this
* method may be a subset of all given locations. See {@link #setOptimizeLocations}.
* @see #setLocationValues
* @see #setLocations

7
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 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.
@@ -39,9 +39,8 @@ import org.springframework.web.server.ServerWebExchange;
* which checks the WebSocket handshake request parameters, upgrades to a
* WebSocket interaction, and uses the {@link WebSocketHandler} to handle it.
*
* <p>As of 5.3 the WebFlux Java configuration, imported via
* {@code @EnableWebFlux}, includes a declaration of this adapter and therefore
* it no longer needs to be present in application configuration.
* <p>Note that the WebFlux Java configuration, imported via {@code @EnableWebFlux},
* includes a declaration of this adapter.
*
* @author Rossen Stoyanchev
* @since 5.0