generator-jhipster 8.9.0 → 8.11.0

package/dist/generators/spring-boot/templates/src/main/java/_package_/Application.java.ejs

@@ -91,6 +91,17 @@ public class <%= mainClass %> {
      * @param args the command line arguments.
      */
     public static void main(String[] args) {
+<%_ if (cacheProviderHazelcast) { _%>
+        try {
+            // Workaround Hazelcast issue: https://github.com/hazelcast/hazelcast/issues/26361#issuecomment-2489778475
+            Class.forName("org.springframework.boot.devtools.autoconfigure.DevToolsProperties", false, SpringApplication.class.getClassLoader());
+            System.setProperty("spring.devtools.restart.enabled", "false");
+            LOG.warn("Spring Boot Developer Tools restart has been disabled using System property in order to prevent issues with Hazelcast");
+        } catch (Exception e){
+            // Devtools not found, ignore
+        }
+
+<%_ } _%>
         SpringApplication app = new SpringApplication(<%= mainClass %>.class);
         DefaultProfileUtil.addDefaultProfile(app);
         Environment env = app.run(args).getEnvironment();

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs

@@ -126,29 +126,18 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
         Specification<<%= persistClass %>> specification = Specification.where(null);
         if (criteria != null) {
             // This has to be called first, because the distinct method returns null
-            if (criteria.getDistinct() != null) {
-                specification = specification.and(distinct(criteria.getDistinct()));
-            }
-            if (criteria.get<%= primaryKey.nameCapitalized %>() != null) {
-                specification = specification.and(<%= primaryKey.javaBuildSpecification %>(criteria.get<%= primaryKey.nameCapitalized %>(), <%= persistClass %>_.<%= primaryKey.name %>));
-            }
-<%_
-fields.forEach((field) => {
-  if (field.id || field.transient) return;
-  if (field.filterableField) { _%>
-            if (criteria.get<%= field.fieldInJavaBeanMethod %>() != null) {
-                specification = specification.and(<%= field.fieldJavaBuildSpecification %>(criteria.get<%= field.fieldInJavaBeanMethod %>(), <%= persistClass %>_.<%= field.fieldName %>));
-            }
-  <%_ }
-});
-
-relationships.forEach((relationship) => {
-  const metamodelFieldName = (relationship.relationshipManyToMany || relationship.relationshipOneToMany) ? relationship.relationshipFieldNamePlural : relationship.relationshipFieldName; _%>
-if (criteria.get<%= relationship.relationshipNameCapitalized %>Id() != null) {
-    specification = specification.and(buildSpecification(criteria.get<%= relationship.relationshipNameCapitalized %>Id(),
-        root -> root.join(<%= persistClass %>_.<%= metamodelFieldName %>, JoinType.LEFT).get(<%= relationship.otherEntity.persistClass %>_.<%= relationship.otherEntity.primaryKey.name %>)));
-}
-<%_ }); /* forEach */ _%>
+            specification = Specification.allOf(
+                Boolean.TRUE.equals(criteria.getDistinct()) ? distinct(criteria.getDistinct()) : null
+<%_ for (const field of fields.filter(field => !field.transient && field.filterableField)) { _%>
+                ,
+                <%= field.fieldJavaBuildSpecification %>(criteria.get<%= field.fieldInJavaBeanMethod %>(), <%= persistClass %>_.<%= field.fieldName %>)
+<%_ } _%>
+<%_ for (const relationship of relationships) { _%>
+                ,
+                buildSpecification(criteria.get<%= relationship.relationshipNameCapitalized %>Id(),
+                    root -> root.join(<%= persistClass %>_.<%= relationship.propertyName %>, JoinType.LEFT).get(<%= relationship.otherEntity.persistClass %>_.<%= relationship.otherEntity.primaryKey.name %>))
+<%_ } _%>
+            );
         }
         return specification;
     }

package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs

@@ -18,7 +18,6 @@
 -%>
 package <%= packageName %>.config;
 
-import static <%= packageName %>.security.SecurityUtils.AUTHORITIES_KEY;
 import static <%= packageName %>.security.SecurityUtils.JWT_ALGORITHM;
 
 import <%= packageName %>.management.SecurityMetersService;

package/dist/generators/spring-boot/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs

@@ -27,6 +27,7 @@ import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.GrantedAuthority;
 <%_ if (reactive) { _%>
 import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
 <%_ } _%>
@@ -42,6 +43,9 @@ import org.springframework.transaction.annotation.Transactional;
 <%_ if (reactive) { _%>
 import reactor.core.publisher.Mono;
 <%_ } _%>
+<%_ if (user?.primaryKey?.hasUUID) { _%>
+import java.util.UUID;
+<%_ } _%>
 
 import java.util.*;
 
@@ -89,10 +93,62 @@ public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<%
         if (!user.isActivated()) {
             throw new UserNotActivatedException("User " + lowercaseLogin + " was not activated");
         }
-        List<SimpleGrantedAuthority> grantedAuthorities = user.getAuthorities().stream()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>
-            .map(Authority::getName)<% } %>
-            .map(SimpleGrantedAuthority::new)
-            .toList();
-        return new org.springframework.security.core.userdetails.User(user.getLogin(), user.getPassword(), grantedAuthorities);
+<%_ if (user) { _%>
+        return UserWithId.fromUser(user);
+<%_ } else { _%>
+        return org.springframework.security.core.userdetails.User.withUsername(user.getLogin())
+            .password(user.getPassword())
+            .authorities(
+                user.getAuthorities()
+                    .stream()
+  <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
+                    .map(Authority::getName)
+  <%_ } _%>
+                    .map(SimpleGrantedAuthority::new)
+                    .toList()
+            )
+            .build();
+<%_ } _%>
+    }
+<%_ if (user) { _%>
+
+    public static class UserWithId extends org.springframework.security.core.userdetails.User {
+
+        private final <%= user.primaryKey.type %> id;
+
+        public UserWithId(String login, String password, Collection<? extends GrantedAuthority> authorities, <%= user.primaryKey.type %> id) {
+            super(login, password, authorities);
+            this.id = id;
+        }
+
+        public <%= user.primaryKey.type %> getId() {
+            return id;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return super.equals(obj);
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode();
+        }
+
+        public static UserWithId fromUser(<%= user.persistClass %> user) {
+            return new UserWithId(
+                user.getLogin(),
+                user.getPassword(),
+                user.getAuthorities()
+                    .stream()
+  <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
+                    .map(Authority::getName)
+  <%_ } _%>
+                    .map(SimpleGrantedAuthority::new)
+                    .toList(),
+                user.getId()
+            );
+        }
     }
