generator-jhipster 7.7.0 → 7.9.0

package/generators/server/templates/settings.gradle.ejs

@@ -18,12 +18,14 @@
 -%>
 
 pluginManagement {
-<%_ if (!SPRING_BOOT_VERSION.endsWith('RELEASE')) { _%>
     repositories {
+<%_ if (!SPRING_BOOT_VERSION.endsWith('RELEASE')) { _%>
+        mavenCentral()
         maven { url 'https://repo.spring.io/milestone' }
         gradlePluginPortal()
-    }
 <%_ } _%>
+        //jhipster-needle-gradle-plugin-management-repositories - JHipster will add additional entries here
+    }
     plugins {
         id 'org.springframework.boot' version "${springBootVersion}"
         id 'com.google.cloud.tools.jib' version "${jibPluginVersion}"
@@ -34,7 +36,7 @@ pluginManagement {
 <%_ if (!skipClient) { _%>
         id 'com.github.node-gradle.node' version "${gradleNodePluginVersion}"
 <%_ } _%>
-<%_ if (databaseTypeSql && !reactive) { _%>
+<%_ if (databaseTypeSql) { _%>
         id 'org.liquibase.gradle' version "${liquibasePluginVersion}"
 <%_ } _%>
         id 'org.sonarqube' version "${sonarqubePluginVersion}"
@@ -44,6 +46,7 @@ pluginManagement {
         id "com.gradle.enterprise" version "${gradleEnterprisePluginVersion}"
         id "com.gradle.common-custom-user-data-gradle-plugin" version "${gradleCommonCustomUserDataPluginVersion}"
 <%_ } _%>
+        //jhipster-needle-gradle-plugin-management-plugins - JHipster will add additional entries here
     }
 }
 
@@ -52,7 +55,7 @@ plugins {
     id 'com.gradle.enterprise'
     id 'com.gradle.common-custom-user-data-gradle-plugin'
 }
-    
+
 gradleEnterprise {
     server = "<%= gradleEnterpriseHost %>"
     buildScan {
@@ -70,5 +73,5 @@ buildCache {
         url = '<%= gradleEnterpriseHost %>/cache/' // note the trailing slash!
     }
 }
-<%_ } _%>  
+<%_ } _%>
 rootProject.name = "<%= dasherizedBaseName %>"

package/generators/server/templates/sql/common/src/main/docker/config/mariadb/my.cnf

@@ -0,0 +1,49 @@
+[mysqld]
+port   		= 3306
+#socket 		= /tmp/mysql.sock
+skip-external-locking
+key_buffer_size = 16K
+max_allowed_packet = 1M
+table_open_cache = 4
+sort_buffer_size = 64K
+read_buffer_size = 256K
+read_rnd_buffer_size = 256K
+net_buffer_length = 2K
+thread_stack = 512K
+skip-host-cache
+skip-name-resolve
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (using the "enable-named-pipe" option) will render mysqld useless!
+#
+#skip-networking
+#server-id      	= 1
+
+# Uncomment the following if you want to log updates
+#log-bin=mysql-bin
+
+# binary logging format - mixed recommended
+#binlog_format=mixed
+
+# Causes updates to non-transactional engines using statement format to be
+# written directly to binary log. Before using this option make sure that
+# there are no dependencies between transactional and non-transactional
+# tables such as in the statement INSERT INTO t_myisam SELECT * FROM
+# t_innodb; otherwise, slaves may diverge from the master.
+#binlog_direct_non_transactional_updates=TRUE
+
+# Uncomment the following if you are using InnoDB tables
+innodb_data_file_path = ibdata1:10M:autoextend
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+innodb_buffer_pool_size = 16M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+innodb_log_file_size = 5M
+innodb_log_buffer_size = 8M
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 200
+character-set-server = utf8mb4

package/generators/server/templates/sql/common/src/main/docker/config/mysql/my.cnf

@@ -0,0 +1,82 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html
+[mysqld]
+user = mysql
+datadir = /var/lib/mysql
+port   		= 3306
+#socket 		= /tmp/mysql.sock
+skip-external-locking
+key_buffer_size = 16K
+max_allowed_packet = 1M
+table_open_cache = 4
+sort_buffer_size = 64K
+read_buffer_size = 256K
+read_rnd_buffer_size = 256K
+net_buffer_length = 2K
+skip-host-cache
+skip-name-resolve
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (using the "enable-named-pipe" option) will render mysqld useless!
+#
+#skip-networking
+#server-id      	= 1
+
+# Uncomment the following if you want to log updates
+#log-bin=mysql-bin
+
+# binary logging format - mixed recommended
+#binlog_format=mixed
+
+# Causes updates to non-transactional engines using statement format to be
+# written directly to binary log. Before using this option make sure that
+# there are no dependencies between transactional and non-transactional
+# tables such as in the statement INSERT INTO t_myisam SELECT * FROM
+# t_innodb; otherwise, slaves may diverge from the master.
+#binlog_direct_non_transactional_updates=TRUE
+
+# Uncomment the following if you are using InnoDB tables
+innodb_data_file_path = ibdata1:10M:autoextend
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+innodb_buffer_pool_size = 16M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+innodb_log_file_size = 5M
+innodb_log_buffer_size = 8M
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+
+symbolic-links=0
+innodb_buffer_pool_size=5M
+innodb_log_buffer_size=256K
+max_connections=20
+key_buffer_size=8
+thread_cache_size=0
+host_cache_size=0
+innodb_ft_cache_size=1600000
+innodb_ft_total_cache_size=32000000
+#### These optimize the memory use of MySQL
+#### http://www.tocker.ca/2014/03/10/configuring-mysql-to-use-minimal-memory.html
+
+# per thread or per operation settings
+thread_stack=131072
+sort_buffer_size=32K
+read_buffer_size=8200
+read_rnd_buffer_size=8200
+max_heap_table_size=16K
+tmp_table_size=1K
+bulk_insert_buffer_size=0
+join_buffer_size=128
+net_buffer_length=1K
+innodb_sort_buffer_size=64K
+
+#settings that relate to the binary log (if enabled)
+binlog_cache_size=4K
+binlog_stmt_cache_size=4K
+
+performance_schema = off
+character-set-server = utf8mb4

package/generators/server/templates/{src → sql/common/src}/main/docker/mariadb.yml.ejs

@@ -21,6 +21,8 @@ version: '<%= DOCKER_COMPOSE_FORMAT_VERSION %>'
 services:
   <%= baseName.toLowerCase() %>-mariadb:
     image: <%= DOCKER_MARIADB %>
+    volumes:
+      - ./config/mariadb:/etc/mysql/conf.d
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
     environment:

package/generators/server/templates/{src → sql/common/src}/main/docker/mysql.yml.ejs

@@ -21,7 +21,8 @@ version: '<%= DOCKER_COMPOSE_FORMAT_VERSION %>'
 services:
   <%= baseName.toLowerCase() %>-mysql:
     image: <%= DOCKER_MYSQL %>
-    # volumes:
+    volumes:
+      - ./config/mysql:/etc/mysql/conf.d
     #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes

package/generators/server/templates/sql/common/src/test/java/package/config/EmbeddedSQL.java.ejs

@@ -0,0 +1,30 @@
+<%#
+ Copyright 2013-2022 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.
+-%>
+package <%= packageName %>.config;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EmbeddedSQL {
+}

package/generators/server/templates/sql/common/src/test/java/package/config/MariadbTestContainer.java.ejs

@@ -0,0 +1,60 @@
+<%#
+ Copyright 2013-2022 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.
+-%>
+package <%= packageName %>.config;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.MariaDBContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+
+import java.util.Collections;
+
+public class MariadbTestContainer implements SqlTestContainer {
+
+    private static final Logger log = LoggerFactory.getLogger(MariadbTestContainer.class);
+
+    private MariaDBContainer<?> mariaDBContainer;
+
+    @Override
+    public void destroy() {
+        if (null != mariaDBContainer && mariaDBContainer.isRunning()) {
+            mariaDBContainer.stop();
+        }
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        if (null == mariaDBContainer) {
+            mariaDBContainer = new MariaDBContainer<>("<%= DOCKER_MARIADB %>")
+                .withDatabaseName("<%= baseName %>")
+                .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
+                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withReuse(true)
+                .withConfigurationOverride("testcontainers/mariadb");
+        }
+        if (!mariaDBContainer.isRunning()) {
+            mariaDBContainer.start();
+        }
+    }
+    @Override
+    public JdbcDatabaseContainer<?> getTestContainer() {
+        return mariaDBContainer;
+    }
+}

package/generators/server/templates/sql/common/src/test/java/package/config/MsSqlTestContainer.java.ejs

@@ -0,0 +1,59 @@
+<%#
+ Copyright 2013-2022 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.
+-%>
+package <%= packageName %>.config;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.MSSQLServerContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+
+import java.util.Collections;
+
+public class MsSqlServerContainer implements SqlTestContainer {
+
+    private static final Logger log = LoggerFactory.getLogger(MsSqlServerContainer.class);
+
+    private MSSQLServerContainer<?> mSSQLServerContainer;
+
+    @Override
+    public void destroy() {
+        if (null != mSSQLServerContainer && mSSQLServerContainer.isRunning()) {
+            mSSQLServerContainer.stop();
+        }
+    }
+    @Override
+    public void afterPropertiesSet() {
+        if (null == mSSQLServerContainer) {
+            mSSQLServerContainer = new MSSQLServerContainer<>("<%= DOCKER_MSSQL %>")
+                .withDatabaseName("<%= baseName %>")
+                .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
+                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withReuse(true);
+        }
+        if (!mSSQLServerContainer.isRunning()) {
+            mSSQLServerContainer.start();
+        }
+    }
+
+    @Override
+    public JdbcDatabaseContainer<?> getTestContainer() {
+        return mSSQLServerContainer;
+    }
+}

package/generators/server/templates/sql/common/src/test/java/package/config/MysqlTestContainer.java.ejs

@@ -0,0 +1,69 @@
+<%#
+ Copyright 2013-2022 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.
+-%>
+package <%= packageName %>.config;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+
+import java.util.Collections;
+
+public class MysqlTestContainer implements SqlTestContainer {
+
+    private static final Logger log = LoggerFactory.getLogger(MysqlTestContainer.class);
+    private long memoryInBytes = 100 * 1024 * 1024;
+    private long memorySwapInBytes = 200 * 1024 * 1024;
+
+    private MySQLContainer<?> mysqlContainer;
+
+    @Override
+    public void destroy() {
+        if (null != mysqlContainer && mysqlContainer.isRunning()) {
+            mysqlContainer.stop();
+        }
+    }
+    @Override
+    public void afterPropertiesSet() {
+        if (null == mysqlContainer) {
+            mysqlContainer = new MySQLContainer<>("<%= DOCKER_MYSQL %>-debian")
+                .withDatabaseName("<%= baseName %>")
+                .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
+                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withReuse(true)
+                .withPrivilegedMode(true)
+                .withConfigurationOverride("testcontainers/mysql")
+                .withCreateContainerCmdModifier(cmd ->
+                    cmd.getHostConfig()
+                        .withMemory(memoryInBytes)
+                        .withMemorySwap(memorySwapInBytes)
+                );
+
+        }
+        if (!mysqlContainer.isRunning()) {
+            mysqlContainer.start();
+        }
+    }
+
+    @Override
+    public JdbcDatabaseContainer<?> getTestContainer() {
+        return mysqlContainer;
+    }
+}

package/generators/server/templates/sql/common/src/test/java/package/config/PostgreSqlTestContainer.java.ejs

@@ -0,0 +1,59 @@
+<%#
+ Copyright 2013-2022 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.
+-%>
+package <%= packageName %>.config;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import java.util.Collections;
+
+public class PostgreSqlTestContainer implements SqlTestContainer {
+
+    private static final Logger log = LoggerFactory.getLogger(PostgreSqlTestContainer.class);
+
+
+    private PostgreSQLContainer<?> postgreSQLContainer;
+
+    @Override
+    public void destroy() {
+        if (null != postgreSQLContainer && postgreSQLContainer.isRunning()) {
+            postgreSQLContainer.stop();
+        }
+    }
+    @Override
+    public void afterPropertiesSet() {
+        if (null == postgreSQLContainer) {
+            postgreSQLContainer = new PostgreSQLContainer<>("<%= DOCKER_POSTGRESQL %>")
+                .withDatabaseName("<%= baseName %>")
+                .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
+                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withReuse(true);
+        }
+        if (!postgreSQLContainer.isRunning()) {
+            postgreSQLContainer.start();
+        }
+    }
+
+    @Override
+    public JdbcDatabaseContainer<?> getTestContainer() {
+        return postgreSQLContainer;
+    }
+}

package/generators/server/templates/sql/common/src/test/java/package/config/SqlTestContainer.java.ejs

@@ -0,0 +1,28 @@
+<%#
+ Copyright 2013-2022 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.
+-%>
+package <%= packageName %>.config;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+
+public interface SqlTestContainer extends InitializingBean, DisposableBean {
+
+    JdbcDatabaseContainer<?> getTestContainer();
+}

package/generators/server/templates/sql/common/src/test/resources/config/application-testdev.yml.ejs

@@ -0,0 +1,93 @@
+<%#
+ Copyright 2013-2022 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.
+-%>
+# ===================================================================
+# Spring Boot configuration.
+#
+# This configuration is used for unit/integration tests with testcontainers database containers.
+#
+# To activate this configuration launch integration tests with the 'testcontainers' profile
+#
+# More information on database containers: https://www.testcontainers.org/modules/databases/
+<%_ if (devDatabaseTypeMssql) { _%>
+#
+# You are required to accept EULA license for SQL server containers.
+# Follow the instructions at https://www.testcontainers.org/modules/databases/mssqlserver/
+<%_ } _%>
+<%_ if (devDatabaseTypeOracle) { _%>
+#
+# You have to specify an Oracle image name in a classpath file named testcontainers.properties.
+# Follow the instructions at https://www.testcontainers.org/modules/databases/oraclexe/
+<%_ } _%>
+# ===================================================================
+
+spring:
+<%_ if (reactive) { _%>
+  <%_ if (devDatabaseTypeH2Any) { _%>
+  r2dbc:
+    <%_ if (devDatabaseTypeH2Memory) { _%>
+    url: <%- getR2DBCUrl(devDatabaseType, { databaseName: lowercaseBaseName, itests: true }) %>
+    <%_ } else { _%>
+    url: <%- getR2DBCUrl(devDatabaseType, { databaseName: lowercaseBaseName, localDirectory: `././${BUILD_DIR}h2db/testdb` }) %>
+    <%_ } _%>
+    username: <%= lowercaseBaseName %>
+    password:
+  liquibase:
+    <%_ if (devDatabaseTypeH2Memory) { _%>
+    url: <%- getJDBCUrl(devDatabaseType, { databaseName: lowercaseBaseName, itests: true }) %>
+    <%_ } else { _%>
+    url: <%- getJDBCUrl(devDatabaseType, { databaseName: lowercaseBaseName, localDirectory: `./${BUILD_DIR}h2db/testdb` }) %>
+    <%_ } _%>
+  <%_ } _%>
+<%_ } else { _%>
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    hikari:
+      auto-commit: false
+  <%_ if (!devDatabaseTypeH2Any) { _%>
+      poolName: Hikari
+      maximum-pool-size: 1
+    <%_ if (devDatabaseTypeMysql || devDatabaseTypeMariadb || devDatabaseTypeMssql) { _%>
+      data-source-properties:
+        cachePrepStmts: true
+        prepStmtCacheSize: 250
+        prepStmtCacheSqlLimit: 2048
+        useServerPrepStmts: true
+    <%_ } _%>
+  <%_ } _%>
+  jpa:
+  <%_ if (devDatabaseTypePostgres) { _%>
+    database-platform: tech.jhipster.domain.util.FixedPostgreSQL10Dialect
+  <%_ } _%>
+    open-in-view: false
+    hibernate:
+      ddl-auto: none
+      naming:
+        physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+        implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
+    properties:
+      hibernate.id.new_generator_mappings: true
+      hibernate.connection.provider_disables_autocommit: true
+      hibernate.cache.use_second_level_cache: false
+      hibernate.cache.use_query_cache: false
+      hibernate.generate_statistics: false
+      hibernate.hbm2ddl.auto: validate
+      hibernate.jdbc.time_zone: UTC
+      hibernate.query.fail_on_pagination_over_collection_fetch: true
+<%_ } _%>
+