generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.3

package/dist/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs

@@ -18,12 +18,22 @@
 -%>
 package <%= packageName %>.security.oauth2;
 
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
@@ -44,36 +54,30 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAut
 import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
 /**
  * Test class for the {@link AuthorizationHeaderUtil} utility class.
  */
+@ExtendWith(MockitoExtension.class)
 class AuthorizationHeaderUtilTest {
 
     public static final String VALID_REGISTRATION_ID = "OIDC";
     public static final String SUB_VALUE = "123456";
-    @Mock private OAuth2AuthorizedClientService clientService;
-    @Mock private RestTemplateBuilder restTemplateBuilder;
-    @Mock private SecurityContext securityContext;
-    @InjectMocks private AuthorizationHeaderUtil authorizationHeaderUtil;
+
+    @Mock
+    private OAuth2AuthorizedClientService clientService;
+
+    @Mock
+    private RestTemplateBuilder restTemplateBuilder;
+
+    @Mock
+    private SecurityContext securityContext;
+
+    @InjectMocks
+    private AuthorizationHeaderUtil authorizationHeaderUtil;
 
     @BeforeEach
     public void setup() {
-        MockitoAnnotations.openMocks(this);
         SecurityContextHolder.setContext(securityContext);
-
-        doReturn(restTemplateBuilder).when(restTemplateBuilder).additionalMessageConverters(any(HttpMessageConverter.class));
-        doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
-        doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
     }
 
     @Test
@@ -88,8 +92,9 @@ class AuthorizationHeaderUtilTest {
 
     @Test
     void getAuthorizationHeader_JwtAuthentication() {
-        JwtAuthenticationToken jwtToken = new JwtAuthenticationToken(new Jwt("tokenVal", Instant.now(),
-            Instant.now().plus(Duration.ofMinutes(3)), Map.of("alg", "HS256"), Map.of("sub",SUB_VALUE)));
+        JwtAuthenticationToken jwtToken = new JwtAuthenticationToken(
+            new Jwt("tokenVal", Instant.now(), Instant.now().plus(Duration.ofMinutes(3)), Map.of("alg", "HS256"), Map.of("sub", SUB_VALUE))
+        );
         doReturn(jwtToken).when(securityContext).getAuthentication();
 
         Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
@@ -100,15 +105,15 @@ class AuthorizationHeaderUtilTest {
     @Test
     void getAuthorizationHeader_OAuth2Authentication_InvalidClient() {
         OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken("INVALID");
-        OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient();
 
         doReturn(oauth2Token).when(securityContext).getAuthentication();
-        doReturn(authorizedClient).when(clientService).loadAuthorizedClient(eq(VALID_REGISTRATION_ID), eq(SUB_VALUE));
 
-        Assertions.assertThatThrownBy(() -> {
-            Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
-        }).isInstanceOf(OAuth2AuthorizationException.class)
-            .hasMessageContaining("[access_denied] The token is expired");;
+        Assertions
+            .assertThatThrownBy(() -> {
+                authorizationHeaderUtil.getAuthorizationHeader();
+            })
+            .isInstanceOf(OAuth2AuthorizationException.class)
+            .hasMessageContaining("[access_denied] The token is expired");
     }
 
     @Test
@@ -125,6 +130,12 @@ class AuthorizationHeaderUtilTest {
 
     @Test
     void getAuthorizationHeader_OAuth2Authentication_RefreshToken() {
+        doReturn(restTemplateBuilder)
+            .when(restTemplateBuilder)
+            .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
+
         OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
         OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
 
@@ -142,6 +153,12 @@ class AuthorizationHeaderUtilTest {
 
     @Test
     void getAuthorizationHeader_OAuth2Authentication_RefreshToken_NoRefreshToken() {
+        doReturn(restTemplateBuilder)
+            .when(restTemplateBuilder)
+            .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
+
         OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
         OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
 
@@ -159,6 +176,12 @@ class AuthorizationHeaderUtilTest {
 
     @Test
     void getAuthorizationHeader_OAuth2Authentication_RefreshTokenFails() {
+        doReturn(restTemplateBuilder)
+            .when(restTemplateBuilder)
+            .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
+
         OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
         OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
 
@@ -166,12 +189,16 @@ class AuthorizationHeaderUtilTest {
         doReturn(authorizedClient).when(clientService).loadAuthorizedClient(eq(VALID_REGISTRATION_ID), eq(SUB_VALUE));
 
         RestTemplate restTemplate = mock(RestTemplate.class);
-        doThrow(new OAuth2AuthorizationException(new OAuth2Error("E"), "error")).when(restTemplate).exchange(any(RequestEntity.class), eq(OAuthIdpTokenResponseDTO.class));
+        doThrow(new OAuth2AuthorizationException(new OAuth2Error("E"), "error"))
+            .when(restTemplate)
+            .exchange(any(RequestEntity.class), eq(OAuthIdpTokenResponseDTO.class));
         doReturn(restTemplate).when(restTemplateBuilder).build();
 
-        Assertions.assertThatThrownBy(() -> {
-            Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
-        }).isInstanceOf(OAuth2AuthenticationException.class)
+        Assertions
+            .assertThatThrownBy(() -> {
+                authorizationHeaderUtil.getAuthorizationHeader();
+            })
+            .isInstanceOf(OAuth2AuthenticationException.class)
             .hasMessageContaining("error");
     }
 
@@ -195,7 +222,8 @@ class AuthorizationHeaderUtilTest {
         OAuth2AccessToken token = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "tokenVal", issuedAt, expiresAt);
 
         return new OAuth2AuthorizedClient(
-            ClientRegistration.withRegistrationId(VALID_REGISTRATION_ID)
+            ClientRegistration
+                .withRegistrationId(VALID_REGISTRATION_ID)
                 .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
                 .clientId("web-app")
                 .clientSecret("secret")
@@ -205,14 +233,19 @@ class AuthorizationHeaderUtilTest {
                 .build(),
             "sub",
             token,
-            new OAuth2RefreshToken("refreshVal", Instant.now()));
+            new OAuth2RefreshToken("refreshVal", Instant.now())
+        );
     }
 
     private OAuth2AuthenticationToken getTestOAuth2AuthenticationToken(String registrationId) {
         return new OAuth2AuthenticationToken(
-            new DefaultOidcUser(List.of(new SimpleGrantedAuthority("USER")),
-                OidcIdToken.withTokenValue("tokenVal").claim("sub", SUB_VALUE).build()),
-            List.of(new SimpleGrantedAuthority("USER")), registrationId);
+            new DefaultOidcUser(
+                List.of(new SimpleGrantedAuthority("USER")),
+                OidcIdToken.withTokenValue("tokenVal").claim("sub", SUB_VALUE).build()
+            ),
+            List.of(new SimpleGrantedAuthority("USER")),
+            registrationId
+        );
     }
 
     private Optional<OAuthIdpTokenResponseDTO> getTestOAuthIdpTokenResponseDTO(boolean hasRefreshToken) {

package/dist/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs

@@ -20,7 +20,7 @@ package <%= packageName %>.service;
 
 import <%= packageName %>.config.Constants;
 import <%= packageName %>.IntegrationTest;
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import tech.jhipster.config.JHipsterProperties;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

package/dist/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs

@@ -24,7 +24,7 @@ import <%= packageName %>.config.Constants;
 import <%= packageName %>.domain.PersistentToken;
 <%_ } _%>
 <%_ if (!databaseTypeNo) { _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ } _%>
 <%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.repository.PersistentTokenRepository;

package/dist/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs

@@ -18,7 +18,7 @@
 -%>
 package <%= packageName %>.service.mapper;
 
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.service.dto.<%= user.adminUserDto %>;
 import <%= packageName %>.service.dto.<%= user.dtoClass %>;
 <%_ if (!authenticationTypeOauth2) { _%>

package/dist/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_imperative.java.ejs

@@ -15,7 +15,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @AutoConfigureMockMvc
 @WithMockUser
 @IntegrationTest
-public class SpaWebFilterIT {
+class SpaWebFilterIT {
 
     @Autowired
     private MockMvc mockMvc;

package/dist/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_reactive.java.ejs

@@ -2,8 +2,9 @@ package <%= packageName %>.web.filter;
 
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.security.AuthoritiesConstants;
-import org.springframework.test.web.reactive.server.WebTestClient;
+import java.time.Duration;
 import org.junit.jupiter.api.Test;
+import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -13,7 +14,7 @@ import org.springframework.http.MediaType;
 @AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 @WithMockUser
 @IntegrationTest
-public class SpaWebFilterIT {
+class SpaWebFilterIT {
 
     @Autowired
     private WebTestClient webTestClient;
@@ -45,11 +46,16 @@ public class SpaWebFilterIT {
     @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
     void testFilterDoesNotForwardToIndexForV3ApiDocs() {
         webTestClient
+            .mutate()
+            .responseTimeout(Duration.ofMillis(10000))
+            .build()
             .get()
             .uri("/v3/api-docs")
             .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType(MediaType.APPLICATION_JSON);
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentType(MediaType.APPLICATION_JSON);
     }
 
     @Test

package/dist/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs

@@ -23,7 +23,7 @@ import <%= packageName %>.config.Constants;
 <%_ if (authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.domain.PersistentToken;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
 import <%= packageName %>.repository.AuthorityRepository;
 <%_ } _%>
@@ -69,7 +69,6 @@ import org.springframework.transaction.annotation.Transactional;
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import reactor.core.publisher.Mono;
 <%_ } _%>
-
 import java.time.Instant;
 <%_ if (authenticationTypeSession && !reactive && (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase)) { _%>
 import java.time.LocalDate;
@@ -84,7 +83,6 @@ import static org.mockito.Mockito.*;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasItem;
 <%_ } _%>
-import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
 <%_ if (reactive) { _%>
   <%_ if (authenticationUsesCsrf) { _%>
 import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
@@ -108,7 +106,6 @@ import static org.springframework.security.test.web.servlet.response.SecurityMoc
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>
-@WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
 class AccountResourceIT {
     static final String TEST_USER_LOGIN = "test";
@@ -172,6 +169,7 @@ class AccountResourceIT {
     }
 
     @Test
+    @WithMockUser(TEST_USER_LOGIN)
 <%_ if (reactive) { _%>
     void testAuthenticatedUser() {
         accountWebTestClient
@@ -183,10 +181,7 @@ class AccountResourceIT {
 <%_ } else { _%>
     void testAuthenticatedUser() throws Exception {
         restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> {
-                request.setRemoteUser(TEST_USER_LOGIN);
-                return request;
-            })
+            .with(request -> request)
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));
@@ -194,6 +189,7 @@ class AccountResourceIT {
     }
 
     @Test
+    @WithMockUser(TEST_USER_LOGIN)
     void testGetExistingAccount()<% if (!reactive) { %> throws Exception<% } %> {
         Set<String> authorities = new HashSet<>();
         authorities.add(AuthoritiesConstants.ADMIN);
@@ -250,12 +246,16 @@ class AccountResourceIT {
         accountWebTestClient.get().uri("/api/account")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
-            .expectStatus().isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
+    <%_ if (authenticationTypeSession) { _%>
+            .expectStatus().isEqualTo(HttpStatus.OK);
+    <%_ } else { _%>
+            .expectStatus().isEqualTo(HttpStatus.UNAUTHORIZED);
+    <%_ } _%>
 <%_ } else { _%>
     void testGetUnknownAccount() throws Exception {
         restAccountMockMvc.perform(get("/api/account")
             .accept(MediaType.APPLICATION_PROBLEM_JSON))
-            .andExpect(status().isInternalServerError());
+            .andExpect(status().isUnauthorized());
 <%_ } _%>
     }
 
@@ -520,8 +520,8 @@ class AccountResourceIT {
 
         Optional<<%= user.persistClass %>> testUser = userRepository.findOneByEmailIgnoreCase("alice2@example.com")<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(testUser).isPresent();
-        testUser.get().setActivated(true);
-        userRepository.save(testUser.get())<% if (reactive) { %>.block()<% } %>;
+        testUser.orElseThrow().setActivated(true);
+        userRepository.save(testUser.orElseThrow())<% if (reactive) { %>.block()<% } %>;
 
         // Second (already activated) user
 <%_ if (reactive) { _%>
@@ -644,10 +644,10 @@ class AccountResourceIT {
 
         Optional<<%= user.persistClass %>> testUser4 = userRepository.findOneByLogin("test-register-duplicate-email-3")<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(testUser4).isPresent();
-        assertThat(testUser4.get().getEmail()).isEqualTo("test-register-duplicate-email@example.com");
+        assertThat(testUser4.orElseThrow().getEmail()).isEqualTo("test-register-duplicate-email@example.com");
 
-        testUser4.get().setActivated(true);
-        userService.updateUser((new <%= user.adminUserDto %>(testUser4.get())))<% if (reactive) { %>.block()<% } %>;
+        testUser4.orElseThrow().setActivated(true);
+        userService.updateUser((new <%= user.adminUserDto %>(testUser4.orElseThrow())))<% if (reactive) { %>.block()<% } %>;
 
         // Register 4th (already activated) user
 <%_ if (reactive) { _%>
@@ -701,8 +701,8 @@ class AccountResourceIT {
 
         Optional<<%= user.persistClass %>> userDup = userRepository.findOne<% if (databaseTypeSql) { %>WithAuthorities<% } %>ByLogin("badguy")<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(userDup).isPresent();
-        assertThat(userDup.get().getAuthorities()).hasSize(1)
-            .containsExactly(<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>authorityRepository.findById(AuthoritiesConstants.USER).<% if (reactive) { %>block<% } else { %>get<% } %>()<% } %><% if (databaseTypeCassandra || databaseTypeCouchbase) { %>AuthoritiesConstants.USER<% } %>);
+        assertThat(userDup.orElseThrow().getAuthorities()).hasSize(1)
+            .containsExactly(<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>authorityRepository.findById(AuthoritiesConstants.USER).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>()<% } %><% if (databaseTypeCassandra || databaseTypeCouchbase) { %>AuthoritiesConstants.USER<% } %>);
     }
 
     @Test

package/dist/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs

@@ -72,7 +72,6 @@ import org.springframework.transaction.annotation.Transactional;
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>
-@WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
 class AccountResourceIT {
 
@@ -151,11 +150,11 @@ class AccountResourceIT {
         webTestClient.get().uri("/api/account")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
-            .expectStatus().is5xxServerError();
+            .expectStatus().is3xxRedirection();
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/account")
             .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isInternalServerError());
+            .andExpect(status().isUnauthorized());
 <%_ } _%>
     }
 
@@ -177,6 +176,7 @@ class AccountResourceIT {
     }
 
     @Test
+    @WithMockUser(TEST_USER_LOGIN)
     void testAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
 <%_ if (reactive) { _%>
         webTestClient
@@ -187,10 +187,7 @@ class AccountResourceIT {
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> {
-                request.setRemoteUser(TEST_USER_LOGIN);
-                return request;
-            })
+            .with(request -> request)
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));

package/dist/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs

@@ -18,7 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-import <%= packageName %>.IntegrationTest;
 <%_ if (authenticationTypeJwt) { _%>
 import static <%= packageName %>.security.jwt.JwtAuthenticationTestUtils.createValidTokenForUser;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,6 +30,7 @@ import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
+import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.security.AuthoritiesConstants;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +54,6 @@ import reactor.core.publisher.Mono;
 
 import static org.mockito.Mockito.*;
 <%_ } _%>
-import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
 
 /**
  * Integration tests for the {@link AccountResource} REST controller.
@@ -64,7 +63,6 @@ import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>
-@WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
 class AccountResourceIT {
     static final String TEST_USER_LOGIN = "test";
@@ -131,6 +129,7 @@ class AccountResourceIT {
     }
 
     @Test
+    @WithMockUser(TEST_USER_LOGIN)
     void testAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
 <%_ if (reactive) { _%>
         accountWebTestClient
@@ -141,10 +140,7 @@ class AccountResourceIT {
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> {
-                request.setRemoteUser(TEST_USER_LOGIN);
-                return request;
-            })
+            .with(request -> request)
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));

package/dist/generators/server/templates/src/test/java/package/web/rest/AuthenticateControllerIT.java.ejs

@@ -23,7 +23,7 @@ import <%= packageName %>.IntegrationTest;
   <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
   <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
 <%_ } _%>
 import <%= packageName %>.web.rest.vm.LoginVM;

package/dist/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs

@@ -25,7 +25,7 @@ import <%= packageName %>.config.Constants;
 <%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.config.TestSecurityConfiguration;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
 <%_ if (searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;

package/dist/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs

@@ -239,16 +239,16 @@ public final class TestUtil {
 <%_ if (databaseTypeSql) { _%>
 
     /**
-     * Makes a an executes a query to the EntityManager finding all stored objects.
+     * Executes a query on the EntityManager finding all stored objects.
      * @param <T> The type of objects to be searched
      * @param em The instance of the EntityManager
-     * @param clss The class type to be searched
+     * @param clazz The class type to be searched
      * @return A list of all found objects
      */
-    public static <T> List<T> findAll(EntityManager em, Class<T> clss) {
+    public static <T> List<T> findAll(EntityManager em, Class<T> clazz) {
         CriteriaBuilder cb = em.getCriteriaBuilder();
-        CriteriaQuery<T> cq = cb.createQuery(clss);
-        Root<T> rootEntry = cq.from(clss);
+        CriteriaQuery<T> cq = cb.createQuery(clazz);
+        Root<T> rootEntry = cq.from(clazz);
         CriteriaQuery<T> all = cq.select(rootEntry);
         TypedQuery<T> allQuery = em.createQuery(all);
         return allQuery.getResultList();

package/dist/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs

@@ -30,7 +30,7 @@ import <%= packageName %>.config.Constants;
 <%_ if (!databaseTypeCassandra && !databaseTypeCouchbase) { _%>
 import <%= packageName %>.domain.Authority;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.repository.AuthorityRepository;
 <%_ } _%>
@@ -630,7 +630,7 @@ class UserResourceIT {
             .collectList().block()<% } %>.size();
 
         // Update the user
-        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
+        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
         <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
         user.setId(updatedUser.getId());
@@ -668,7 +668,7 @@ class UserResourceIT {
         // Validate the User in the database
         assertPersistedUsers(users -> {
             assertThat(users).hasSize(databaseSizeBeforeUpdate);
-            <%= user.persistClass %> testUser = users.stream().filter(usr -> usr.getId().equals(updatedUser.getId())).findFirst().get();
+            <%= user.persistClass %> testUser = users.stream().filter(usr -> usr.getId().equals(updatedUser.getId())).findFirst().orElseThrow();
             assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
             assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
             assertThat(testUser.getEmail()).isEqualTo(UPDATED_EMAIL);
@@ -695,7 +695,7 @@ class UserResourceIT {
             .collectList().block()<% } %>.size();
 
         // Update the user
-        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
+        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
         <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
         user.setId(updatedUser.getId());
@@ -733,7 +733,7 @@ class UserResourceIT {
         // Validate the User in the database
         assertPersistedUsers(users -> {
             assertThat(users).hasSize(databaseSizeBeforeUpdate);
-            <%= user.persistClass %> testUser = users.stream().filter(usr -> usr.getId().equals(updatedUser.getId())).findFirst().get();
+            <%= user.persistClass %> testUser = users.stream().filter(usr -> usr.getId().equals(updatedUser.getId())).findFirst().orElseThrow();
             assertThat(testUser.getLogin()).isEqualTo(UPDATED_LOGIN);
             assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
             assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
@@ -784,7 +784,7 @@ class UserResourceIT {
   <%_ } _%>
 
         // Update the user
-        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
+        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
         <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
         user.setId(updatedUser.getId());
@@ -859,7 +859,7 @@ class UserResourceIT {
   <%_ } _%>
 
         // Update the user
-        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
+        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
         <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
         user.setId(updatedUser.getId());

package/dist/generators/spring-cache/generator.mjs

@@ -52,9 +52,9 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator {
                 }
                 else {
                     // Add noop
-                    source.addEntryToCache = ({ entry }) => { };
+                    source.addEntryToCache = () => { };
                     // Add noop
-                    source.addEntityToCache = ({ entityAbsoluteClass }) => { };
+                    source.addEntityToCache = () => { };
                 }
             },
         });

package/dist/generators/spring-cache/internal/dependencies.mjs

@@ -23,6 +23,9 @@ const javaxCacheApi = {
 const hibernateJCache = {
     groupId: 'org.hibernate.orm',
     artifactId: 'hibernate-jcache',
+    // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+    // eslint-disable-next-line no-template-curly-in-string
+    version: '${hibernate.version}',
 };
 // eslint-disable-next-line import/prefer-default-export
 export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies) => {