Skip to content

Improve And/Or-RequestMatcher/ServerWebExchangeMatcher API #18479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jzheaux merged 1 commit into from
Mar 27, 2026
Merged

Improve And/Or-RequestMatcher/ServerWebExchangeMatcher API #18479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ava/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public class AndServerWebExchangeMatcher implements ServerWebExchangeMatcher {

private static final Log logger = LogFactory.getLog(AndServerWebExchangeMatcher.class);

private final List<ServerWebExchangeMatcher> matchers;
private final List<? extends ServerWebExchangeMatcher> matchers;

public AndServerWebExchangeMatcher(List<ServerWebExchangeMatcher> matchers) {
public AndServerWebExchangeMatcher(List<? extends ServerWebExchangeMatcher> matchers) {
Assert.notEmpty(matchers, "matchers cannot be empty");
this.matchers = matchers;
}
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public class OrServerWebExchangeMatcher implements ServerWebExchangeMatcher {

private static final Log logger = LogFactory.getLog(OrServerWebExchangeMatcher.class);

private final List<ServerWebExchangeMatcher> matchers;
private final List<? extends ServerWebExchangeMatcher> matchers;

public OrServerWebExchangeMatcher(List<ServerWebExchangeMatcher> matchers) {
public OrServerWebExchangeMatcher(List<? extends ServerWebExchangeMatcher> matchers) {
Assert.notEmpty(matchers, "matchers cannot be empty");
this.matchers = matchers;
}
Expand Down
4 changes: 2 additions & 2 deletions web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
*/
public final class AndRequestMatcher implements RequestMatcher {

private final List<RequestMatcher> requestMatchers;
private final List<? extends RequestMatcher> requestMatchers;

/**
* Creates a new instance
* @param requestMatchers the {@link RequestMatcher} instances to try
*/
public AndRequestMatcher(List<RequestMatcher> requestMatchers) {
public AndRequestMatcher(List<? extends RequestMatcher> requestMatchers) {
Assert.notEmpty(requestMatchers, "requestMatchers must contain a value");
Assert.noNullElements(requestMatchers, "requestMatchers cannot contain null values");
this.requestMatchers = requestMatchers;
Expand Down
4 changes: 2 additions & 2 deletions web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
*/
public final class OrRequestMatcher implements RequestMatcher {

private final List<RequestMatcher> requestMatchers;
private final List<? extends RequestMatcher> requestMatchers;

/**
* Creates a new instance
* @param requestMatchers the {@link RequestMatcher} instances to try
*/
public OrRequestMatcher(List<RequestMatcher> requestMatchers) {
public OrRequestMatcher(List<? extends RequestMatcher> requestMatchers) {
Assert.notEmpty(requestMatchers, "requestMatchers must contain a value");
Assert.noNullElements(requestMatchers, "requestMatchers cannot contain null values");
this.requestMatchers = requestMatchers;
Expand Down
Loading