generator-jhipster 7.9.2 → 7.9.3

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs

@@ -134,6 +134,10 @@ import reactor.core.publisher.Mono;
   <%_ if (!applicationTypeMicroservice) { _%>
 import org.springframework.web.reactive.function.client.WebClient;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Map;
   <%_ } _%>
@@ -141,7 +145,6 @@ import java.util.Map;
 import java.util.HashSet;
 import java.util.Set;
   <%_ if (!applicationTypeMicroservice) { _%>
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
   <%_ } _%>
 <%_ } _%>
@@ -170,8 +173,13 @@ public class SecurityConfiguration {
 
     private final ReactiveClientRegistrationRepository clientRegistrationRepository;
 
-    // todo: optimize for scale https://github.com/jhipster/generator-jhipster/issues/18868
-    private final Map<String, Mono<Jwt>> users = new ConcurrentHashMap<>();
+    // See https://github.com/jhipster/generator-jhipster/issues/18868
+    // We don't use a distributed cache or the user selected cache implementation here on purpose
+    private final Cache<String, Mono<Jwt>> users = Caffeine.newBuilder()
+        .maximumSize(10_000)
+        .expireAfterWrite(Duration.ofHours(1))
+        .recordStats()
+        .build();
 
   <%_ } _%>
 <%_ } _%>
@@ -268,7 +276,7 @@ public class SecurityConfiguration {
 <%_ } _%>
         .and()
             .headers()