+<%_ } _%>
 }

package/dist/generators/spring-boot/templates/src/main/java/_package_/security/SecurityUtils.java.ejs

@@ -34,6 +34,7 @@ import org.springframework.security.core.userdetails.UserDetails;
 <%_ if (authenticationTypeJwt) { _%>
 import org.springframework.security.oauth2.jose.jws.MacAlgorithm;
 import org.springframework.security.oauth2.jwt.Jwt;
+import org.springframework.security.oauth2.core.ClaimAccessor;
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -65,6 +66,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 <%_ } _%>
+<%_ if (user?.primaryKey?.hasUUID) { _%>
+import java.util.UUID;
+<%_ } _%>
 
 /**
  * Utility class for Spring Security.
@@ -76,7 +80,11 @@ public final class SecurityUtils {
 
     public static final MacAlgorithm JWT_ALGORITHM = MacAlgorithm.HS512;
 
-    public static final String AUTHORITIES_KEY = "auth";
+    public static final String AUTHORITIES_CLAIM = "auth";
+  <%_ if (user) { _%>
+
+    public static final String USER_ID_CLAIM = "userId";
+  <%_ } _%>
 <%_ } _%>
 
     private SecurityUtils() {}
@@ -139,6 +147,26 @@ public final class SecurityUtils {
             .filter(authentication -> authentication.getCredentials() instanceof String)
             .map(authentication -> (String) authentication.getCredentials());
     }
+  <%_ if (user) { _%>
+
+    /**
+     * Get the Id of the current user.
+     *
+     * @return the Id of the current user.
+     */
+    public static <%- optionalOrMono %><<%= user.primaryKey.type %>> getCurrentUserId() {
+    <%_ if (reactive) { _%>
+        return ReactiveSecurityContextHolder.getContext()
+            .map(SecurityContext::getAuthentication)
+    <%_ } else { _%>
+        SecurityContext securityContext = SecurityContextHolder.getContext();
+        return Optional.ofNullable(securityContext.getAuthentication())
+    <%_ } _%>
+            .filter(authentication -> authentication.getPrincipal() instanceof ClaimAccessor)
+            .map(authentication -> (ClaimAccessor) authentication.getPrincipal())
+            .map(principal -> principal.getClaim(USER_ID_CLAIM));
+    }
+  <%_ } _%>
 <%_ } _%>
 
     /**

package/dist/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs

@@ -41,6 +41,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 <%_ if (reactive) { _%>
 import java.util.Objects;
@@ -135,15 +136,15 @@ public class AccountResource {
 
   <%_ if (!authenticationTypeJwt) { _%>
     /**
-     * {@code GET  /authenticate} : check if the user is authenticated, and return its login.
+     * {@code GET  /authenticate} : check if the user is authenticated.
      *
-     * @param principal the authentication principal.
-     * @return the login if the user is authenticated.
+     * @return the {@link ResponseEntity} with status {@code 204 (No Content)},
+     * or with status {@code 401 (Unauthorized)} if not authenticated.
      */
