Skip to content

Commit 1fc8ab3

Browse files
committed
Checkstyle fixes
1 parent 68a3a98 commit 1fc8ab3

File tree

6 files changed

+4
-8
lines changed

6 files changed

+4
-8
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

reactive/webflux/java/oauth2/login/src/main/java/example/LoopbackIpRedirectWebFilter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public class LoopbackIpRedirectWebFilter implements WebFilter {
5454
public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
5555
String host = exchange.getRequest().getURI().getHost();
5656
if (host != null && host.equals("localhost")) {
57-
UriComponents uri = UriComponentsBuilder.fromUri(exchange.getRequest().getURI())
58-
.host("127.0.0.1").build();
57+
UriComponents uri = UriComponentsBuilder.fromUri(exchange.getRequest().getURI()).host("127.0.0.1").build();
5958
exchange.getResponse().setStatusCode(HttpStatus.PERMANENT_REDIRECT);
6059
exchange.getResponse().getHeaders().setLocation(uri.toUri());
6160
return Mono.empty();

reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.springframework.security.oauth2.client.web.server.WebSessionServerOAuth2AuthorizedClientRepository;
3232
import org.springframework.security.web.reactive.result.method.annotation.AuthenticationPrincipalArgumentResolver;
3333
import org.springframework.security.web.server.context.SecurityContextServerWebExchangeWebFilter;
34-
import org.springframework.test.context.junit.jupiter.SpringExtension;
3534
import org.springframework.test.web.reactive.server.WebTestClient;
3635
import org.springframework.web.reactive.result.view.ViewResolver;
3736

servlet/spring-boot/java/aot/data/src/main/java/example/MessageController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.List;
2020
import java.util.Optional;
2121

22-
import org.springframework.security.access.prepost.PostFilter;
2322
import org.springframework.security.authorization.method.AuthorizationProxy;
2423
import org.springframework.web.bind.annotation.GetMapping;
2524
import org.springframework.web.bind.annotation.PathVariable;

servlet/spring-boot/java/oauth2/login/src/main/java/example/filter/LoopbackIpRedirectFilter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import org.springframework.core.Ordered;
2727
import org.springframework.core.annotation.Order;
28-
import org.springframework.http.server.ServletServerHttpRequest;
2928
import org.springframework.stereotype.Component;
3029
import org.springframework.web.filter.OncePerRequestFilter;
3130
import org.springframework.web.util.UriComponents;

servlet/spring-boot/java/saml2/saml-extension-urls/src/main/java/example/SamlExtensionUrlForwardingFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import jakarta.servlet.http.HttpServletResponse;
3030

3131
import org.springframework.core.annotation.Order;
32+
import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
3233
import org.springframework.security.web.util.matcher.OrRequestMatcher;
3334
import org.springframework.security.web.util.matcher.RequestMatcher;
3435
import org.springframework.stereotype.Component;
3536
import org.springframework.web.filter.OncePerRequestFilter;
3637

37-
import static org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.pathPattern;
3838

3939
@Component
4040
@Order(-101) // To run before FilterChainProxy
@@ -53,7 +53,7 @@ public class SamlExtensionUrlForwardingFilter extends OncePerRequestFilter {
5353
private RequestMatcher createRequestMatcher() {
5454
Set<String> urls = urlMapping.keySet();
5555
List<RequestMatcher> matchers = new LinkedList<>();
56-
urls.forEach((url) -> matchers.add(pathPattern(url)));
56+
urls.forEach((url) -> matchers.add(PathPatternRequestMatcher.pathPattern(url)));
5757
return new OrRequestMatcher(matchers);
5858
}
5959

0 commit comments

Comments
 (0)