-            .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
+                .contentSecurityPolicy(jHipsterProperties.getSecurity().getContentSecurityPolicy())
             .and()
                 .referrerPolicy(ReferrerPolicyServerHttpHeadersWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
             .and()
@@ -425,7 +433,7 @@ public class SecurityConfiguration {
                     return Mono.just(jwt);
                 }
                 // Retrieve user info from OAuth provider if not already loaded
-                return users.computeIfAbsent(jwt.getSubject(), s -> {
+                return users.get(jwt.getSubject(), s -> {
                     WebClient webClient = WebClient.create();
 
                     return webClient

package/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs

@@ -21,7 +21,7 @@ package <%= packageName %>.domain;
 <%_ if (databaseTypeCouchbase) { _%>
 import org.springframework.data.couchbase.core.mapping.Field;
 <%_ } _%>
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 <%_ if (!reactive) { _%>
 import org.springframework.data.annotation.CreatedBy;
 <%_ } _%>
@@ -58,10 +58,13 @@ import javax.persistence.MappedSuperclass;
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 <%_ } _%>
-public abstract class AbstractAuditingEntity implements Serializable {
+@JsonIgnoreProperties(value = { "createdBy", "createdDate", "lastModifiedBy", "lastModifiedDate" }, allowGetters = true)
+public abstract class AbstractAuditingEntity<T> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public abstract T getId();
+
 <%_ if (!reactive) { _%>
     @CreatedBy
 <%_ } _%>
@@ -77,7 +80,6 @@ public abstract class AbstractAuditingEntity implements Serializable {
 <%_ if (databaseTypeNeo4j) { _%>
     @Property("created_by")
 <%_ } _%>
-    @JsonIgnore
     private String createdBy;
 
     @CreatedDate
@@ -93,7 +95,6 @@ public abstract class AbstractAuditingEntity implements Serializable {
 <%_ if (databaseTypeNeo4j) { _%>
     @Property("created_date")
 <%_ } _%>
-    @JsonIgnore
     private Instant createdDate = Instant.now();
 
 <%_ if (!reactive) { _%>
@@ -111,7 +112,6 @@ public abstract class AbstractAuditingEntity implements Serializable {
 <%_ if (databaseTypeNeo4j) { _%>
     @Property("last_modified_by")
 <%_ } _%>
-    @JsonIgnore
     private String lastModifiedBy;
 
     @LastModifiedDate
@@ -127,7 +127,6 @@ public abstract class AbstractAuditingEntity implements Serializable {
 <%_ if (databaseTypeNeo4j) { _%>
     @Property("last_modified_date")
 <%_ } _%>
-    @JsonIgnore
     private Instant lastModifiedDate = Instant.now();
 
     public String getCreatedBy() {

package/generators/server/templates/src/main/java/package/domain/User.java.ejs

@@ -131,7 +131,7 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
 <%_ if (searchEngineElasticsearch) { _%>
 @org.springframework.data.elasticsearch.annotations.Document(indexName = "user")
 <%_ } _%>
-public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %> extends AbstractAuditingEntity<% } %> implements Serializable {
+public class <%= asEntity('User') %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %> extends AbstractAuditingEntity<<%= user.primaryKey.type %>><% } %> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs

@@ -315,7 +315,7 @@ public interface UserRepository extends R2dbcRepository<<%= asEntity('User') %>,
     Mono<Void> deleteAllUserAuthorities();
 
     @Query("DELETE FROM <%= jhiTablePrefix %>_user_authority WHERE user_id = :userId")
-    Mono<Void> deleteUserAuthorities(Long userId);
+    Mono<Void> deleteUserAuthorities(<%= user.primaryKey.type %> userId);
 
 }
 

package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs

@@ -20,6 +20,8 @@ package <%= packageName %>.security.oauth2;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import <%= packageName %>.security.SecurityUtils;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.http.HttpEntity;
@@ -35,11 +37,11 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -55,8 +57,13 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
 
     private final ClientRegistration registration;
 
-    // todo: optimize for scale https://github.com/jhipster/generator-jhipster/issues/18868
-    private final Map<String, ObjectNode> users = new ConcurrentHashMap<>();
+    // See https://github.com/jhipster/generator-jhipster/issues/18868
+    // We don't use a distributed cache or the user selected cache implementation here on purpose
+    private final Cache<String, ObjectNode> users = Caffeine.newBuilder()
+        .maximumSize(10_000)
+        .expireAfterWrite(Duration.ofHours(1))
+        .recordStats()
+        .build();
 
     public CustomClaimConverter(ClientRegistration registration, RestTemplate restTemplate) {
         this.registration = registration;
@@ -64,11 +71,11 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
     }
 
     public Map<String, Object> convert(Map<String, Object> claims) {
+        Map<String, Object> convertedClaims = this.delegate.convert(claims);
         // Only look up user information if identity claims are missing
         if (claims.containsKey("given_name") && claims.containsKey("family_name")) {
-            return claims;
+            return convertedClaims;
         }
-        Map<String, Object> convertedClaims = this.delegate.convert(claims);
         RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
         if (attributes instanceof ServletRequestAttributes) {
             // Retrieve and set the token
@@ -77,7 +84,7 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
             headers.set("Authorization", buildBearer(token));
 
             // Retrieve user info from OAuth provider if not already loaded
-            ObjectNode user = users.computeIfAbsent(claims.get("sub").toString(), s -> {
+            ObjectNode user = users.get(claims.get("sub").toString(), s -> {
                 ResponseEntity<ObjectNode> userInfo = restTemplate.exchange(registration.getProviderDetails().getUserInfoEndpoint().getUri(), HttpMethod.GET, new HttpEntity<String>(headers), ObjectNode.class);
                 return userInfo.getBody();
             });

package/generators/server/templates/src/main/java/package/service/dto/AdminUserDTO.java.ejs

@@ -25,6 +25,7 @@ import <%= packageName %>.domain.Authority;<% } %>
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 <%_ } _%>
 
+import java.io.Serializable;
 import javax.validation.constraints.*;
 <%_ if (databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase || databaseTypeSql) { _%>
 import java.time.Instant;
@@ -40,7 +41,8 @@ import java.util.stream.Collectors;
 /**
  * A DTO representing a user, with his authorities.
  */
-public class <%= asDto('AdminUser') %> {
+public class <%= asDto('AdminUser') %> implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private <%= user.primaryKey.type %> id;
 

package/generators/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.ejs

@@ -18,10 +18,14 @@
 -%>
 package <%= packageName %>.service.dto;
 
+import java.io.Serializable;
+
 /**
  * A DTO representing a password change required data - current and new password.
  */
-public class PasswordChangeDTO {
+public class PasswordChangeDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private String currentPassword;
     private String newPassword;
 

package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs

@@ -22,6 +22,7 @@ package <%= packageName %>.service.dto;
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 <%_ } _%>
 
+import java.io.Serializable;
 <%_ if (user.primaryKey.hasUUID) { _%>
 import java.util.UUID;
 <%_ } _%>
@@ -29,7 +30,8 @@ import java.util.UUID;
 /**
  * A DTO representing a user, with only the public attributes.
  */
-public class <%= asDto('User') %> {
+public class <%= asDto('User') %> implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private <%= user.primaryKey.type %> id;
 

package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs

@@ -19,25 +19,17 @@
 package <%= packageName %>.web.rest;
 
 import <%= packageName %>.config.Constants;
-<%_ if (!authenticationTypeOauth2) { _%>
 import <%= packageName %>.domain.<%= asEntity('User') %>;
-<%_ } _%>
-<%_ if (!authenticationTypeOauth2) { _%>
 import <%= packageName %>.repository.UserRepository;
-<%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
-<%_ if (!authenticationTypeOauth2) { _%>
 import <%= packageName %>.service.MailService;
 import org.springframework.data.domain.Sort;
 import java.util.Collections;
-<%_ } _%>
 import <%= packageName %>.service.UserService;
 import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
-<%_ if (!authenticationTypeOauth2) { _%>
 import <%= packageName %>.web.rest.errors.BadRequestAlertException;
 import <%= packageName %>.web.rest.errors.EmailAlreadyUsedException;
 import <%= packageName %>.web.rest.errors.LoginAlreadyUsedException;
-<%_ } _%>
 
 import tech.jhipster.web.util.HeaderUtil;
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
@@ -78,18 +70,15 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 <%_ } _%>
 
 import javax.validation.constraints.Pattern;
-<%_ if (!authenticationTypeOauth2) { _%>
 import javax.validation.Valid;
 import java.net.URI;
 import java.net.URISyntaxException;
-<%_ } _%>
-<%_ if (!reactive) { _%>
-import java.util.*;
-<%_ } _%>
 <%_ if (reactive) { _%>
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
+<%_ } else { _%>
+import java.util.*;
 <%_ } _%>
 <%_ if (searchEngineElasticsearch && !reactive) { _%>
 import java.util.stream.Collectors;
@@ -101,7 +90,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 /**
  * REST controller for managing users.
  * <p>
- * This class accesses the {@link <% if (!(!authenticationTypeOauth2 || searchEngineElasticsearch)) { %><%= packageName %>.domain.<% } %><%= asEntity('User') %>} entity, and needs to fetch its collection of authorities.
+ * This class accesses the {@link <%= packageName %>.domain.<%= user.persistClass %>} entity, and needs to fetch its collection of authorities.
  * <p>
  * For a normal use-case, it would be better to have an eager relationship between User and Authority,
  * and send everything to the client side: there would be no View Model and DTO, a lot less code, and an outer-join
@@ -125,10 +114,8 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 @RestController
 @RequestMapping("/api/admin")
 public class UserResource {
-<%_ if (!authenticationTypeOauth2) { _%>
     private static final List<String> ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(Arrays.asList(
     "id", "login", "firstName", "lastName", "email", "activated", "langKey", "createdBy", "createdDate", "lastModifiedBy", "lastModifiedDate"));
-<%_ } _%>
 
     private final Logger log = LoggerFactory.getLogger(UserResource.class);
 
@@ -136,22 +123,17 @@ public class UserResource {
     private String applicationName;
 
     private final UserService userService;
-<%_ if (!authenticationTypeOauth2) { _%>
 
     private final UserRepository userRepository;
 
     private final MailService mailService;
-<%_ } _%>
 
-    public UserResource(UserService userService<% if (!authenticationTypeOauth2) { %>, UserRepository userRepository, MailService mailService<% } %>) {
+    public UserResource(UserService userService, UserRepository userRepository, MailService mailService) {
         this.userService = userService;
-<%_ if (!authenticationTypeOauth2) { _%>
         this.userRepository = userRepository;
         this.mailService = mailService;
-<%_ } _%>
     }
 
-<%_ if (!authenticationTypeOauth2) { _%>
     /**
      * {@code POST  /admin/users}  : Creates a new user.
      * <p>
@@ -161,9 +143,9 @@ public class UserResource {
      *
      * @param userDTO the user to create.
      * @return the {@link ResponseEntity} with status {@code 201 (Created)} and with body the new user, or with status {@code 400 (Bad Request)} if the login or email is already in use.
-  <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
      * @throws URISyntaxException if the Location URI syntax is incorrect.
-  <%_ } _%>
+<%_ } _%>
      * @throws BadRequestAlertException {@code 400 (Bad Request)} if the login or email is already in use.
      */
     @PostMapping("/users")
@@ -174,7 +156,7 @@ public class UserResource {
         if (userDTO.getId() != null) {
             throw new BadRequestAlertException("A new user cannot already have an ID", "userManagement", "idexists");
             // Lowercase the user login before comparing with database
-  <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
         }
         return userRepository.findOneByLogin(userDTO.getLogin().toLowerCase())
             .hasElement()
@@ -201,7 +183,7 @@ public class UserResource {
                     throw new RuntimeException(e);
                 }
             });
-  <%_ } else { _%>
+<%_ } else { _%>
         } else if (userRepository.findOneByLogin(userDTO.getLogin().toLowerCase()).isPresent()) {
             throw new LoginAlreadyUsedException();
         } else if (userRepository.findOneByEmailIgnoreCase(userDTO.getEmail()).isPresent()) {
@@ -213,7 +195,7 @@ public class UserResource {
                 .headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %> "userManagement.created"<% } else { %> "A user is created with identifier " + newUser.getLogin()<% } %>, newUser.getLogin()))
                 .body(newUser);
         }
-  <%_ } _%>
+<%_ } _%>
     }
 
     /**
@@ -226,7 +208,7 @@ public class UserResource {
      */
     @PutMapping("/users")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
-  <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
     public Mono<ResponseEntity<<%= asDto('AdminUser') %>>> updateUser(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
         log.debug("REST request to update User : {}", userDTO);
         return userRepository.findOneByEmailIgnoreCase(userDTO.getEmail())
@@ -251,7 +233,7 @@ public class UserResource {
                 .headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %>"userManagement.updated"<% } else { %>"A user is updated with identifier " + userDTO.getLogin()<% } %>, userDTO.getLogin()))
                 .body(user)
             );
-  <%_ } else { _%>
+<%_ } else { _%>
     public ResponseEntity<<%= asDto('AdminUser') %>> updateUser(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
         log.debug("REST request to update User : {}", userDTO);
         Optional<<%= asEntity('User') %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
@@ -266,10 +248,9 @@ public class UserResource {
 
         return ResponseUtil.wrapOrNotFound(updatedUser,
             HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %>"userManagement.updated"<% } else { %>"A user is updated with identifier " + userDTO.getLogin()<% } %>, userDTO.getLogin()));
-  <%_ } _%>
+<%_ } _%>
     }
 
-<%_ } _%>
     /**
      * {@code GET /admin/users} : get all users with all the details - calling this are only allowed for the administrators.
      *<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %>
@@ -285,11 +266,9 @@ public class UserResource {
   <%_ if (reactive) { _%>
     public Mono<ResponseEntity<Flux<<%= asDto('AdminUser') %>>>> getAllUsers(@org.springdoc.api.annotations.ParameterObject ServerHttpRequest request, @org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all User for an admin");
-    <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
             return Mono.just(ResponseEntity.badRequest().build());
         }
-    <%_ } _%>
 
         return userService.countManagedUsers()
             .map(total -> new PageImpl<>(new ArrayList<>(), pageable, total))
@@ -298,11 +277,9 @@ public class UserResource {
   <%_ } else { _%>
     public ResponseEntity<List<<%= asDto('AdminUser') %>>> getAllUsers(@org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all User for an admin");
-    <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
             return ResponseEntity.badRequest().build();
         }
-    <%_ } _%>
 
         final Page<<%= asDto('AdminUser') %>> page = userService.getAllManagedUsers(pageable);
         HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
@@ -310,11 +287,9 @@ public class UserResource {
   <%_ } _%>
     }
 
-  <%_ if (!authenticationTypeOauth2) { _%>
     private boolean onlyContainsAllowedProperties(Pageable pageable) {
         return pageable.getSort().stream().map(Sort.Order::getProperty).allMatch(ALLOWED_ORDERED_PROPERTIES::contains);
     }
-  <%_ } _%>
 
 <%_ } else { /* Cassandra */ _%>
     public <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= asDto('AdminUser') %>> getAllUsers() {
@@ -346,7 +321,6 @@ public class UserResource {
                 .map(<%= asDto('AdminUser') %>::new));
 <%_ } _%>
     }
-<%_ if (!authenticationTypeOauth2) { _%>
 
     /**
      * {@code DELETE /admin/users/:login} : delete the "login" User.
@@ -356,17 +330,16 @@ public class UserResource {
      */
     @DeleteMapping("/users/{login}")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
-  <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
     public Mono<ResponseEntity<Void>> deleteUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to delete User: {}", login);
         return userService.deleteUser(login)
         .then(Mono.just(ResponseEntity.noContent().headers(HeaderUtil.createAlert( applicationName, <% if (enableTranslation) { %> "userManagement.deleted"<% } else { %> "A user is deleted with identifier " + login<% } %>, login)).build()));
-  <%_ } else { _%>
+<%_ } else { _%>
     public ResponseEntity<Void> deleteUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to delete User: {}", login);
         userService.deleteUser(login);
         return ResponseEntity.noContent().headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %> "userManagement.deleted"<% } else { %> "A user is deleted with identifier " + login<% } %>, login)).build();
