Skip to content

Commit f6c1dfb

Browse files
devondragonclaude
andcommitted
fix: Replace deprecated @MockBean with @MockitoBean
- Updated all 13 test files to use @MockitoBean from Spring 6.x - Changed import from org.springframework.boot.test.mock.mockito.MockBean to org.springframework.test.context.bean.override.mockito.MockitoBean - Fixed JWT deprecation warnings in OAuth2TestUtils by updating to newer JJWT API - Removed deprecated SignatureAlgorithm usage - Build now compiles without any deprecation warnings 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 8e81eaf commit f6c1dfb

15 files changed

Lines changed: 38 additions & 37 deletions

.claude/settings.local.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
"Bash(./gradlew:*)",
1414
"Bash(curl:*)",
1515
"mcp__zen__planner",
16-
"Bash(git add:*)"
16+
"Bash(git add:*)",
17+
"Bash(chmod:*)",
18+
"Bash(./fix-mockbean-deprecation.sh:*)"
1719
],
1820
"deny": []
1921
}

src/test/java/com/digitalsanctuary/spring/user/api/ApiSecurityTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1818
import org.springframework.boot.test.context.SpringBootTest;
19-
import org.springframework.boot.test.mock.mockito.MockBean;
19+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2020
import org.springframework.http.MediaType;
2121
import org.springframework.security.test.context.support.WithAnonymousUser;
2222
import org.springframework.security.test.context.support.WithMockUser;
@@ -73,7 +73,7 @@ class ApiSecurityTest {
7373
@Autowired
7474
private EntityManager entityManager;
7575

76-
@MockBean
76+
@MockitoBean
7777
private MailService mailService;
7878

7979
private UserDto validUserDto;

src/test/java/com/digitalsanctuary/spring/user/api/PasswordResetApiTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.beans.factory.annotation.Autowired;
2626
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
2727
import org.springframework.boot.test.context.SpringBootTest;
28-
import org.springframework.boot.test.mock.mockito.MockBean;
28+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2929
import org.springframework.http.MediaType;
3030
import org.springframework.test.context.ActiveProfiles;
3131
import org.springframework.test.web.servlet.MockMvc;
@@ -80,10 +80,10 @@ class PasswordResetApiTest {
8080
@Autowired
8181
private PasswordResetTokenRepository tokenRepository;
8282

83-
@MockBean
83+
@MockitoBean
8484
private MailService mailService;
8585

86-
@MockBean
86+
@MockitoBean
8787
private UserEmailService userEmailService;
8888

8989
@PersistenceContext

src/test/java/com/digitalsanctuary/spring/user/api/PasswordResetApiTestSimplified.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1818
import org.springframework.boot.test.context.SpringBootTest;
19-
import org.springframework.boot.test.mock.mockito.MockBean;
19+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2020
import org.springframework.http.MediaType;
2121
import org.springframework.test.context.ActiveProfiles;
2222
import org.springframework.test.web.servlet.MockMvc;
@@ -58,10 +58,10 @@ class PasswordResetApiTestSimplified {
5858
@Autowired
5959
private UserService userService;
6060

61-
@MockBean
61+
@MockitoBean
6262
private MailService mailService;
6363

64-
@MockBean
64+
@MockitoBean
6565
private UserEmailService userEmailService;
6666

6767
@BeforeEach

src/test/java/com/digitalsanctuary/spring/user/api/PasswordResetCompletionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1818
import org.springframework.boot.test.context.SpringBootTest;
19-
import org.springframework.boot.test.mock.mockito.MockBean;
19+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2020
import org.springframework.http.MediaType;
2121
import org.springframework.security.crypto.password.PasswordEncoder;
2222
import org.springframework.test.context.ActiveProfiles;
@@ -69,7 +69,7 @@ class PasswordResetCompletionTest {
6969
@Autowired
7070
private PasswordEncoder passwordEncoder;
7171

72-
@MockBean
72+
@MockitoBean
7373
private MailService mailService;
7474

7575
@PersistenceContext

src/test/java/com/digitalsanctuary/spring/user/api/UserApiIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.junit.jupiter.api.Test;
1616
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
18-
import org.springframework.boot.test.mock.mockito.MockBean;
18+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1919
import org.springframework.context.annotation.Import;
2020
import org.springframework.http.MediaType;
2121
import org.springframework.security.test.context.support.WithMockUser;
@@ -78,7 +78,7 @@ class UserApiIntegrationTest {
7878
@Autowired
7979
private PasswordResetTokenRepository passwordResetTokenRepository;
8080

81-
@MockBean
81+
@MockitoBean
8282
private MailService mailService;
8383

8484
private Role userRole;

src/test/java/com/digitalsanctuary/spring/user/api/UserApiIntegrationTestFixed.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1414
import org.springframework.boot.test.context.SpringBootTest;
15-
import org.springframework.boot.test.mock.mockito.MockBean;
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1616
import org.springframework.http.MediaType;
1717
import org.springframework.security.test.context.support.WithMockUser;
1818
import org.springframework.test.context.ActiveProfiles;
@@ -57,7 +57,7 @@ class UserApiIntegrationTestFixed {
5757
@Autowired
5858
private UserService userService;
5959

60-
@MockBean
60+
@MockitoBean
6161
private MailService mailService;
6262

6363
@PersistenceContext

src/test/java/com/digitalsanctuary/spring/user/api/UserApiSimpleTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1414
import org.springframework.boot.test.context.SpringBootTest;
15-
import org.springframework.boot.test.mock.mockito.MockBean;
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1616
import org.springframework.http.MediaType;
1717
import org.springframework.test.context.ActiveProfiles;
1818
import org.springframework.test.web.servlet.MockMvc;
@@ -44,7 +44,7 @@ class UserApiSimpleTest {
4444
@Autowired
4545
private UserRepository userRepository;
4646

47-
@MockBean
47+
@MockitoBean
4848
private MailService mailService;
4949

5050
@Autowired

src/test/java/com/digitalsanctuary/spring/user/api/UserApiTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.beans.factory.annotation.Autowired;
2121
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
2222
import org.springframework.boot.test.context.SpringBootTest;
23-
import org.springframework.boot.test.mock.mockito.MockBean;
23+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2424
import org.springframework.http.MediaType;
2525
import org.springframework.mock.web.MockHttpServletResponse;
2626
import org.springframework.test.context.ActiveProfiles;
@@ -70,7 +70,7 @@ public class UserApiTest {
7070
@Autowired
7171
private ObjectMapper objectMapper;
7272

73-
@MockBean
73+
@MockitoBean
7474
private com.digitalsanctuary.spring.user.mail.MailService mailService;
7575

7676
private static final UserDto baseTestUser = ApiTestData.BASE_TEST_USER;

src/test/java/com/digitalsanctuary/spring/user/api/UserRegistrationComprehensiveTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.springframework.beans.factory.annotation.Autowired;
1919
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
2020
import org.springframework.boot.test.context.SpringBootTest;
21-
import org.springframework.boot.test.mock.mockito.MockBean;
21+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2222
import org.springframework.http.MediaType;
2323
import org.springframework.test.context.ActiveProfiles;
2424
import org.springframework.test.web.servlet.MockMvc;
@@ -64,7 +64,7 @@ class UserRegistrationComprehensiveTest {
6464
@Autowired
6565
private UserService userService;
6666

67-
@MockBean
67+
@MockitoBean
6868
private MailService mailService;
6969

7070
@BeforeEach

0 commit comments

Comments
 (0)