Merge pull request #475 from nramc/404-feature-remove-deprecated-mock…

…bean-to-appropriate-mockito-bean

404-feature-remove-deprecated-mockbean-to-appropriate-mockito-bean

src/main/java/com/github/nramc/dev/journey/api/config/security/SecurityHeadersCustomizer.java

@@ -13,7 +13,7 @@ public class SecurityHeadersCustomizer implements Customizer<HeadersConfigurer<H
 
     @Override
     public void customize(HeadersConfigurer<HttpSecurity> headersConfigurer) {
-        headersConfigurer.permissionsPolicy(permissions -> permissions.policy("accelerometer=(),ambient-light-sensor=(),autoplay=(),battery=(),camera=(),display-capture=(),document-domain=(),encrypted-media=(),fullscreen=(self),gamepad=(),geolocation=(),gyroscope=(),layout-animations=(self),legacy-image-formats=(self),magnetometer=(),microphone=(),midi=(),oversized-images=(self),payment=(),picture-in-picture=(),publickey-credentials-stats=(),speaker-selection=(),sync-xhr=(self),unoptimized-images=(self),unsized-media=(self),usb=(),screen-wake-lock=(),web-share=(),xr-spatial-tracking=()"));
+        headersConfigurer.permissionsPolicyHeader(permissions -> permissions.policy("accelerometer=(),ambient-light-sensor=(),autoplay=(),battery=(),camera=(),display-capture=(),document-domain=(),encrypted-media=(),fullscreen=(self),gamepad=(),geolocation=(),gyroscope=(),layout-animations=(self),legacy-image-formats=(self),magnetometer=(),microphone=(),midi=(),oversized-images=(self),payment=(),picture-in-picture=(),publickey-credentials-stats=(),speaker-selection=(),sync-xhr=(self),unoptimized-images=(self),unsized-media=(self),usb=(),screen-wake-lock=(),web-share=(),xr-spatial-tracking=()"));
 
         headersConfigurer.referrerPolicy(referrer -> referrer.policy(ReferrerPolicyHeaderWriter.ReferrerPolicy.NO_REFERRER));
 

src/test/java/com/github/nramc/dev/journey/api/core/usecase/registration/RegistrationUseCaseTest.java

@@ -12,11 +12,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.UserDetailsManager;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.LocalDateTime;
@@ -39,15 +39,15 @@ class RegistrationUseCaseTest {
             .roles(Set.of(Role.AUTHENTICATED_USER))
             .build();
     @Autowired
-    private UserDetailsManager userDetailsManager;
+    UserDetailsManager userDetailsManager;
     @Autowired
-    private Validator validator;
+    Validator validator;
     @Autowired
-    private PasswordEncoder passwordEncoder;
-    @MockBean
-    private AccountActivationUseCase accountActivationUseCase;
-    @MockBean
-    private EmailNotificationUseCase emailNotificationUseCase;
+    PasswordEncoder passwordEncoder;
+    @MockitoBean
+    AccountActivationUseCase accountActivationUseCase;
+    @MockitoBean
+    EmailNotificationUseCase emailNotificationUseCase;
 
     private RegistrationUseCase registrationUseCase;
 

src/test/java/com/github/nramc/dev/journey/api/gateway/MailServiceTest.java

@@ -12,12 +12,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
@@ -53,10 +53,10 @@ static void configureMail(DynamicPropertyRegistry registry) {
     }
 
     @Autowired
-    private MailService mailService;
+    MailService mailService;
 
-    @SpyBean
-    private JavaMailSender emailSender;
+    @MockitoSpyBean
+    JavaMailSender emailSender;
 
     @Test
     void context() {

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/auth/login/LoginResourceTest.java

@@ -1,8 +1,8 @@
 package com.github.nramc.dev.journey.api.web.resources.rest.auth.login;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
 import com.github.nramc.dev.journey.api.config.security.InMemoryUserDetailsConfig;
+import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
 import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
 import com.github.nramc.dev.journey.api.core.jwt.JwtGenerator;
 import com.github.nramc.dev.journey.api.core.jwt.JwtProperties;
@@ -14,10 +14,10 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.autoconfigure.json.AutoConfigureJson;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -47,11 +47,11 @@
 @AutoConfigureJson
 class LoginResourceTest {
     @Autowired
-    private MockMvc mockMvc;
+    MockMvc mockMvc;
     @Autowired
-    private ObjectMapper objectMapper;
-    @MockBean
-    private UserSecurityAttributeService attributeService;
+    ObjectMapper objectMapper;
+    @MockitoBean
+    UserSecurityAttributeService attributeService;
 
     @Test
     void test() {

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/auth/mfa/MultiFactorAuthenticationResourceTest.java

@@ -12,10 +12,10 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.autoconfigure.json.AutoConfigureJson;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -49,9 +49,9 @@ class MultiFactorAuthenticationResourceTest {
              "value": "%s"
             }""";
     @Autowired
-    private MockMvc mockMvc;
-    @MockBean
-    private ConfirmationCodeUseCase confirmationCodeUseCase;
+    MockMvc mockMvc;
+    @MockitoBean
+    ConfirmationCodeUseCase confirmationCodeUseCase;
 
     @Test
     void test() {

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/create/CreateJourneyResourceTest.java

@@ -11,11 +11,11 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -36,12 +36,11 @@
 @WebMvcTest(CreateJourneyResource.class)
 @Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
 @ActiveProfiles({"prod", "test"})
-@MockBean({JourneyRepository.class})
 class CreateJourneyResourceTest {
     @Autowired
     private MockMvc mockMvc;
-    @Autowired
-    private JourneyRepository journeyRepository;
+    @MockitoBean
+    JourneyRepository journeyRepository;
 
     @BeforeEach
     void setup() {

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/find/FindJourneyByIdResourceTest.java

@@ -10,11 +10,11 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -34,12 +34,11 @@
 @WebMvcTest(FindJourneyByIdResource.class)
 @Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
 @ActiveProfiles({"prod", "test"})
-@MockBean({JourneyRepository.class})
 class FindJourneyByIdResourceTest {
     @Autowired
-    private MockMvc mockMvc;
-    @Autowired
-    private JourneyRepository journeyRepository;
+    MockMvc mockMvc;
+    @MockitoBean
+    JourneyRepository journeyRepository;
 
     @Test
     @WithMockAuthenticatedUser

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/basic/UpdateJourneyBasicDetailsResourceTest.java

@@ -1,20 +1,20 @@
 package com.github.nramc.dev.journey.api.web.resources.rest.journeys.update.basic;
 
-import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
 import com.github.nramc.dev.journey.api.config.security.InMemoryUserDetailsConfig;
+import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
 import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
 import com.github.nramc.dev.journey.api.config.security.WithMockGuestUser;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyRepository;
 import com.github.nramc.dev.journey.api.web.resources.Resources;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultMatcher;
 
@@ -36,7 +36,6 @@
 @WebMvcTest(UpdateJourneyBasicDetailsResource.class)
 @Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
 @ActiveProfiles({"prod", "test"})
-@MockBean({JourneyRepository.class})
 class UpdateJourneyBasicDetailsResourceTest {
     private static final String VALID_REQUEST = """
             {
@@ -52,9 +51,9 @@ class UpdateJourneyBasicDetailsResourceTest {
             content().contentType(MediaType.APPLICATION_JSON)
     };
     @Autowired
-    private MockMvc mockMvc;
-    @Autowired
-    private JourneyRepository journeyRepository;
+    MockMvc mockMvc;
+    @MockitoBean
+    JourneyRepository journeyRepository;
 
     @Test
     @WithMockAuthenticatedUser

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/geo/UpdateJourneyGeoDetailsResourceTest.java

@@ -9,12 +9,12 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultMatcher;
 
@@ -37,16 +37,15 @@
 @WebMvcTest(UpdateJourneyGeoDetailsResource.class)
 @Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
 @ActiveProfiles({"prod", "test"})
-@MockBean({JourneyRepository.class})
 class UpdateJourneyGeoDetailsResourceTest {
     private static final ResultMatcher[] STATUS_AND_CONTENT_TYPE_MATCH = new ResultMatcher[]{
             status().isOk(),
             content().contentType(MediaType.APPLICATION_JSON)
     };
     @Autowired
-    private MockMvc mockMvc;
-    @Autowired
-    private JourneyRepository journeyRepository;
+    MockMvc mockMvc;
+    @MockitoBean
+    JourneyRepository journeyRepository;
 
     @Test
     @WithMockAuthenticatedUser

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/publish/PublishJourneyResourceTest.java

@@ -17,12 +17,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultMatcher;
 
@@ -45,7 +45,6 @@
 @WebMvcTest(PublishJourneyResource.class)
 @Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class, ValidationAutoConfiguration.class, JourneyValidator.class})
 @ActiveProfiles({"prod", "test"})
-@MockBean({JourneyRepository.class})
 class PublishJourneyResourceTest {
     private static final JourneyEntity JOURNEY_ENTITY = JourneyData.JOURNEY_ENTITY.toBuilder().build();
     private static final ResultMatcher[] STATUS_AND_CONTENT_TYPE_MATCH = new ResultMatcher[]{
@@ -64,11 +63,11 @@ class PublishJourneyResourceTest {
     };
     private static final Set<Visibility> DEFAULT_VISIBILITY = Set.of(MYSELF);
     @Autowired
-    private MockMvc mockMvc;
+    MockMvc mockMvc;
+    @MockitoBean
+    JourneyRepository journeyRepository;
     @Autowired
-    private JourneyRepository journeyRepository;
-    @Autowired
-    private ObjectMapper objectMapper;
+    ObjectMapper objectMapper;
 
     static Stream<JourneyEntity> validJourneyDataProvider() {
 

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/journeys/update/videos/UpdateJourneyVideosDetailsResourceTest.java

@@ -1,20 +1,20 @@
 package com.github.nramc.dev.journey.api.web.resources.rest.journeys.update.videos;
 
-import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
 import com.github.nramc.dev.journey.api.config.security.InMemoryUserDetailsConfig;
+import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
 import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
 import com.github.nramc.dev.journey.api.config.security.WithMockGuestUser;
 import com.github.nramc.dev.journey.api.repository.journey.JourneyRepository;
 import com.github.nramc.dev.journey.api.web.resources.Resources;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultMatcher;
 
@@ -34,7 +34,6 @@
 @WebMvcTest(UpdateJourneyVideosDetailsResource.class)
 @Import({WebSecurityConfig.class, InMemoryUserDetailsConfig.class})
 @ActiveProfiles({"prod", "test"})
-@MockBean({JourneyRepository.class})
 class UpdateJourneyVideosDetailsResourceTest {
     private static final ResultMatcher[] STATUS_AND_CONTENT_TYPE_MATCH = new ResultMatcher[]{
             status().isOk(),
@@ -52,9 +51,9 @@ class UpdateJourneyVideosDetailsResourceTest {
     };
 
     @Autowired
-    private MockMvc mockMvc;
-    @Autowired
-    private JourneyRepository journeyRepository;
+    MockMvc mockMvc;
+    @MockitoBean
+    JourneyRepository journeyRepository;
 
     @Test
     @WithMockAuthenticatedUser

src/test/java/com/github/nramc/dev/journey/api/web/resources/rest/users/delete/DeleteUserResourceTest.java

@@ -1,7 +1,7 @@
 package com.github.nramc.dev.journey.api.web.resources.rest.users.delete;
 
-import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
 import com.github.nramc.dev.journey.api.config.security.InMemoryUserDetailsConfig;
+import com.github.nramc.dev.journey.api.config.security.WebSecurityConfig;
 import com.github.nramc.dev.journey.api.config.security.WithMockAdministratorUser;
 import com.github.nramc.dev.journey.api.config.security.WithMockAuthenticatedUser;
 import com.github.nramc.dev.journey.api.config.security.WithMockGuestUser;
@@ -10,12 +10,12 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.context.annotation.Import;
 import org.springframework.security.provisioning.UserDetailsManager;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static com.github.nramc.dev.journey.api.core.domain.user.Role.Constants.AUTHENTICATED_USER;
@@ -36,9 +36,9 @@
 @ActiveProfiles({"prod", "test"})
 class DeleteUserResourceTest {
     @Autowired
-    private MockMvc mockMvc;
-    @SpyBean
-    private UserDetailsManager userDetailsManager;
+    MockMvc mockMvc;
+    @MockitoSpyBean
+    UserDetailsManager userDetailsManager;
 
     @Test
     void context() {