-  <%_ } _%>
-    }
 <%_ } _%>
+    }
 }

package/generators/server/templates/src/main/java/package/web/rest/errors/BadRequestAlertException.java.ejs

@@ -25,6 +25,7 @@ import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 
+@SuppressWarnings("java:S110") // Inheritance tree of classes should not be too deep
 public class BadRequestAlertException extends AbstractThrowableProblem {
 
     private static final long serialVersionUID = 1L;

package/generators/server/templates/src/main/java/package/web/rest/errors/EmailAlreadyUsedException.java.ejs

@@ -18,6 +18,7 @@
 -%>
 package <%= packageName %>.web.rest.errors;
 
+@SuppressWarnings("java:S110") // Inheritance tree of classes should not be too deep
 public class EmailAlreadyUsedException extends BadRequestAlertException {
 
     private static final long serialVersionUID = 1L;

package/generators/server/templates/src/main/java/package/web/rest/errors/InvalidPasswordException.java.ejs

@@ -21,6 +21,7 @@ package <%= packageName %>.web.rest.errors;
 import org.zalando.problem.AbstractThrowableProblem;
 import org.zalando.problem.Status;
 
+@SuppressWarnings("java:S110") // Inheritance tree of classes should not be too deep
 public class InvalidPasswordException extends AbstractThrowableProblem {
 
     private static final long serialVersionUID = 1L;

package/generators/server/templates/src/main/java/package/web/rest/errors/LoginAlreadyUsedException.java.ejs

@@ -18,6 +18,7 @@
 -%>
 package <%= packageName %>.web.rest.errors;
 
+@SuppressWarnings("java:S110") // Inheritance tree of classes should not be too deep
 public class LoginAlreadyUsedException extends BadRequestAlertException {
 
     private static final long serialVersionUID = 1L;

package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs

@@ -251,7 +251,7 @@ spring:
 <%_ } _%>
   thymeleaf:
     cache: false
-<%_ if (serviceDiscoveryType || applicationTypeGateway || applicationTypeMicroservice) { _%>
+<%_ if (serviceDiscoveryAny || applicationTypeGateway || applicationTypeMicroservice) { _%>
   sleuth:
     # https://github.com/spring-projects/spring-framework/issues/27844#issuescomment-1002866885
     # https://github.com/spring-cloud/spring-cloud-sleuth/issues/2094

package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs

@@ -207,7 +207,7 @@ spring:
 <%_ } _%>
   thymeleaf:
     cache: true
-<%_ if (serviceDiscoveryType || applicationTypeGateway || applicationTypeMicroservice) { _%>
+<%_ if (serviceDiscoveryAny || applicationTypeGateway || applicationTypeMicroservice) { _%>
   sleuth:
     # https://github.com/spring-projects/spring-framework/issues/27844#issuescomment-1002866885
     # https://github.com/spring-cloud/spring-cloud-sleuth/issues/2094
@@ -258,7 +258,7 @@ server:
 # ===================================================================
 
 jhipster:
-<%_ if (applicationTypeGateway && cacheProviderHazelcast && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && cacheProviderHazelcast && serviceDiscoveryAny) { _%>
   gateway:
     rate-limiting:
       enabled: false

package/generators/server/templates/src/main/resources/config/application.yml.ejs

@@ -368,10 +368,12 @@ jhipster:
     license: unlicensed
     license-url:
   security:
-<%_ if (clientTheme !== 'none') { _%>
+<%_ if(!skipClient) { _%>
+    <%_ if (clientTheme !== 'none') { _%>
     content-security-policy: "default-src 'self'; frame-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://storage.googleapis.com; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; img-src 'self' data:; font-src 'self' https://fonts.gstatic.com data:"
-<%_ } else { _%>
+    <%_ } else { _%>
     content-security-policy: "default-src 'self'; frame-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://storage.googleapis.com; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"
+    <%_ } _%>
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
     oauth2:

package/generators/server/templates/src/main/resources/config/liquibase/master.xml.ejs

@@ -12,17 +12,12 @@
     <property name="uuidType" value="uuid" dbms="h2"/>
   <%_ } _%>
     <property name="datetimeType" value="datetime" dbms="h2"/>
-  <%_ if (reactive) { _%>
-    <property name="clobType" value="varchar(1000000)" dbms="h2"/>
-    <property name="blobType" value="varchar(1000000)" dbms="h2"/>
-  <%_ } else { _%>
-    <%_ if (prodDatabaseTypePostgres) { _%>
+  <%_ if (prodDatabaseTypePostgres) { _%>
     <property name="clobType" value="longvarchar" dbms="h2"/>
-    <%_ } else { _%>
+  <%_ } else { _%>
     <property name="clobType" value="clob" dbms="h2"/>
-    <%_ } _%>
-    <property name="blobType" value="blob" dbms="h2"/>
   <%_ } _%>
+    <property name="blobType" value="blob" dbms="h2"/>
 <%_ } _%>
 <%_ if (devDatabaseTypeMysql || prodDatabaseTypeMysql) { _%>
     <property name="now" value="now()" dbms="mysql"/>

package/generators/server/templates/src/main/resources/logback-spring.xml.ejs

@@ -20,6 +20,11 @@
 <!DOCTYPE configuration>
 
 <configuration scan="true">
+    <!-- Patterns based on https://github.com/spring-projects/spring-boot/blob/v2.7.2/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml -->
+    <conversionRule conversionWord="crlf" converterClass="<%= packageName %>.config.CRLFLogConverter" />
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %crlf(%m){red} %n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %crlf(%m) %n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
 
 <!-- The FILE and ASYNC appenders are here as examples for a production configuration -->

package/generators/server/templates/src/test/java/package/config/{ElasticsearchReactiveTestConfiguration.java.ejs → ElasticsearchTestConfiguration.java.ejs}

@@ -22,13 +22,13 @@ import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.<%= reactive ? 'ReactiveElasticsearchTemplate' : 'ElasticsearchRestTemplate' %>;
 import org.springframework.data.elasticsearch.core.RefreshPolicy;
 
 @Configuration
-public class ElasticsearchReactiveTestConfiguration {
+public class ElasticsearchTestConfiguration {
     @Autowired
-    ReactiveElasticsearchTemplate template;
+    <%= reactive ? 'ReactiveElasticsearchTemplate' : 'ElasticsearchRestTemplate' %> template;
 
     @PostConstruct
     public void configureTemplate() {

package/generators/server/templates/src/test/java/package/config/ElasticsearchTestContainer.java.ejs

@@ -53,6 +53,7 @@ public class ElasticsearchTestContainer implements InitializingBean, DisposableB
                     .withStartupTimeout(Duration.of(CONTAINER_STARTUP_TIMEOUT_MINUTES, ChronoUnit.MINUTES))
                     .withSharedMemorySize(256000000L)
                     .withEnv("ES_JAVA_OPTS", "-Xms256m -Xmx256m")
+                    .withEnv("xpack.security.enabled", "false")
                     .withLogConsumer(new Slf4jLogConsumer(log))
                     .withReuse(true);
         }

package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs

@@ -39,6 +39,9 @@ public class JHipsterBlockHoundIntegration implements BlockHoundIntegration {
         builder.allowBlockingCallsInside("org.mariadb.r2dbc.message.client.HandshakeResponse", "writeConnectAttributes");
         builder.allowBlockingCallsInside("org.mariadb.r2dbc.client.MariadbPacketDecoder", "decode");
 <%_} _%>
+<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
+        builder.allowBlockingCallsInside("io.r2dbc.mssql.client.ssl.TdsSslHandler", "createSslHandler");
+<%_} _%>
 <%_ if (searchEngineElasticsearch) { _%>
         builder.allowBlockingCallsInside("org.elasticsearch.client.indices.CreateIndexRequest", "settings");
 <%_} _%>

package/generators/server/templates/src/test/java/package/config/TestContainersSpringContextCustomizerFactory.java.ejs

@@ -145,7 +145,7 @@ public class TestContainersSpringContextCustomizerFactory implements ContextCust
                         }
                     }
     <%_ if (reactive) { _%>
-                    testValues = testValues.and("spring.r2dbc.url=" + devTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (devDatabaseTypeMysql) { %>.replace("mysql", "mariadb")<% } %> + "<%- getDBCExtraOption(devDatabaseType) %>");
+                    testValues = testValues.and("spring.r2dbc.url=" + devTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (devDatabaseTypeMysql) { %>.replace("mysql", "mariadb")<% } else if (devDatabaseTypeMssql) { %>.replace(";encrypt=false", "")<% } %> + "<%- getDBCExtraOption(devDatabaseType) %>");
                     testValues = testValues.and("spring.r2dbc.username=" + devTestContainer.getTestContainer().getUsername());
                     testValues = testValues.and("spring.r2dbc.password=" + devTestContainer.getTestContainer().getPassword());
                     testValues = testValues.and("spring.liquibase.url=" + devTestContainer.getTestContainer().getJdbcUrl() + "<%- getDBCExtraOption(devDatabaseType) %>" );
@@ -169,7 +169,7 @@ public class TestContainersSpringContextCustomizerFactory implements ContextCust
                         }
                     }
     <%_ if (reactive) { _%>
-                    testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMysql) { %>.replace("mysql", "mariadb")<% } %> + "<%- getDBCExtraOption(prodDatabaseType) %>");
+                    testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMysql) { %>.replace("mysql", "mariadb")<% } else if (prodDatabaseTypeMssql) { %>.replace(";encrypt=false", "")<% } %> + "<%- getDBCExtraOption(prodDatabaseType) %>");
                     testValues = testValues.and("spring.r2dbc.username=" + prodTestContainer.getTestContainer().getUsername());
                     testValues = testValues.and("spring.r2dbc.password=" + prodTestContainer.getTestContainer().getPassword());
                     testValues = testValues.and("spring.liquibase.url=" + prodTestContainer.getTestContainer().getJdbcUrl()  + "<%- getDBCExtraOption(prodDatabaseType) %>");