generator-jhipster 8.7.2 → 8.8.0

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs

@@ -52,10 +52,10 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 <%_ if (searchEngineElasticsearch) { _%>
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.data.auditing.AuditingHandler;
 import org.springframework.data.auditing.DateTimeProvider;
 <%_ } _%>
@@ -181,7 +181,7 @@ class UserServiceIT {
      *
      * @see <%= packageName %>.repository.search.UserSearchRepositoryMockConfiguration
      */
-    @SpyBean
+    @MockitoSpyBean
     private UserSearchRepository spiedUserSearchRepository;
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
@@ -189,7 +189,7 @@ class UserServiceIT {
     @Autowired
     private AuditingHandler auditingHandler;
 
-    @MockBean
+    @MockitoBean
     private DateTimeProvider dateTimeProvider;
 <%_ } _%>
     <%_ if (!databaseTypeNo) { _%>
@@ -222,7 +222,7 @@ class UserServiceIT {
   <%_ } _%>
         user.setLogin(DEFAULT_LOGIN);
   <%_ if (!authenticationTypeOauth2) { _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
   <%_ } _%>
         user.setActivated(true);
         user.setEmail(DEFAULT_EMAIL);
@@ -391,7 +391,7 @@ class UserServiceIT {
         when(dateTimeProvider.getNow()).thenReturn(Optional.of(now.minus(4, ChronoUnit.DAYS)));
   <%_ } _%>
         user.setActivated(false);
-        user.setActivationKey(RandomStringUtils.random(20));
+        user.setActivationKey(RandomStringUtils.insecure().next(20));
         <%= user.persistClass %> dbUser = userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
         dbUser.setCreatedDate(now.minus(4, ChronoUnit.DAYS));
         userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/criteria/_entityClass_CriteriaTest.java.ejs

@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.Objects;
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.Test;
 
@@ -12,7 +13,7 @@ class <%- entityClass %>CriteriaTest {
     @Test
     void new<%- entityClass %>CriteriaHasAllFiltersNullTest() {
         var <%- persistInstance %>Criteria = new <%- entityClass %>Criteria();
-        assertThat(<%- persistInstance %>Criteria).is(criteriaFiltersAre(filter -> filter == null));
+        assertThat(<%- persistInstance %>Criteria).is(criteriaFiltersAre(Objects::isNull));
     }
 
     @Test
@@ -21,7 +22,7 @@ class <%- entityClass %>CriteriaTest {
 
         setAllFilters(<%- persistInstance %>Criteria);
 
-        assertThat(<%- persistInstance %>Criteria).is(criteriaFiltersAre(filter -> filter != null));
+        assertThat(<%- persistInstance %>Criteria).is(criteriaFiltersAre(Objects::nonNull));
     }
 
     @Test
@@ -39,7 +40,7 @@ class <%- entityClass %>CriteriaTest {
         );
 
         assertThat(copy).satisfies(
-            criteria -> assertThat(criteria).is(criteriaFiltersAre(filter -> filter == null)),
+            criteria -> assertThat(criteria).is(criteriaFiltersAre(Objects::isNull)),
             criteria -> assertThat(criteria).isEqualTo(<%- persistInstance %>Criteria)
         );
     }
@@ -62,7 +63,7 @@ class <%- entityClass %>CriteriaTest {
 
 
         assertThat(copy).satisfies(
-            criteria -> assertThat(criteria).is(criteriaFiltersAre(filter -> filter != null)),
+            criteria -> assertThat(criteria).is(criteriaFiltersAre(Objects::nonNull)),
             criteria -> assertThat(criteria).isEqualTo(<%- persistInstance %>Criteria)
         );
     }

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs

@@ -25,8 +25,8 @@ import <%= packageName %>.web.rest.TestUtil;
 let id1;
 let id2;
 if (!embedded) {
-    id1 = this.getPrimaryKeyValue(primaryKey.type, databaseType, '1');
-    id2 = this.getPrimaryKeyValue(primaryKey.type, databaseType, '2');
+    id1 = primaryKey.javaSampleValues[0];
+    id2 = primaryKey.javaSampleValues[1];
 } %>
 <%_ if (primaryKey && primaryKey.hasUUID) { _%>
 import java.util.UUID;

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs

@@ -63,7 +63,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 <%_ if (cacheProviderAny) { _%>
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.Cache;
-import java.util.Objects;
 <%_ } _%>
 <%_ if (cacheProviderMemcached) { _%>
 import org.springframework.cache.support.NoOpCacheManager;
@@ -131,7 +130,7 @@ class UserResourceIT {
 <%_ if (databaseTypeCouchbase) { _%>
     private static final String DEFAULT_ID = DEFAULT_LOGIN;
 <%_ } else { _%>
-    private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- this.getPrimaryKeyValue(user.primaryKey.type) %>;
+    private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- user.primaryKey.javaSampleValues[0] %>;
 <%_ } _%>
 
     private static final String DEFAULT_EMAIL = "johndoe@localhost";
@@ -231,12 +230,12 @@ class UserResourceIT {
 <%_ if (databaseTypeCassandra || (authenticationTypeOauth2 && !databaseTypeCouchbase)) { _%>
         persistUser.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        persistUser.setLogin(DEFAULT_LOGIN<% if (databaseTypeSql) { %> + RandomStringUtils.randomAlphabetic(5)<% } %>);
+        persistUser.setLogin(DEFAULT_LOGIN<% if (databaseTypeSql) { %> + RandomStringUtils.insecure().nextAlphabetic(5)<% } %>);
 <%_ if (!authenticationTypeOauth2) { _%>
-        persistUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        persistUser.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
 <%_ } _%>
         persistUser.setActivated(true);
-        persistUser.setEmail(<% if (databaseTypeSql) { %>RandomStringUtils.randomAlphabetic(5) + <% } %>DEFAULT_EMAIL);
+        persistUser.setEmail(<% if (databaseTypeSql) { %>RandomStringUtils.insecure().nextAlphabetic(5) + <% } %>DEFAULT_EMAIL);
         persistUser.setFirstName(DEFAULT_FIRSTNAME);
         persistUser.setLastName(DEFAULT_LASTNAME);
 <%_ if (!databaseTypeCassandra) { _%>
@@ -276,12 +275,6 @@ class UserResourceIT {
 
     @AfterEach
     public void cleanupAndCheck() {
-<%_ if (cacheProviderAny) { _%>
-    cacheManager.getCacheNames().stream()
-        .map(cacheName -> this.cacheManager.getCache(cacheName))
-        .filter(Objects::nonNull)
-        .forEach(Cache::clear);
-<%_ } _%>
 <%_ if (requiresDeleteAllUsers) { _%>
     <%_ if (databaseTypeSql && reactive) { _%>
         userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
@@ -296,6 +289,12 @@ class UserResourceIT {
 <%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
         assertThat(userRepository.count()<%- reactorBlock %>).isEqualTo(numberOfUsers);
         numberOfUsers = null;
+<%_ } _%>
+<%_ if (cacheProviderAny) { _%>
+        cacheManager.getCacheNames().stream()
+            .map(cacheName -> this.cacheManager.getCache(cacheName))
+            .filter(Objects::nonNull)
+            .forEach(Cache::invalidate);
 <%_ } _%>
     }
 <%_ if (!authenticationTypeOauth2) { _%>
@@ -497,13 +496,12 @@ class UserResourceIT {
 
         // Get all the users
   <%_ if (reactive) { _%>
-        <%= user.adminUserDto %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,desc")
+        <%= user.adminUserDto %> foundUser = webTestClient.get().uri("/api/admin/users<% if (user.primaryKey.typeNumeric) { %>?sort=id,desc<% } %>")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk()
             .expectHeader().contentType(MediaType.APPLICATION_JSON)
-            .returnResult(<%= user.adminUserDto %>.class).getResponseBody().blockFirst();
-
+            .returnResult(<%= user.adminUserDto %>.class).getResponseBody()<% if (!user.primaryKey.typeNumeric) { %>.filter(e -> DEFAULT_LOGIN.equals(e.getLogin()))<% } %>.blockFirst();
         assertThat(foundUser.getLogin()).isEqualTo(DEFAULT_LOGIN);
         assertThat(foundUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
         assertThat(foundUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
@@ -513,7 +511,7 @@ class UserResourceIT {
     <%_ } _%>
         assertThat(foundUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
   <%_ } else { _%>
-        restUserMockMvc.perform(get("/api/admin/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
+        restUserMockMvc.perform(get("/api/admin/users<% if (user.primaryKey.typeNumeric) { %>?sort=id,desc<% } %>")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -541,7 +539,7 @@ class UserResourceIT {
   <%_ } _%>
   <%_ if (cacheProviderAny) { _%>
 
-        assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
+        assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin(), <%= user.persistClass %>.class)).isNull();
   <%_ } _%>
 
         // Get the user
@@ -578,7 +576,7 @@ class UserResourceIT {
             assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
         }
   <%_ } else if (cacheProviderAny) { _%>
-        assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
+        assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin(), <%= user.persistClass %>.class)).isNotNull();
   <%_ } _%>
     }
 
@@ -734,7 +732,7 @@ class UserResourceIT {
         anotherUser.setId(UUID.randomUUID().toString());
   <%_ } _%>
         anotherUser.setLogin("jhipster");
-        anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        anotherUser.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         anotherUser.setActivated(true);
         anotherUser.setEmail("jhipster@localhost");
         anotherUser.setFirstName("java");
@@ -804,7 +802,7 @@ class UserResourceIT {
         anotherUser.setId(UUID.randomUUID().toString());
   <%_ } _%>
         anotherUser.setLogin("jhipster");
-        anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        anotherUser.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         anotherUser.setActivated(true);
         anotherUser.setEmail("jhipster@localhost");
         anotherUser.setFirstName("java");
@@ -882,7 +880,7 @@ class UserResourceIT {
   <%_ } _%>
   <%_ if (cacheProviderAny) { _%>
 
-        assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
+        assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin(), <%= user.persistClass %>.class)).isNull();
   <%_ } _%>
 
         // Validate the database is empty
@@ -898,7 +896,7 @@ class UserResourceIT {
         <%= user.persistClass %> user2 = new <%= user.persistClass %>();
         user2.setId(user1.getId());
         assertThat(user1).isEqualTo(user2);
-        user2.setId(<%- this.getPrimaryKeyValue(user.primaryKey.type, databaseType, 2) %>);
+        user2.setId(<%- user.primaryKey.javaSampleValues[1] %>);
         assertThat(user1).isNotEqualTo(user2);
         user1.setId(null);
         assertThat(user1).isNotEqualTo(user2);

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs

@@ -986,13 +986,17 @@ _%>
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
     if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-  if (field.fieldTypeInteger) { %><% } else
   if (field.fieldTypeLong) { %>.intValue()<% } else
-  if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+  if (field.fieldTypeFloat) { %>.doubleValue()<% } else
   if (field.fieldTypeBigDecimal) { %>)<% } else
-  if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
   if (field.fieldTypeZonedDateTime) { %>)<% } else
-  if (!field.fieldTypeString) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
+  if (
+    !field.fieldTypeString &&
+    !field.javaFieldTypeString &&
+    !field.fieldTypeBoolean &&
+    !field.fieldTypeInteger &&
+    !field.fieldTypeDouble
+  ) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
     }
 <% if (implementsEagerLoadApis && !databaseTypeNeo4j && !databaseTypeCouchbase) { %>
     @SuppressWarnings({"unchecked"})
@@ -1073,13 +1077,17 @@ _%>
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
     if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-  if (field.fieldTypeInteger) { %><% } else
   if (field.fieldTypeLong) { %>.intValue()<% } else
-  if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+  if (field.fieldTypeFloat) { %>.doubleValue()<% } else
   if (field.fieldTypeBigDecimal) { %>)<% } else
-  if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
   if (field.fieldTypeZonedDateTime) { %>)<% } else
-  if (!field.fieldTypeString) { %>.toString()<% } %>))<%_ } _%>;
+  if (
+    !field.fieldTypeString &&
+    !field.javaFieldTypeString &&
+    !field.fieldTypeBoolean &&
+    !field.fieldTypeInteger &&
+    !field.fieldTypeDouble
+  ) { %>.toString()<% } %>))<%_ } _%>;
     }
 <%_ if (jpaMetamodelFiltering) {  %>
 
@@ -1313,13 +1321,17 @@ _%>
       if (field.fieldTypeZonedDateTime) { %>sameInstant(<% } else
       if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
       if (field.fieldTypeBinary && !field.blobContentTypeText) { %><% if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-      if (field.fieldTypeInteger) { %><% } else
       if (field.fieldTypeLong) { %>.intValue()<% } else
-      if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+      if (field.fieldTypeFloat) { %>.doubleValue()<% } else
       if (field.fieldTypeBigDecimal) { %>)<% } else
-      if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
       if (field.fieldTypeZonedDateTime) { %>)<% } else
-      if (!field.fieldTypeString) { %>.toString()<% } %>))<%_ } _%>;
+      if (
+        !field.fieldTypeString &&
+        !field.javaFieldTypeString &&
+        !field.fieldTypeBoolean &&
+        !field.fieldTypeInteger &&
+        !field.fieldTypeDouble
+      ) { %>.toString()<% } %>))<%_ } _%>;
 
         // Check, that the count call also returns 1
         webTestClient.get().uri(ENTITY_API_URL + "/count?sort=<%= primaryKey.name %>,desc&" + filter)
