generator-jhipster 8.9.0 → 8.11.0

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

@@ -18,6 +18,10 @@
 -%>
 package <%= packageName %>.security;
 
+<%_ if (authenticationTypeJwt) { _%>
+import static <%= packageName %>.security.SecurityUtils.USER_ID_CLAIM;
+<%_ } _%>
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -26,6 +30,10 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
+<%_ if (authenticationTypeJwt) { _%>
+import java.time.Instant;
+import org.springframework.security.oauth2.jwt.Jwt;
+<%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
@@ -39,6 +47,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Optional;
 <%_ } _%>
+import java.util.Collections;
 
 import static org.assertj.core.api.Assertions.assertThat;
 <%_ if (authenticationTypeOauth2) { _%>
@@ -128,6 +137,25 @@ class SecurityUtilsUnitTest {
         Optional<String> jwt = SecurityUtils.getCurrentUserJWT();
         assertThat(jwt).contains("token");
     }
+  <%_ if (user) { _%>
+
+    @Test
+    void testGetCurrentUserId() {
+        var userId = <%- user.primaryKey.javaSampleValues[0] %>;
+        var securityContext = SecurityContextHolder.createEmptyContext();
+        var now = Instant.now();
+        var jwt = Jwt.withTokenValue("token")
+            .issuedAt(now)
+            .expiresAt(now.plusSeconds(60))
+            .claim(USER_ID_CLAIM, userId)
+            .header("Test", "test")
+            .build();
+        securityContext.setAuthentication(new UsernamePasswordAuthenticationToken(jwt, "token"));
+        SecurityContextHolder.setContext(securityContext);
+        var contextUserId = SecurityUtils.getCurrentUserId();
+        assertThat(contextUserId.orElse(null)).isEqualTo(userId);
+    }
+  <%_ } _%>
 <%_ } _%>
 
     @Test
@@ -142,8 +170,7 @@ class SecurityUtilsUnitTest {
     @Test
     void testAnonymousIsNotAuthenticated() {
         SecurityContext securityContext = SecurityContextHolder.createEmptyContext();
-        Collection<GrantedAuthority> authorities = new ArrayList<>();
-        authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS));
+        var authorities = Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS));
         securityContext.setAuthentication(new UsernamePasswordAuthenticationToken("anonymous", "anonymous", authorities));
         SecurityContextHolder.setContext(securityContext);
         boolean isAuthenticated = SecurityUtils.isAuthenticated();
@@ -153,9 +180,8 @@ class SecurityUtilsUnitTest {
     @Test
     void testHasCurrentUserThisAuthority() {
         SecurityContext securityContext = SecurityContextHolder.createEmptyContext();
-        Collection<GrantedAuthority> authorities = new ArrayList<>();
-        authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.USER));
-        securityContext.setAuthentication(new UsernamePasswordAuthenticationToken("user", "user", authorities));
+        var authorities = Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.USER));
+        securityContext.setAuthentication(new UsernamePasswordAuthenticationToken("anonymous", "anonymous", authorities));
         SecurityContextHolder.setContext(securityContext);
 
         assertThat(SecurityUtils.hasCurrentUserThisAuthority(AuthoritiesConstants.USER)).isTrue();
@@ -165,9 +191,8 @@ class SecurityUtilsUnitTest {
     @Test
     void testHasCurrentUserAnyOfAuthorities() {
         SecurityContext securityContext = SecurityContextHolder.createEmptyContext();
-        Collection<GrantedAuthority> authorities = new ArrayList<>();
-        authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.USER));
-        securityContext.setAuthentication(new UsernamePasswordAuthenticationToken("user", "user", authorities));
+        var authorities = Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.USER));
+        securityContext.setAuthentication(new UsernamePasswordAuthenticationToken("anonymous", "anonymous", authorities));
         SecurityContextHolder.setContext(securityContext);
 
         assertThat(SecurityUtils.hasCurrentUserAnyOfAuthorities(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN)).isTrue();
