Skip to content

refactor: use functional streams for host and path predicate accumulation #4128

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
ryanjbaxter merged 2 commits into from
Mar 30, 2026
+17 −12
Merged

refactor: use functional streams for host and path predicate accumulation #4128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d326a02
Refactor hosts and path predicates to use functional programming style.
Yuri-Costa09 Mar 30, 2026
73764d0
Enhance host predicates with additional Javadoc comments for clarity,…
Yuri-Costa09 Mar 30, 2026
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
29 changes: 17 additions & 12 deletions ...java/org/springframework/cloud/gateway/server/mvc/predicate/GatewayRequestPredicates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,30 @@ public static RequestPredicate method(HttpMethod... methods) {
return RequestPredicates.methods(methods);
}

/**
* Return a {@code RequestPredicate} that tests the request host against the given
* host pattern.
* @param pattern the host pattern to match
* @return a predicate that tests against the given host pattern
*/
public static RequestPredicate host(String pattern) {
Objects.requireNonNull(pattern, "'pattern' must not be null");
return hostPredicates(DEFAULT_HOST_INSTANCE).apply(pattern);
}

/**
* Return a {@code RequestPredicate} that tests the request host against the given
* host patterns.
* @param patterns the list of patterns to match
* @return a predicate that tests against the given host patterns
*/
@Shortcut(type = Type.LIST)
public static RequestPredicate host(String... patterns) {
Assert.notEmpty(patterns, "'patterns' must not be empty");
RequestPredicate requestPredicate = hostPredicates(DEFAULT_HOST_INSTANCE).apply(patterns[0]);
// I'm sure there's a functional way to do this, I'm just tired...
for (int i = 1; i < patterns.length; i++) {
requestPredicate = requestPredicate.or(hostPredicates(DEFAULT_HOST_INSTANCE).apply(patterns[i]));
}
return requestPredicate;
return Arrays.stream(patterns)
.map(pattern -> hostPredicates(DEFAULT_HOST_INSTANCE).apply(pattern))
.reduce(RequestPredicate::or)
.orElseThrow();
}

/**
Expand Down Expand Up @@ -180,12 +190,7 @@ public static RequestPredicate path(String pattern) {
@Shortcut(type = Type.LIST)
public static RequestPredicate path(String... patterns) {
Assert.notEmpty(patterns, "'patterns' must not be empty");
RequestPredicate requestPredicate = RequestPredicates.path(patterns[0]);
// I'm sure there's a functional way to do this, I'm just tired...
for (int i = 1; i < patterns.length; i++) {
requestPredicate = requestPredicate.or(RequestPredicates.path(patterns[i]));
}
return requestPredicate;
return Arrays.stream(patterns).map(RequestPredicates::path).reduce(RequestPredicate::or).orElseThrow();
}

/**
Expand Down
Loading