@@ -1356,13 +1368,17 @@ _%>
     if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
     if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
       if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-    if (field.fieldTypeInteger) { %><% } else
     if (field.fieldTypeLong) { %>.intValue()<% } else
-    if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+    if (field.fieldTypeFloat) { %>.doubleValue()<% } else
     if (field.fieldTypeBigDecimal) { %>)<% } else
-    if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
     if (field.fieldTypeZonedDateTime) { %>)<% } else
-    if (!field.fieldTypeString) { %>.toString()<% } %>)))<% }); %>;
+    if (
+      !field.fieldTypeString &&
+      !field.javaFieldTypeString &&
+      !field.fieldTypeBoolean &&
+      !field.fieldTypeInteger &&
+      !field.fieldTypeDouble
+    ) { %>.toString()<% } %>)))<% }); %>;
 
         // Check, that the count call also returns 1
         rest<%= entityClass %>MockMvc.perform(get(ENTITY_API_URL + "/count?sort=<%= primaryKey.name %>,desc&" + filter))
@@ -1797,7 +1813,7 @@ _%>
         <%= persistInstance %>.set<%= primaryKey.nameCapitalized %>(<%- field.fieldJavaValueGenerator %>);
     <%_ } _%>
   <%_ } _%>
-        inserted<%= persistClass %> = <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
+              <%_ if (!databaseTypeCouchbase) { _%>  inserted<%= persistClass %> = <%_ } _%><%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
   <%_ if (searchEngineElasticsearch) { _%>
         <%= entityInstance %>Repository.save(<%= persistInstance %>)<%= callBlock %>;
         <%= entityInstance %>SearchRepository.save(<%= persistInstance %>)<%= callBlock %>;
@@ -1877,13 +1893,16 @@ _%>
   if (field.fieldTypeBigDecimal) { %>sameNumber(<% } %><%= 'DEFAULT_' + field.fieldNameUnderscored.toUpperCase() %><%
   if (field.fieldTypeBinary && !field.blobContentTypeText) { %><%
     if (databaseTypeCassandra) { %>.array()<% } %>)<% } else
-  if (field.fieldTypeInteger) { %><% } else
   if (field.fieldTypeLong) { %>.intValue()<% } else
-  if (field.fieldTypeFloat || field.fieldTypeDouble) { %>.doubleValue()<% } else
+  if (field.fieldTypeFloat) { %>.doubleValue()<% } else
   if (field.fieldTypeBigDecimal) { %>)<% } else