@@ -177,9 +202,8 @@ class SecurityUtilsUnitTest {
     @Test
     void testHasCurrentUserNoneOfAuthorities() {
         SecurityContext securityContext = SecurityContextHolder.createEmptyContext();
-        Collection<GrantedAuthority> authorities = new ArrayList<>();
-        authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.USER));
-        securityContext.setAuthentication(new UsernamePasswordAuthenticationToken("user", "user", authorities));
+        var authorities = Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.USER));
+        securityContext.setAuthentication(new UsernamePasswordAuthenticationToken("anonymous", "anonymous", authorities));
         SecurityContextHolder.setContext(securityContext);
 
         assertThat(SecurityUtils.hasCurrentUserNoneOfAuthorities(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN)).isFalse();

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

@@ -18,6 +18,14 @@
 -%>
 package <%= packageName %>.security;
 
+import static org.assertj.core.api.Assertions.assertThat;
+<%_ if (authenticationTypeOauth2) { _%>
+import static org.springframework.security.oauth2.core.oidc.endpoint.OidcParameterNames.ID_TOKEN;
+<%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
+import static <%= packageName %>.security.SecurityUtils.USER_ID_CLAIM;
+<%_ } _%>
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -27,6 +35,11 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import reactor.util.context.Context;
 
+<%_ if (authenticationTypeJwt) { _%>
+import java.time.Instant;
+import org.springframework.security.oauth2.jwt.Jwt;
+import reactor.core.publisher.Mono;
+<%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
 import java.time.Instant;
 import java.util.*;
@@ -35,11 +48,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 <%_ } _%>
 
-import static org.assertj.core.api.Assertions.assertThat;
-<%_ if (authenticationTypeOauth2) { _%>
-import static org.springframework.security.oauth2.core.oidc.endpoint.OidcParameterNames.ID_TOKEN;
-<%_ } _%>
-
 /**
  * Test class for the {@link SecurityUtils} utility class.
  */
@@ -52,7 +60,7 @@ class SecurityUtilsUnitTest {
             .block();
         assertThat(login).isEqualTo("admin");
     }
