Browse Source

Checkstyle fixes

Rob Winch 1 tháng trước cách đây
mục cha
commit
1fc8ab3897

+ 1 - 1
.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
+    <option name="version" value="2.2.0" />
   </component>
 </project>

+ 1 - 2
reactive/webflux/java/oauth2/login/src/main/java/example/LoopbackIpRedirectWebFilter.java

@@ -54,8 +54,7 @@ public class LoopbackIpRedirectWebFilter implements WebFilter {
 	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
 		String host = exchange.getRequest().getURI().getHost();
 		if (host != null && host.equals("localhost")) {
-			UriComponents uri = UriComponentsBuilder.fromUri(exchange.getRequest().getURI())
-				.host("127.0.0.1").build();
+			UriComponents uri = UriComponentsBuilder.fromUri(exchange.getRequest().getURI()).host("127.0.0.1").build();
 			exchange.getResponse().setStatusCode(HttpStatus.PERMANENT_REDIRECT);
 			exchange.getResponse().getHeaders().setLocation(uri.toUri());
 			return Mono.empty();

+ 0 - 1
reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java

@@ -31,7 +31,6 @@ import org.springframework.security.oauth2.client.web.server.ServerOAuth2Authori
 import org.springframework.security.oauth2.client.web.server.WebSessionServerOAuth2AuthorizedClientRepository;
 import org.springframework.security.web.reactive.result.method.annotation.AuthenticationPrincipalArgumentResolver;
 import org.springframework.security.web.server.context.SecurityContextServerWebExchangeWebFilter;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.result.view.ViewResolver;
 

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

@@ -19,7 +19,6 @@ package example;
 import java.util.List;
 import java.util.Optional;
 
-import org.springframework.security.access.prepost.PostFilter;
 import org.springframework.security.authorization.method.AuthorizationProxy;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

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

@@ -25,7 +25,6 @@ import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.UriComponents;

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

@@ -29,12 +29,12 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.annotation.Order;
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 import org.springframework.security.web.util.matcher.OrRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import static org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.pathPattern;
 
 @Component
 @Order(-101) // To run before FilterChainProxy
@@ -53,7 +53,7 @@ public class SamlExtensionUrlForwardingFilter extends OncePerRequestFilter {
 	private RequestMatcher createRequestMatcher() {
 		Set<String> urls = urlMapping.keySet();
 		List<RequestMatcher> matchers = new LinkedList<>();
-		urls.forEach((url) -> matchers.add(pathPattern(url)));
+		urls.forEach((url) -> matchers.add(PathPatternRequestMatcher.pathPattern(url)));
 		return new OrRequestMatcher(matchers);
 	}