-    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
-    public String isAuthenticated(Principal principal) {
+    @GetMapping("/authenticate")
+    public ResponseEntity<Void> isAuthenticated(Principal principal) {
         LOG.debug("REST request to check if the current user is authenticated");
-        return principal == null ? null : principal.getName();
+        return ResponseEntity.status(principal == null ? HttpStatus.UNAUTHORIZED : HttpStatus.NO_CONTENT).build();
     }
 
   <%_ } _%>

package/dist/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs

@@ -24,7 +24,9 @@ import <%= packageName %>.service.dto.<%= user.adminUserDto %>;
 import java.security.Principal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -74,14 +76,14 @@ public class AccountResource {
     }
 
     /**
-     * {@code GET  /authenticate} : check if the user is authenticated, and return its login.
+     * {@code GET  /authenticate} : check if the user is authenticated.
      *
-     * @param principal the authentication principal.
-     * @return the login if the user is authenticated.
+     * @return the {@link ResponseEntity} with status {@code 204 (No Content)},
+     * or with status {@code 401 (Unauthorized)} if not authenticated.
      */
-    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
-    public String isAuthenticated(Principal principal) {
+    @GetMapping("/authenticate")
+    public ResponseEntity<Void> isAuthenticated(Principal principal) {
         LOG.debug("REST request to check if the current user is authenticated");
-        return principal == null ? null : principal.getName();
+        return ResponseEntity.status(principal == null ? HttpStatus.UNAUTHORIZED : HttpStatus.NO_CONTENT).build();
     }
 }

package/dist/generators/spring-boot/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs

