generator-jhipster 7.9.0 → 7.9.3

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
@@ -229,7 +229,7 @@ spring:
 # keytool -genkey -alias <%= baseName.toLowerCase() %> -storetype PKCS12 -keyalg RSA -keysize 2048 -keystore keystore.p12 -validity 3650
 #
 # You can also use Let's Encrypt:
-# https://maximilian-boehm.com/hp2121/Create-a-Java-Keystore-JKS-from-Let-s-Encrypt-Certificates.htm
+# See details in topic "Create a Java Keystore (.JKS) from Let's Encrypt Certificates" on https://maximilian-boehm.com/en-gb/blog
 #
 # Then, modify the server.ssl properties so your "server" configuration looks like:
 #
@@ -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) %>");

package/generators/sql-constants.js

@@ -24,6 +24,9 @@ const databaseData = {
   [MSSQL]: {
     protocolSuffix: 'sqlserver://',
     port: ':1433;database=',
+    jdbc: {
+      extraOptions: ';encrypt=false',
+    },
     r2dbc: {
       protocolSuffix: 'mssql://',
       port: ':1433/',
@@ -66,14 +69,14 @@ const databaseData = {
   [H2_DISK]: {
     protocolSuffix: 'h2:file:',
     useDirectory: true,
-    extraOptions: ';DB_CLOSE_DELAY=-1',
+    extraOptions: ';DB_CLOSE_DELAY=-1;MODE=LEGACY',
     r2dbc: {
       protocolSuffix: 'h2:file://',
     },
   },
   [H2_MEMORY]: {
     protocolSuffix: 'h2:mem:',
-    extraOptions: ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE',
+    extraOptions: ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=LEGACY',
     r2dbc: {
       protocolSuffix: 'h2:mem:///',
     },

package/generators/utils.js

@@ -32,6 +32,8 @@ const FileUtils = require('../jdl/utils/file-utils');
 const LANGUAGES_MAIN_SRC_DIR = `${__dirname}/languages/templates/${constants.CLIENT_MAIN_SRC_DIR}`;
 
 module.exports = {
+  detectCrLf,
+  normalizeLineEndings,
   rewrite,
   rewriteFile,
   replaceContent,
@@ -131,11 +133,49 @@ function escapeRegExp(str) {
  * @param {string} str string
  * @returns {string} string where CRLF is replaced with LF in Windows
  */
-function normalizeLineEndings(str) {
+function normalizeWindowsLineEndings(str) {
   const isWin32 = os.platform() === 'win32';
   return isWin32 ? str.replace(/\r\n/g, '\n') : str;
 }
 
+/**
+ * Replace line endings with the specified one.
+ *
+ * @param {string} str
+ * @param {string} lineEnding
+ * @returns {string} normalized line ending string
+ */
+function normalizeLineEndings(str, lineEnding) {
+  return str.replace(/\r\n|\r|\n/g, lineEnding);
+}
+
+/**
+ * Detect the file first line endings
+ *
+ * @param {string} filePath
+ * @returns {boolean|undefined} true in case of crlf, false in case of lf, undefined for a single line file
+ */
+function detectCrLf(filePath) {
+  return new Promise((resolve, reject) => {
+    let isCrlf;
+    const rs = fs.createReadStream(filePath, { encoding: 'utf8' });
+    rs.on('data', function (chunk) {
+      const n = chunk.indexOf('\n');
+      const r = chunk.indexOf('\r');
+      if (n !== -1 || r !== -1) {
+        isCrlf = n === -1 || (r !== -1 && r < n);
+        rs.close();
+      }
+    })
+      .on('close', function () {
+        resolve(isCrlf);
+      })
+      .on('error', function (err) {
+        reject(err);
+      });
+  });
+}
+
 /**
  * Change spaces sequences and '>' to allow any number of spaces or new line prefix
  *
@@ -167,7 +207,7 @@ function rewrite(args) {
       re = escapeRegExp(re);
     }
   } else {
-    re = args.splicable.map(line => `\\s*${escapeRegExp(normalizeLineEndings(line))}`).join('\n');
+    re = args.splicable.map(line => `\\s*${escapeRegExp(normalizeWindowsLineEndings(line))}`).join('\n');
   }
   if (!re.test) {
     if (args.prettierAware) {
@@ -176,7 +216,7 @@ function rewrite(args) {
     re = new RegExp(re);
   }
 
-  if (re.test(normalizeLineEndings(args.haystack))) {
+  if (re.test(normalizeWindowsLineEndings(args.haystack))) {
     return args.haystack;
   }
 

package/generators/workspaces/index.js

@@ -238,7 +238,8 @@ module.exports = class extends BaseBlueprintGenerator {
   _getOtherScripts() {
     if (this.dockerCompose) {
       return {
-        'ci:e2e:prepare': 'docker-compose -f docker-compose/docker-compose.yml up -d',
+        'docker-compose': 'docker-compose -f docker-compose/docker-compose.yml up -d',
+        'ci:e2e:prepare': 'npm run docker-compose',
         'ci:e2e:teardown': 'docker-compose -f docker-compose/docker-compose.yml down -v',
       };
     }

package/jdl/exporters/jdl-exporter.js

@@ -27,10 +27,15 @@ module.exports = {
  * Writes down the given JDL to a file.
  * @param jdl the JDL to write.
  * @param path the path where the file will be written.
+ * @returns {string} file contents
  */
 function exportToJDL(jdl, path = 'app.jdl') {
   if (!jdl) {
     throw new Error('A JDLObject has to be passed to be exported.');
   }
-  fs.writeFileSync(path, jdl.toString());
+  const fileContents = jdl.toString();
+  if (path) {
+    fs.writeFileSync(path, fileContents);
+  }
+  return fileContents;
 }

package/jdl/jhipster/application-options.js

@@ -45,7 +45,7 @@ const cacheTypes = require('./cache-types');
 const NO_CACHE_PROVIDER = cacheTypes.NO;
 
 const { PROTRACTOR, CYPRESS, CUCUMBER, GATLING } = require('./test-framework-types');
-const { ANGULAR_X, ANGULAR, REACT, VUE, SVELTE } = require('./client-framework-types');
+const { ANGULAR_X, ANGULAR, REACT, VUE, SVELTE, NO } = require('./client-framework-types');
 const { ELASTICSEARCH } = require('./search-engine-types');
 const searchEngines = require('./search-engine-types');
 
@@ -161,6 +161,7 @@ const optionValues = {
     [REACT]: REACT,
     [VUE]: VUE,
     [SVELTE]: SVELTE,
+    [NO]: NO,
   },
   [optionNames.CLIENT_PACKAGE_MANAGER]: {
     npm: 'npm',

package/jdl/jhipster/binary-options.js

@@ -27,7 +27,7 @@ const NO_SERVICE = ServiceTypes.NO;
 const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
 const NO_PAGINATION = PaginationTypes.NO;
 
-const { ELASTICSEARCH, COUCHBASE } = SearchTypes;
+const { ELASTICSEARCH, COUCHBASE, NO: NO_SEARCH } = SearchTypes;
 
 const Options = {
   DTO: 'dto',
@@ -49,7 +49,7 @@ const Values = {
     'INFINITE-SCROLL': INFINITE_SCROLL,
     NO: NO_PAGINATION,
   },
-  [Options.SEARCH]: { ELASTICSEARCH, COUCHBASE },
+  [Options.SEARCH]: { ELASTICSEARCH, COUCHBASE, NO: NO_SEARCH },
 };
 
 const DefaultValues = {

package/jdl/jhipster/default-application-options.js

@@ -35,7 +35,7 @@ const serviceDiscoveryTypes = require('./service-discovery-types');
 
 const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
 
-const { ANGULAR, ANGULAR_X } = require('./client-framework-types');
+const { ANGULAR, ANGULAR_X, NO: NO_CLIENT_FRAMEWORK } = require('./client-framework-types');
 
 const { MAVEN } = require('./build-tool-types');
 
@@ -118,7 +118,9 @@ function getConfigForMonolithApplication(customOptions = {}) {
   if (options[AUTHENTICATION_TYPE] === OAUTH2) {
     options[SKIP_USER_MANAGEMENT] = true;
   }
-
+  if (options[SKIP_CLIENT]) {
+    options[CLIENT_FRAMEWORK] = NO_CLIENT_FRAMEWORK;
+  }
   return {
     ...options,
     [APPLICATION_TYPE]: MONOLITH,
@@ -169,12 +171,11 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
     [SKIP_USER_MANAGEMENT]: true,
     ...customOptions,
   };
-  let skipClient = options[SKIP_CLIENT];
-  if (skipClient === undefined) {
-    skipClient = options[CLIENT_FRAMEWORK] === undefined;
+  if (options[SKIP_CLIENT] === undefined) {
+    options[SKIP_CLIENT] = options[CLIENT_FRAMEWORK] === undefined || options[CLIENT_FRAMEWORK] === NO_CLIENT_FRAMEWORK;
   }
-  if (skipClient) {
-    delete options[CLIENT_FRAMEWORK];
+  if (options[SKIP_CLIENT]) {
+    options[CLIENT_FRAMEWORK] = NO_CLIENT_FRAMEWORK;
     delete options[SKIP_SERVER];
   }
   delete options[CLIENT_THEME];
@@ -192,7 +193,6 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
   return {
     ...options,
     [APPLICATION_TYPE]: MICROSERVICE,
-    [SKIP_CLIENT]: skipClient,
   };
 }
 
@@ -227,6 +227,9 @@ function getDefaultConfigForNewApplication(customOptions = {}) {
   if (!options[PACKAGE_FOLDER] && options[PACKAGE_NAME]) {
     options[PACKAGE_FOLDER] = options[PACKAGE_NAME].replace(/\./g, '/');
   }
+  if (options[SKIP_CLIENT]) {
+    options[CLIENT_FRAMEWORK] = NO_CLIENT_FRAMEWORK;
+  }
   if (options[CLIENT_FRAMEWORK] === ANGULAR) {
     options[CLIENT_FRAMEWORK] = ANGULAR_X;
   }

package/jdl/jhipster/entity-options.js

@@ -36,6 +36,7 @@ const PaginationTypes = {
 const SearchTypes = {
   ELASTICSEARCH: 'elasticsearch',
   COUCHBASE: 'couchbase',
+  NO: 'no',
 };
 
 const FilteringTypes = {

package/jdl/jhipster/search-engine-types.js

@@ -20,6 +20,7 @@
 const Types = {
   ELASTICSEARCH: 'elasticsearch',
   COUCHBASE: 'couchbase',
+  NO: 'no',
   FALSE: false,
 };