-
-
Notifications
You must be signed in to change notification settings - Fork 9.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to Spring Boot 3.4.0-M3 (#6687)
#### What type of PR is this? /kind cleanup /area core /milestone 2.20.x #### What this PR does / why we need it: This PR upgrades to [Spring Boot 3.4.0-M3](https://github.com/spring-projects/spring-boot/releases/tag/v3.4.0-M3). 1. Fix the compilation error of OptimalPropertyAccess because the class has been privated in [this commit](spring-projects/spring-framework@b431594). 2. Fix exception `org.mockito.exceptions.misusing.UnnecessaryStubbingException` for some unit tests after upgrading. 3. Replace deprecated annotations `@MockBean` and `@SpyBean` with `@MockitoBean` and `@MockitoSpyBean` respectively. #### Does this PR introduce a user-facing change? ```release-note 升级 Spring Boot 至 3.4.0-M3 ```
- Loading branch information
Showing
22 changed files
with
140 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,11 @@ | ||
package run.halo.app.core.endpoint.console; | ||
|
||
import static org.mockito.ArgumentMatchers.anyString; | ||
import static org.mockito.ArgumentMatchers.eq; | ||
import static org.mockito.Mockito.doReturn; | ||
import static org.mockito.Mockito.spy; | ||
import static org.mockito.Mockito.when; | ||
import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf; | ||
import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.springSecurity; | ||
|
||
import io.github.resilience4j.ratelimiter.RateLimiterConfig; | ||
import io.github.resilience4j.ratelimiter.RateLimiterRegistry; | ||
import io.github.resilience4j.reactor.ratelimiter.operator.RateLimiterOperator; | ||
import java.time.Duration; | ||
import java.util.Map; | ||
import org.junit.jupiter.api.BeforeEach; | ||
|
@@ -39,47 +35,49 @@ | |
@ExtendWith(SpringExtension.class) | ||
@WithMockUser(username = "fake-user", password = "fake-password") | ||
class EmailVerificationCodeTest { | ||
|
||
WebTestClient webClient; | ||
|
||
@Mock | ||
ReactiveExtensionClient client; | ||
|
||
@Mock | ||
EmailVerificationService emailVerificationService; | ||
|
||
@Mock | ||
UserService userService; | ||
|
||
@Mock | ||
RateLimiterRegistry rateLimiterRegistry; | ||
|
||
@InjectMocks | ||
UserEndpoint endpoint; | ||
|
||
@BeforeEach | ||
void setUp() { | ||
var spyUserEndpoint = spy(endpoint); | ||
webClient = WebTestClient.bindToRouterFunction(endpoint.endpoint()) | ||
.apply(springSecurity()) | ||
.build(); | ||
} | ||
|
||
@Test | ||
void sendEmailVerificationCode() { | ||
var config = RateLimiterConfig.custom() | ||
.limitRefreshPeriod(Duration.ofSeconds(10)) | ||
.limitForPeriod(1) | ||
.build(); | ||
var sendCodeRateLimiter = RateLimiterRegistry.of(config) | ||
.rateLimiter("send-email-verification-code-fake-user:[email protected]"); | ||
doReturn(RateLimiterOperator.of(sendCodeRateLimiter)).when(spyUserEndpoint) | ||
.sendEmailVerificationCodeRateLimiter(eq("fake-user"), eq("[email protected]")); | ||
|
||
var verifyEmailRateLimiter = RateLimiterRegistry.of(config) | ||
.rateLimiter("verify-email-fake-user"); | ||
doReturn(RateLimiterOperator.of(verifyEmailRateLimiter)).when(spyUserEndpoint) | ||
.verificationEmailRateLimiter(eq("fake-user")); | ||
when(rateLimiterRegistry.rateLimiter( | ||
"send-email-verification-code-fake-user:[email protected]", | ||
"send-email-verification-code") | ||
).thenReturn(sendCodeRateLimiter); | ||
|
||
webClient = WebTestClient.bindToRouterFunction(spyUserEndpoint.endpoint()).build() | ||
.mutateWith(csrf()); | ||
} | ||
|
||
@Test | ||
void sendEmailVerificationCode() { | ||
var user = new User(); | ||
user.setMetadata(new Metadata()); | ||
user.getMetadata().setName("fake-user"); | ||
user.setSpec(new User.UserSpec()); | ||
user.getSpec().setEmail("[email protected]"); | ||
when(client.get(eq(User.class), eq("fake-user"))).thenReturn(Mono.just(user)); | ||
when(emailVerificationService.sendVerificationCode(anyString(), anyString())) | ||
.thenReturn(Mono.empty()); | ||
webClient.post() | ||
|
@@ -100,6 +98,16 @@ void sendEmailVerificationCode() { | |
|
||
@Test | ||
void verifyEmail() { | ||
var config = RateLimiterConfig.custom() | ||
.limitRefreshPeriod(Duration.ofSeconds(10)) | ||
.limitForPeriod(1) | ||
.build(); | ||
|
||
var verifyEmailRateLimiter = RateLimiterRegistry.of(config) | ||
.rateLimiter("verify-email-fake-user"); | ||
when(rateLimiterRegistry.rateLimiter("verify-email-fake-user", "verify-email")) | ||
.thenReturn(verifyEmailRateLimiter); | ||
|
||
when(emailVerificationService.verify(anyString(), anyString())) | ||
.thenReturn(Mono.empty()); | ||
when(userService.confirmPassword(anyString(), anyString())) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.