-  if (field.fieldTypeBoolean) { %>.booleanValue()<% } else
   if (field.fieldTypeZonedDateTime) { %>)<% } else
-  if (!field.fieldTypeString) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
+  if (
+    !field.fieldTypeString &&
+    !field.fieldTypeBoolean &&
+    !field.fieldTypeInteger &&
+    !field.fieldTypeDouble
+  ) { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>;
     }
 <%_ } _%>
 

package/dist/generators/spring-boot/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs

@@ -93,7 +93,7 @@ class DomainUserDetailsServiceIT {
         userOne.setId(UUID.randomUUID().toString());
 <%_ } _%>
         userOne.setLogin(USER_ONE_LOGIN);
-        userOne.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        userOne.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         userOne.setActivated(true);
         userOne.setEmail(USER_ONE_EMAIL);
         userOne.setFirstName("userOne");
@@ -111,7 +111,7 @@ class DomainUserDetailsServiceIT {
         userTwo.setId(UUID.randomUUID().toString());
 <%_ } _%>
         userTwo.setLogin(USER_TWO_LOGIN);
-        userTwo.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        userTwo.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         userTwo.setActivated(true);
         userTwo.setEmail(USER_TWO_EMAIL);
         userTwo.setFirstName("userTwo");
@@ -129,7 +129,7 @@ class DomainUserDetailsServiceIT {
         userThree.setId(UUID.randomUUID().toString());
 <%_ } _%>
         userThree.setLogin(USER_THREE_LOGIN);
