|
16 | 16 |
|
17 | 17 | package org.springframework.security.web.servlet.util.matcher; |
18 | 18 |
|
19 | | -import static org.assertj.core.api.Assertions.assertThat; |
20 | | -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; |
| 19 | +import jakarta.servlet.Servlet; |
| 20 | +import jakarta.servlet.ServletContext; |
| 21 | +import jakarta.servlet.ServletRegistration; |
21 | 22 | import org.junit.jupiter.api.Test; |
| 23 | + |
22 | 24 | import org.springframework.http.HttpMethod; |
23 | 25 | import org.springframework.mock.web.MockHttpServletRequest; |
24 | 26 | import org.springframework.security.web.servlet.MockServletContext; |
25 | | -import static org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.pathPattern; |
26 | 27 | import org.springframework.security.web.util.matcher.RequestMatcher; |
27 | | -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; |
28 | 28 | import org.springframework.web.util.ServletRequestPathUtils; |
29 | 29 |
|
30 | | -import jakarta.servlet.Servlet; |
31 | | -import jakarta.servlet.ServletContext; |
32 | | -import jakarta.servlet.ServletRegistration; |
| 30 | +import static org.assertj.core.api.Assertions.assertThat; |
| 31 | +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; |
| 32 | +import static org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.pathPattern; |
| 33 | +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; |
33 | 34 |
|
34 | 35 | /** |
35 | 36 | * Tests for {@link PathPatternRequestMatcher} |
@@ -152,7 +153,7 @@ void matcherWhenRequestMethodIsNullThenNoNullPointerException() { |
152 | 153 | ServletRequestPathUtils.parseAndCache(mock); |
153 | 154 | assertThat(matcher.matches(mock)).isFalse(); |
154 | 155 | } |
155 | | - |
| 156 | + |
156 | 157 | MockHttpServletRequest request(String uri) { |
157 | 158 | MockHttpServletRequest request = new MockHttpServletRequest("GET", uri); |
158 | 159 | ServletRequestPathUtils.parseAndCache(request); |
|
0 commit comments