Merge branch '7.0.x'

This commit is contained in:
Sam Brannen
2026-09-03 11:49:10 +02:00
3 changed files with 4 additions and 4 deletions
@@ -16,7 +16,7 @@
package org.springframework.core.retry.support;
import java.util.LinkedList;
import java.util.ArrayList;
import java.util.List;
import org.jspecify.annotations.Nullable;
@@ -42,7 +42,7 @@ import org.springframework.util.Assert;
*/
public class CompositeRetryListener implements RetryListener {
private final List<RetryListener> listeners = new LinkedList<>();
private final List<RetryListener> listeners = new ArrayList<>();
/**
@@ -151,7 +151,7 @@ public class UrlBasedCorsConfigurationSource implements CorsConfigurationSource
/**
* When enabled, if there is neither a
* {@link UrlPathHelper#resolveAndCacheLookupPath esolved} String lookupPath nor a
* {@link UrlPathHelper#resolveAndCacheLookupPath resolved} String lookupPath nor a
* {@link ServletRequestPathUtils#parseAndCache parsed} {@code RequestPath}
* then use the {@link #setUrlPathHelper configured} {@code UrlPathHelper}
* to resolve a String lookupPath. This in turn determines use of URL
@@ -760,7 +760,7 @@ public abstract class RouterFunctions {
* defined router functions into this builder, or can be combined with
* {@link RouterFunctions#route(RequestPredicate, HandlerFunction)}
* to allow for more flexible predicate matching.
* <p>For instance, the fbelow adds the router function returned from
* <p>For instance, the below adds the router function returned from
* {@code OrderController.routerFunction()} to the {@code changeUser}
* method in {@code userController}:
* <pre class="code">