-        userThree.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        userThree.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         userThree.setActivated(false);
         userThree.setEmail(USER_THREE_EMAIL);
         userThree.setFirstName("userThree");

package/dist/generators/spring-boot/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs

@@ -54,6 +54,7 @@ public class JwtAuthenticationTestUtils {
     }
 <%_ if (reactive) { _%>
 
+    // TODO switch to MockitoSpyBean https://github.com/spring-projects/spring-framework/issues/33941
     @MockBean
     private ReactiveUserDetailsService userDetailsService;
 <%_ } _%>

package/dist/generators/spring-boot/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs

@@ -27,7 +27,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -56,7 +56,7 @@ class CustomClaimConverterIT {
 
     private final ObjectMapper mapper = new ObjectMapper();
 
-    @MockBean
+    @MockitoBean
     private RestTemplate restTemplate;
 
     @Autowired

package/dist/generators/spring-boot/templates/src/test/java/_package_/service/MailServiceIT.java.ejs

@@ -45,7 +45,7 @@ import java.nio.charset.Charset;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -66,7 +66,7 @@ class MailServiceIT {
     @Autowired
     private JHipsterProperties jHipsterProperties;
 
-    @MockBean
+    @MockitoBean
     private JavaMailSender javaMailSender;
 
     @Captor

package/dist/generators/spring-boot/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs

@@ -56,7 +56,7 @@ class UserMapperTest {
 <%_ if (databaseTypeCouchbase) { _%>
     private static final String DEFAULT_ID = DEFAULT_LOGIN;
 <%_ } else { _%>
-    private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- this.getPrimaryKeyValue(user.primaryKey.type) %>;
+    private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- user.primaryKey.javaSampleValues[0] %>;
 <%_ } _%>
 
     private UserMapper userMapper;
@@ -69,7 +69,7 @@ class UserMapperTest {
         user = new <%= user.persistClass %>();
         user.setLogin(DEFAULT_LOGIN);
 <%_ if (!authenticationTypeOauth2) { _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
 <%_ } _%>
         user.setActivated(true);
         user.setEmail("johndoe@localhost");

package/dist/generators/spring-boot/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs

@@ -690,7 +690,7 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("activate-account");
         user.setEmail("activate-account@example.com");
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setActivated(false);
         user.setActivationKey(activationKey);
 <%_ if (databaseTypeSql && reactive) { _%>
@@ -741,7 +741,7 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("save-account");
         user.setEmail("save-account@example.com");
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
@@ -802,7 +802,7 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("save-invalid-email");
         user.setEmail("save-invalid-email@example.com");
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
@@ -857,7 +857,7 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("save-existing-email");
         user.setEmail("save-existing-email@example.com");
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
@@ -870,7 +870,7 @@ class AccountResourceIT {
 <%_ } _%>
         anotherUser.setLogin("save-existing-email2");
         anotherUser.setEmail("save-existing-email2@example.com");
-        anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        anotherUser.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         anotherUser.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         anotherUser.setCreatedBy(Constants.SYSTEM);
@@ -924,7 +924,7 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("save-existing-email-and-login");
         user.setEmail("save-existing-email-and-login@example.com");
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
@@ -974,7 +974,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
+        String currentPassword = RandomStringUtils.insecure().nextAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password-wrong-existing-password");
         user.setEmail("change-password-wrong-existing-password@example.com");
@@ -1015,7 +1015,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
+        String currentPassword = RandomStringUtils.insecure().nextAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password");
         user.setEmail("change-password@example.com");
@@ -1055,7 +1055,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
+        String currentPassword = RandomStringUtils.insecure().nextAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password-too-small");
         user.setEmail("change-password-too-small@example.com");
@@ -1064,7 +1064,7 @@ class AccountResourceIT {
 <%_ } _%>
         userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
-        String newPassword = RandomStringUtils.random(ManagedUserVM.PASSWORD_MIN_LENGTH - 1);
+        String newPassword = RandomStringUtils.insecure().next(ManagedUserVM.PASSWORD_MIN_LENGTH - 1);
 
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/change-password")
@@ -1097,7 +1097,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
+        String currentPassword = RandomStringUtils.insecure().nextAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password-too-long");
         user.setEmail("change-password-too-long@example.com");
@@ -1106,7 +1106,7 @@ class AccountResourceIT {
 <%_ } _%>
         userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
-        String newPassword = RandomStringUtils.random(ManagedUserVM.PASSWORD_MAX_LENGTH + 1);
+        String newPassword = RandomStringUtils.insecure().next(ManagedUserVM.PASSWORD_MAX_LENGTH + 1);
 
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/change-password")
@@ -1139,7 +1139,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
+        String currentPassword = RandomStringUtils.insecure().nextAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password-empty");
         user.setEmail("change-password-empty@example.com");
@@ -1180,7 +1180,7 @@ class AccountResourceIT {
   <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
   <%_ } _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setLogin("current-sessions");
         user.setEmail("current-sessions@example.com");
   <%_ if (databaseTypeSql && reactive) { _%>
@@ -1229,7 +1229,7 @@ class AccountResourceIT {
   <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
   <%_ } _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setLogin("invalidate-session");
         user.setEmail("invalidate-session@example.com");
   <%_ if (databaseTypeSql && reactive) { _%>
@@ -1277,7 +1277,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setActivated(true);
         user.setLogin("password-reset");
         user.setEmail("password-reset@example.com");
@@ -1312,7 +1312,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setActivated(true);
         user.setLogin("password-reset-upper-case");
         user.setEmail("password-reset-upper-case@example.com");
@@ -1364,7 +1364,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setLogin("finish-password-reset");
         user.setEmail("finish-password-reset@example.com");
         user.setResetDate(Instant.now().plusSeconds(60));
@@ -1408,7 +1408,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        user.setPassword(RandomStringUtils.insecure().nextAlphanumeric(60));
         user.setLogin("finish-password-reset-too-small");
         user.setEmail("finish-password-reset-too-small@example.com");
         user.setResetDate(Instant.now().plusSeconds(60));

package/dist/generators/spring-cache/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class SpringCacheGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "configure">;
     get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cancel" | "addNeedles" | "loadDependabot">;

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

@@ -33,10 +33,14 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator {
     get configuring() {
         return this.asConfiguringTaskGroup({
             configure() {
-                const { databaseType, reactive } = this.jhipsterConfigWithDefaults;
+                const { databaseType, reactive, cacheProvider } = this.jhipsterConfigWithDefaults;
                 if (this.jhipsterConfig.enableHibernateCache && (reactive || databaseType !== 'sql')) {
+                    this.log.verboseInfo(`Disabling hibernate cache for ${reactive ? 'reactive application' : 'non-SQL databases'}`);
                     this.jhipsterConfig.enableHibernateCache = undefined;
                 }
+                if (reactive && cacheProvider !== 'no') {
+                    this.log.error(`Cache provider is not supported in reactive application`);
+                }
             },
         });
     }
@@ -54,9 +58,7 @@ export default class SpringCacheGenerator extends BaseApplicationGenerator {
                 this.loadJavaDependenciesFromGradleCatalog(application.javaDependencies, true);
             },
             addNeedles({ source, application }) {
-                if (application.cacheProviderEhcache ||
-                    application.cacheProviderCaffeine ||
-                    application.cacheProviderRedis) {
+                if (application.cacheProviderEhcache || application.cacheProviderCaffeine || application.cacheProviderRedis) {
                     const cacheConfigurationFile = `${application.javaPackageSrcDir}config/CacheConfiguration.java`;
                     const needle = `${application.cacheProvider}-add-entry`;
                     const useJcacheConfiguration = application.cacheProviderRedis;