-  <%_ if (authenticationTypeJwt) { _%>
+<%_ if (authenticationTypeJwt) { _%>
 
     @Test
     void testgetCurrentUserJWT() {
@@ -61,7 +69,28 @@ class SecurityUtilsUnitTest {
             .block();
         assertThat(jwt).isEqualTo("token");
     }
+
+  <%_ if (user) { _%>
+    @Test
+    void testGetCurrentUserId() {
+        var userId = <%- user.primaryKey.javaSampleValues[0] %>;
+        var now = Instant.now();
+        var jwt = Jwt.withTokenValue("token")
+            .issuedAt(now)
+            .expiresAt(now.plusSeconds(60))
+            .claim(USER_ID_CLAIM, userId)
+            .header("Test", "test")
+            .build();
+
+        var authentication = new UsernamePasswordAuthenticationToken(jwt, "token");
+        var contextUserId = SecurityUtils.getCurrentUserId()
+            .contextWrite(ReactiveSecurityContextHolder.withAuthentication(authentication))
+            .block();
+
+        assertThat(contextUserId).isEqualTo(userId);
+    }
   <%_ } _%>
+<%_ } _%>
 
     @Test
     void testIsAuthenticated() {

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

@@ -1,7 +1,8 @@
 package <%= packageName %>.security.jwt;
 
-import static <%= packageName %>.security.SecurityUtils.AUTHORITIES_KEY;
+import static <%= packageName %>.security.SecurityUtils.AUTHORITIES_CLAIM;
 import static <%= packageName %>.security.SecurityUtils.JWT_ALGORITHM;
+import static <%= packageName %>.security.AuthoritiesConstants.ADMIN;
 
 import com.nimbusds.jose.jwk.source.ImmutableSecret;
 import com.nimbusds.jose.util.Base64;
@@ -77,7 +78,7 @@ public class JwtAuthenticationTestUtils {
             .issuedAt(now)
             .expiresAt(now.plusSeconds(60))
             .subject(user)
-            .claims(customClaim -> customClaim.put(AUTHORITIES_KEY, Collections.singletonList("ROLE_ADMIN")))
+            .claims(customClaim -> customClaim.put(AUTHORITIES_CLAIM, Collections.singletonList(ADMIN)))
             .build();
 
         JwsHeader jwsHeader = JwsHeader.with(JWT_ALGORITHM).build();

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

@@ -1,6 +1,8 @@
 package <%= packageName %>.security.jwt;
 
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -12,11 +14,9 @@ public class TestAuthenticationResource {
 
     /**
      * {@code GET  /authenticate} : check if the authentication token correctly validates
-     *
-     * @return ok.
      */
-    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
-    public String isAuthenticated() {
-        return "ok";
+    @GetMapping("/authenticate")
+    public ResponseEntity<Void> isAuthenticated() {
+        return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
     }
 }

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

@@ -57,7 +57,7 @@ class TokenAuthenticationIT {
 <%_ if (reactive) { %>
 
     private void expectOk(String token) {
-        webTestClient.get().uri("/api/authenticate").headers(headers -> headers.setBearerAuth(token)).exchange().expectStatus().isOk();
+        webTestClient.get().uri("/api/authenticate").headers(headers -> headers.setBearerAuth(token)).exchange().expectStatus().isNoContent();
     }
 
     private void expectUnauthorized(String token) {
@@ -72,7 +72,7 @@ class TokenAuthenticationIT {
 <%_ } else { _%>
 
     private void expectOk(String token) throws Exception {
-        mvc.perform(MockMvcRequestBuilders.get("/api/authenticate").header(AUTHORIZATION, BEARER + token)).andExpect(status().isOk());
+        mvc.perform(MockMvcRequestBuilders.get("/api/authenticate").header(AUTHORIZATION, BEARER + token)).andExpect(status().isNoContent());
     }
 
     private void expectUnauthorized(String token) throws Exception {

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

@@ -97,10 +97,7 @@ class TokenAuthenticationSecurityMetersIT {
             .get()
             .uri("/api/authenticate")
             .headers(headers -> headers.setBearerAuth(token))
-            .exchange()
-            .returnResult(String.class)
-            .getResponseBody()
-            .blockLast();
+            .exchange();
     }
 <%_ } else { _%>
 

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

@@ -65,7 +65,7 @@ class CustomClaimConverterIT {
     private CustomClaimConverter customClaimConverter;
 
     @BeforeEach
-    public void initTest() {
+    void initTest() {
         customClaimConverter = new CustomClaimConverter(clientRegistrationRepository.findByRegistrationId("oidc"), restTemplate);
     }
 

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

@@ -75,7 +75,7 @@ class MailServiceIT {
     private MailService mailService;
 
     @BeforeEach
-    public void setup() {
+    void setup() {
         doNothing().when(javaMailSender).send(any(MimeMessage.class));
         when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session) null));
     }

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

@@ -64,7 +64,7 @@ class UserMapperTest {
     private <%= user.adminUserDto %> userDto;
 
     @BeforeEach
-    public void init() {
+    void init() {
         userMapper = new UserMapper();
         user = new <%= user.persistClass %>();
         user.setLogin(DEFAULT_LOGIN);

package/dist/generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs

@@ -31,7 +31,7 @@ class SpaWebFilterIT {
     @Test
     void testFilterDoesNotForwardToIndexForApi() throws Exception {
         mockMvc.perform(get("/api/<% if (!applicationTypeMicroservice) { %>authenticate<% } else { %>users<% } %>"))
-            .andExpect(status().isOk())
+            .andExpect(status().is2xxSuccessful())
             .andExpect(forwardedUrl(null));
     }
 <%_ } _%>

package/dist/generators/spring-boot/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs

@@ -37,8 +37,7 @@ class SpaWebFilterIT {
             .get()
             .uri("/api/<% if (!applicationTypeMicroservice) { %>authenticate<% } else { %>users<% } %>")
             .exchange()
-            .expectStatus().isOk()
-            .expectBody(String.class).isEqualTo("user");
+            .expectStatus().is2xxSuccessful();
     }
 <%_ } _%>
 

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

@@ -147,20 +147,20 @@ class AccountResourceIT {
     private Long numberOfUsers;
 
     @BeforeEach
-    public void countUsers() {
+    void countUsers() {
         numberOfUsers = userRepository.count()<%- reactorBlock %>;
     }
 
 <%_ } _%>
 <%_ if (reactive && authenticationUsesCsrf) { _%>
     @BeforeEach
-    public void setupCsrf() {
+    void setupCsrf() {
         accountWebTestClient = accountWebTestClient.mutateWith(csrf());
     }
 
 <%_ } _%>
     @AfterEach
-    public void cleanupAndCheck() {
+    void cleanupAndCheck() {
 <%_ if (requiresDeleteAllUsers) { _%>
         userRepository.deleteAll()<%- reactorBlock %>;
 <%_ } else if (!databaseTypeCassandra) { _%>
@@ -174,16 +174,13 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
     void testNonAuthenticatedUser() {
         accountWebTestClient.get().uri("/api/authenticate")
-            .accept(MediaType.TEXT_PLAIN)
             .exchange()
-            .expectStatus().isOk()
-            .expectBody().isEmpty();
+            .expectStatus().isUnauthorized();
 <%_ } else { _%>
     void testNonAuthenticatedUser() throws Exception {
         restAccountMockMvc
-            .perform(get("/api/authenticate").accept(MediaType.TEXT_PLAIN))
-            .andExpect(status().isOk())
-            .andExpect(content().string(""));
+            .perform(get("/api/authenticate"))
+            .andExpect(status().isUnauthorized());
 <%_ } _%>
     }
 
@@ -193,16 +190,13 @@ class AccountResourceIT {
     void testAuthenticatedUser() {
         accountWebTestClient
             .get().uri("/api/authenticate")
-            .accept(MediaType.TEXT_PLAIN)
             .exchange()
-            .expectStatus().isOk()
-            .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
+            .expectStatus().isNoContent();
 <%_ } else { _%>
     void testAuthenticatedUser() throws Exception {
         restAccountMockMvc
-            .perform(get("/api/authenticate").with(request -> request).accept(MediaType.TEXT_PLAIN))
-            .andExpect(status().isOk())
-            .andExpect(content().string(TEST_USER_LOGIN));
+            .perform(get("/api/authenticate").with(request -> request))
+            .andExpect(status().isNoContent());
 <%_ } _%>
     }
 

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

@@ -110,7 +110,7 @@ class AccountResourceIT {
 
 <%_ if (reactive) { _%>
     @BeforeEach
-    public void setup() {
+    void setup() {
         claims = new HashMap<>();
         claims.put("groups", Collections.singletonList(AuthoritiesConstants.ADMIN));
         claims.put("sub", "jane");
@@ -120,7 +120,7 @@ class AccountResourceIT {
 <%_ } _%>
 <%_ if (syncUserWithIdp) { _%>
     @AfterEach
-    public void cleanup() {
+    void cleanup() {
         // Remove syncUserWithIdp users
     <%_ if (databaseTypeSql && reactive) { _%>
         userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
@@ -185,15 +185,11 @@ class AccountResourceIT {
     void testNonAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
 <%_ if (reactive) { _%>
         webTestClient.get().uri("/api/authenticate")
-            .accept(MediaType.TEXT_PLAIN)
             .exchange()
-            .expectStatus().isOk()
-            .expectBody().isEmpty();
+            .expectStatus().isUnauthorized();
 <%_ } else { _%>
-        restAccountMockMvc.perform(get("/api/authenticate")
-            .accept(MediaType.TEXT_PLAIN))
-            .andExpect(status().isOk())
-            .andExpect(content().string(""));
+        restAccountMockMvc.perform(get("/api/authenticate"))
+            .andExpect(status().isUnauthorized());
 <%_ } _%>
     }
 
@@ -203,16 +199,11 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         webTestClient
             .get().uri("/api/authenticate")
-            .accept(MediaType.TEXT_PLAIN)
             .exchange()
-            .expectStatus().isOk()
-            .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
+            .expectStatus().isNoContent();
 <%_ } else { _%>
-        restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> request)
-            .accept(MediaType.TEXT_PLAIN))
-            .andExpect(status().isOk())
-            .andExpect(content().string(TEST_USER_LOGIN));
+        restAccountMockMvc.perform(get("/api/authenticate").with(request -> request))
+            .andExpect(status().isNoContent());
 <%_ } _%>
     }
 }

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

@@ -116,15 +116,11 @@ class AccountResourceIT {
     void testNonAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
 <%_ if (reactive) { _%>
         accountWebTestClient.get().uri("/api/authenticate")
-            .accept(MediaType.TEXT_PLAIN)
             .exchange()
-            .expectStatus().isOk()
-            .expectBody().isEmpty();
+            .expectStatus().isUnauthorized();
 <%_ } else { _%>
-        restAccountMockMvc.perform(get("/api/authenticate")
-            .accept(MediaType.TEXT_PLAIN))
-            .andExpect(status().isOk())
-            .andExpect(content().string(""));
+        restAccountMockMvc.perform(get("/api/authenticate"))
+            .andExpect(status().isUnauthorized());
 <%_ } _%>
     }
 
@@ -134,16 +130,11 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient
             .get().uri("/api/authenticate")
-            .accept(MediaType.TEXT_PLAIN)
             .exchange()
-            .expectStatus().isOk()
-            .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
+            .expectStatus().isNoContent();
 <%_ } else { _%>
-        restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> request)
-            .accept(MediaType.TEXT_PLAIN))
-            .andExpect(status().isOk())
-            .andExpect(content().string(TEST_USER_LOGIN));
+        restAccountMockMvc.perform(get("/api/authenticate").with(request -> request))
+            .andExpect(status().isNoContent());
 <%_ } _%>
     }
 }

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

@@ -81,7 +81,7 @@ class LogoutResourceIT {
     private Map<String, Object> claims;
 
     @BeforeEach
-    public void before() <% if (!reactive) { %>throws Exception <% } %>{
+    void before() <% if (!reactive) { %>throws Exception <% } %>{
         claims = new HashMap<>();
         claims.put("groups", Collections.singletonList(AuthoritiesConstants.USER));
         claims.put("sub", 123);

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

@@ -51,7 +51,7 @@ class ExceptionTranslatorIT {
 <%_ if (authenticationUsesCsrf) { _%>
 
     @BeforeEach
-    public void setupCsrf() {
+    void setupCsrf() {
         webTestClient = webTestClient.mutateWith(csrf());
     }
 <%_ } _%>

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

@@ -1,24 +1,6 @@
-/**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import type Generator from './generator.js';
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.
  */
-export default function cleanupTask(this: Generator, { application }: any): void;
+declare const _default: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").WritingTaskParam<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>>>) => void;
+export default _default;

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

@@ -1,8 +1,27 @@
+/**
+ * Copyright 2013-2025 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { asWritingTask } from '../base-application/support/task-type-inference.js';
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.
  */
-export default function cleanupTask({ application }) {
+export default asWritingTask(async function cleanupTask({ application, control }) {
     if (application.cacheProviderHazelcast) {
         if (this.isJhipsterVersionLessThan('3.12.0')) {
             this.removeFile(`${application.javaPackageSrcDir}config/hazelcast/HazelcastCacheRegionFactory.java`);
@@ -19,4 +38,7 @@ export default function cleanupTask({ application }) {
             this.removeFile('gradle/cache.gradle');
         }
     }
-}
+    await control.cleanupFiles({
+        '8.9.1': [[application.cacheProviderInfinispan, `${application.javaPackageSrcDir}config/CacheFactoryConfiguration.java`]],
+    });
+});

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

@@ -29,12 +29,6 @@ const files = {
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/CacheConfiguration.java'],
         },
-        {
-            condition: data => data.cacheProviderInfinispan,
-            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageSrcDir,
-            templates: ['config/CacheFactoryConfiguration.java'],
-        },
         {
             condition: data => data.cacheProviderRedis,
             path: `${SERVER_TEST_SRC_DIR}_package_/`,

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

@@ -18,7 +18,11 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class SpringCacheGenerator extends BaseApplicationGenerator {
-    [x: string]: any;
+    [BaseApplicationGenerator.CONFIGURING]: any;
+    [BaseApplicationGenerator.PREPARING]: any;
+    [BaseApplicationGenerator.WRITING]: any;
+    [BaseApplicationGenerator.POST_WRITING]: any;
+    [BaseApplicationGenerator.POST_WRITING_ENTITIES]: 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/resources/gradle/libs.versions.toml

@@ -12,4 +12,4 @@ xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemca
 
 xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' }
 
-redisson = { module = 'org.redisson:redisson', version = '3.44.0' }
+redisson = { module = 'org.redisson:redisson', version = '3.46.0' }

package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs

@@ -571,20 +571,6 @@ public class CacheConfiguration {
 
         };
     }
-  <%_ if (enableHibernateCache) { _%>
-    /**
-    * Hibernate properties customizer.
-    * This component ensures that Hibernate L2 cache region factory uses, as cache manager, the
-    * same instance already configured in Spring Context with {@link CacheConfiguration}
-    *
-    * @param cacheFactoryConfiguration custom infinispan region factory
-    * @return hibernate properties with custom cache region factory
-    */
-    @Bean
-    public HibernatePropertiesCustomizer hibernatePropertiesCustomizer(CacheFactoryConfiguration cacheFactoryConfiguration) {
-        return hibernateProperties -> hibernateProperties.put(AvailableSettings.CACHE_REGION_FACTORY, cacheFactoryConfiguration);
-    }
-  <%_ } _%>
 
   <%_ if (serviceDiscoveryAny) { _%>
     /**

package/dist/generators/spring-cloud/generators/gateway/generator.d.ts

@@ -18,7 +18,11 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class GatewayGenerator extends BaseApplicationGenerator {
-    [x: string]: any;
+    [BaseApplicationGenerator.CONFIGURING]: any;
+    [BaseApplicationGenerator.PREPARING]: any;
+    [BaseApplicationGenerator.WRITING]: any;
+    [BaseApplicationGenerator.POST_WRITING]: any;
+    [BaseApplicationGenerator.POST_WRITING_ENTITIES]: any;
     beforeQueue(): Promise<void>;
     get configuring(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/base/tasks.js").TaskParamWithControl, "reactiveByDefault">;
     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>>>, "prepareGateway">;

package/dist/generators/spring-cloud-stream/generator.d.ts

@@ -18,7 +18,8 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class KafkaGenerator extends BaseApplicationGenerator {
-    [x: string]: any;
+    [BaseApplicationGenerator.COMPOSING]: any;
+    [BaseApplicationGenerator.PREPARING]: any;
     beforeQueue(): Promise<void>;
     get composing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "compose">;
     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>>>, "preparing">;

package/dist/generators/spring-cloud-stream/generators/kafka/generator.d.ts

@@ -18,7 +18,8 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class KafkaGenerator extends BaseApplicationGenerator {
-    [x: string]: any;
+    [BaseApplicationGenerator.WRITING]: any;
+    [BaseApplicationGenerator.POST_WRITING]: any;
     beforeQueue(): Promise<void>;
     get writing(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/application/tasks.js").WritingTaskParam<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>>>, "writing" | "cleanupKafkaFilesTask">;
     get postWriting(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/application/tasks.js").PostWritingTaskParam<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>>>, "customizeApplicationForKafka" | "applyKafkaGradleConventionPlugin" | "addKafkaMavenDependencies" | "addLog">;