@@ -48,7 +48,9 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -139,15 +141,15 @@ public class AccountResource {
 <%_ if (!authenticationTypeJwt) { _%>
 
     /**
-     * {@code GET  /authenticate} : check if the user is authenticated, and return its login.
+     * {@code GET  /authenticate} : check if the user is authenticated.
      *
-     * @param principal the authentication principal.
-     * @return the login if the user is authenticated.
+     * @return the {@link ResponseEntity} with status {@code 204 (No Content)},
+     * or with status {@code 401 (Unauthorized)} if not authenticated.
      */
-    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
-    public String isAuthenticated(Principal principal) {
+    @GetMapping("/authenticate")
+    public ResponseEntity<Void> isAuthenticated(Principal principal) {
         LOG.debug("REST request to check if the current user is authenticated");
-        return principal == null ? null : principal.getName();
+        return ResponseEntity.status(principal == null ? HttpStatus.UNAUTHORIZED : HttpStatus.NO_CONTENT).build();
     }
 <%_ } _%>
 

package/dist/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs

@@ -18,10 +18,12 @@
 -%>
 package <%= packageName %>.web.rest;
 
-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.SecurityUtils.USER_ID_CLAIM;
 
 import <%= packageName %>.web.rest.vm.LoginVM;
+import <%= packageName %>.security.DomainUserDetailsService.UserWithId;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -117,15 +119,15 @@ public class AuthenticateController {
 <%_ } _%>
 
     /**
-     * {@code GET /authenticate} : check if the user is authenticated, and return its login.
+     * {@code GET /authenticate} : check if the user is authenticated.
      *
-     * @param principal the authentication principal.
-     * @return the login if the user is authenticated.
+     * @return the {@link ResponseEntity} with status {@code 204 (No Content)},
+     * or with status {@code 401 (Unauthorized)} if not authenticated.
      */
-    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
-    public String isAuthenticated(Principal principal) {
+    @GetMapping("/authenticate")
+    public ResponseEntity<Void> isAuthenticated(Principal principal) {
         LOG.debug("REST request to check if the current user is authenticated");
-        return principal == null ? null : principal.getName();
+        return ResponseEntity.status(principal == null ? HttpStatus.UNAUTHORIZED : HttpStatus.NO_CONTENT).build();
     }
 
     public String createToken(Authentication authentication, boolean rememberMe) {
@@ -140,15 +142,19 @@ public class AuthenticateController {
         }
 
         // @formatter:off
-        JwtClaimsSet claims = JwtClaimsSet.builder()
+        JwtClaimsSet.Builder builder = JwtClaimsSet.builder()
             .issuedAt(now)
             .expiresAt(validity)
             .subject(authentication.getName())
-            .claim(AUTHORITIES_KEY, authorities)
-            .build();
+            .claim(AUTHORITIES_CLAIM, authorities);
+<%_ if (user) { _%>
+        if (authentication.getPrincipal() instanceof UserWithId user) {
+            builder.claim(USER_ID_CLAIM, user.getId());
+        }
+<%_ } _%>
 
         JwsHeader jwsHeader = JwsHeader.with(JWT_ALGORITHM).build();
-        return this.jwtEncoder.encode(JwtEncoderParameters.from(jwsHeader, claims)).getTokenValue();
+        return this.jwtEncoder.encode(JwtEncoderParameters.from(jwsHeader, builder.build())).getTokenValue();
     }
 
     /**

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

@@ -24,6 +24,8 @@ import tech.jhipster.config.JHipsterConstants;
 import tech.jhipster.web.util.HeaderUtil;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 <%_ if (!databaseTypeNo && !databaseTypeCassandra) { _%>
 import org.springframework.dao.ConcurrencyFailureException;
@@ -111,6 +113,8 @@ _%>
     private static final String PATH_KEY = "path";
     private static final boolean CASUAL_CHAIN_ENABLED = false;
 
+    private static final Logger LOG = LoggerFactory.getLogger(ExceptionTranslator.class);
+
     @Value("${jhipster.clientApp.name}")
     private String applicationName;
 
@@ -124,6 +128,7 @@ _%>
     <%_ if (reactive) { _%>@Override<%_ } _%>
     public <%- returnType %> handleAnyException(Throwable ex, <%= requestClass %> request
     ) {
+        LOG.debug("Converting Exception to Problem Details:", ex);
         ProblemDetailWithCause pdCause = wrapAndCustomizeProblem(ex, request);
         return handleExceptionInternal((Exception) ex, pdCause, buildHeaders(ex), HttpStatusCode.valueOf(pdCause.getStatus()), request);
     }
@@ -149,9 +154,9 @@ _%>
 
     private ProblemDetailWithCause getProblemDetailWithCause(Throwable ex) {
 <%_ if (!skipUserManagement) { _%>
-        if(ex instanceof <%= packageName %>.service.UsernameAlreadyUsedException ) 
-            return (ProblemDetailWithCause) new LoginAlreadyUsedException().getBody();    
-        if(ex instanceof <%= packageName %>.service.EmailAlreadyUsedException ) 
+        if(ex instanceof <%= packageName %>.service.UsernameAlreadyUsedException )
+            return (ProblemDetailWithCause) new LoginAlreadyUsedException().getBody();
+        if(ex instanceof <%= packageName %>.service.EmailAlreadyUsedException )
             return (ProblemDetailWithCause) new EmailAlreadyUsedException().getBody();
         if(ex instanceof <%= packageName %>.service.InvalidPasswordException )
             return (ProblemDetailWithCause) new InvalidPasswordException().getBody();

package/dist/generators/spring-boot/templates/src/main/resources/config/application.yml.ejs

@@ -327,6 +327,7 @@ spring:
       hibernate.cache.hazelcast.instance_name: <%= baseName %>
       hibernate.cache.hazelcast.use_lite_member: true
     <%_ } else if (cacheProviderInfinispan) { _%>
+      hibernate.cache.region.factory_class: infinispan
       hibernate.cache.infinispan.statistics: false
       hibernate.cache.use_minimal_puts: true
       hibernate.cache.infinispan.entity.expiration.lifespan: 3600000
@@ -463,6 +464,8 @@ jhipster:
         - api://default
 <%_ } _%>
 
+# jhipster-needle-add-application-yaml-document
+---
 # ===================================================================
 # Application specific properties
 # Add your own application properties here, see the ApplicationProperties class

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

@@ -205,13 +205,13 @@ class UserServiceIT {
     private Long numberOfUsers;
 
     @BeforeEach
-    public void countUsers() {
+    void countUsers() {
         numberOfUsers = userRepository.count()<%- reactorBlock %>;
     }
 
 <%_ } _%>
     @BeforeEach
-    public void init() {
+    void init() {
 <%_ if (databaseTypeCouchbase) { _%>
         mockAuthentication();
 <%_ } _%>
@@ -255,7 +255,7 @@ class UserServiceIT {
     }
 
     @AfterEach
-    public void cleanupAndCheck() {
+    void cleanupAndCheck() {
 <%_ if (cacheProviderAny) { _%>
         cacheManager.getCacheNames().stream()
             .map(cacheName -> this.cacheManager.getCache(cacheName))

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

@@ -146,25 +146,25 @@ class PublicUserResourceIT {
     private Long numberOfUsers;
 
     @BeforeEach
-    public void countUsers() {
+    void countUsers() {
         numberOfUsers = userRepository.count()<%- reactorBlock %>;
     }
 
 <%_ } _%>
 <%_ if (reactive && authenticationUsesCsrf) { _%>
     @BeforeEach
-    public void setupCsrf() {
+    void setupCsrf() {
         webTestClient = webTestClient.mutateWith(csrf());
     }
 
 <%_ } _%>
     @BeforeEach
-    public void initTest() {
+    void initTest() {
         user = UserResourceIT.initTestUser();
     }
 
     @AfterEach
-    public void cleanupAndCheck() {
+    void cleanupAndCheck() {
 <%_ if (cacheProviderAny) { _%>
         cacheManager.getCacheNames().stream()
             .map(cacheName -> this.cacheManager.getCache(cacheName))

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

@@ -207,14 +207,14 @@ class UserResourceIT {
     private Long numberOfUsers;
 
     @BeforeEach
-    public void countUsers() {
+    void countUsers() {
         numberOfUsers = userRepository.count()<%- reactorBlock %>;
     }
 
 <%_ } _%>
 <%_ if (reactive && authenticationUsesCsrf) { _%>
     @BeforeEach
-    public void setupCsrf() {
+    void setupCsrf() {
         webTestClient = webTestClient.mutateWith(csrf());
     }
 
@@ -269,12 +269,12 @@ class UserResourceIT {
     }
 
     @BeforeEach
-    public void initTest() {
+    void initTest() {
         user = initTestUser();
     }
 
     @AfterEach
-    public void cleanupAndCheck() {
+    void cleanupAndCheck() {
 <%_ if (requiresDeleteAllUsers) { _%>
     <%_ if (databaseTypeSql && reactive) { _%>
         userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;

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

@@ -649,18 +649,18 @@ _%>
 <%_ } _%>
 <%_ if (reactive && authenticationUsesCsrf) { _%>
     @BeforeEach
-    public void setupCsrf() {
+    void setupCsrf() {
         webTestClient = webTestClient.mutateWith(csrf());
     }
 
 <%_ } _%>
     @BeforeEach
-    public void initTest() {
+    void initTest() {
         <%= persistInstance %> = createEntity(<% if (databaseTypeSql && anyRelationshipIsRequired) { %>em<% } %>);
     }
 
     @AfterEach
-    public void cleanup() {
+    void cleanup() {
         if (inserted<%= persistClass %> != null) {
             <%= entityInstance %>Repository.delete(inserted<%= persistClass %>)<%= reactorBlock %>;
 <%_ if (searchEngineElasticsearch) { _%>

package/dist/generators/spring-boot/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs

@@ -56,8 +56,6 @@ public class JHipsterBlockHoundIntegration implements BlockHoundIntegration {
         builder.allowBlockingCallsInside("com.scurrilous.circe.utils.NativeUtils", "loadLibraryFromJar");
 <%_ } _%>
         builder.allowBlockingCallsInside("org.springframework.web.reactive.result.method.InvocableHandlerMethod", "invoke");
-        builder.allowBlockingCallsInside("org.springdoc.core.service.OpenAPIService", "build");
-        builder.allowBlockingCallsInside("org.springdoc.core.service.AbstractRequestService", "build");
         // jhipster-needle-blockhound-integration - JHipster will add additional gradle plugins here
     }
 }

package/dist/generators/spring-boot/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs

@@ -61,7 +61,7 @@ class WebConfigurerTest {
     private JHipsterProperties props;
 
     @BeforeEach
-    public void setup() {
+    void setup() {
         servletContext = spy(new MockServletContext());
         doReturn(mock(FilterRegistration.Dynamic.class)).when(servletContext).addFilter(anyString(), any(Filter.class));
         doReturn(mock(ServletRegistration.Dynamic.class)).when(servletContext).addServlet(anyString(), any(Servlet.class));

package/dist/generators/spring-boot/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs

@@ -34,7 +34,7 @@ class SecurityMetersServiceTests {
     private SecurityMetersService securityMetersService;
 
     @BeforeEach
-    public void setup() {
+    void setup() {
         meterRegistry = new SimpleMeterRegistry();
 
         securityMetersService = new SecurityMetersService(meterRegistry);

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

@@ -142,14 +142,14 @@ class DomainUserDetailsServiceIT {
     }
 
     @BeforeEach
-    public void init() {
+    void init() {
         userRepository.save(getUserOne())<%- callBlock %>;
         userRepository.save(getUserTwo())<%- callBlock %>;
         userRepository.save(getUserThree())<%- callBlock %>;
     }
 
     @AfterEach
-    public void cleanup () {
+    void cleanup () {
         userService.deleteUser(USER_ONE_LOGIN)<%- callBlock %>;
         userService.deleteUser(USER_TWO_LOGIN)<%- callBlock %>;
         userService.deleteUser(USER_THREE_LOGIN)<%- callBlock %>;