generator-jhipster 7.8.0 → 7.9.1

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

@@ -2,38 +2,68 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd">
-
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+<%_ if (devDatabaseTypeH2Any) { _%>
     <property name="now" value="now()" dbms="h2"/>
-<%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
-    <property name="now" value="now()" dbms="mysql, mariadb"/>
+    <property name="floatType" value="float4" dbms="h2"/>
+  <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
+    <property name="uuidType" value="varchar(36)" dbms="h2"/>
+  <%_ } else { _%>
+    <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) { _%>
+    <property name="clobType" value="longvarchar" dbms="h2"/>
+    <%_ } else { _%>
+    <property name="clobType" value="clob" dbms="h2"/>
+    <%_ } _%>
+    <property name="blobType" value="blob" dbms="h2"/>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (devDatabaseTypeMysql || prodDatabaseTypeMysql) { _%>
+    <property name="now" value="now()" dbms="mysql"/>
+    <property name="floatType" value="float" dbms="mysql"/>
+    <property name="clobType" value="clob" dbms="mysql"/>
+    <property name="blobType" value="longblob" dbms="mysql"/>
+    <property name="uuidType" value="varchar(36)" dbms="mysql"/>
+    <property name="datetimeType" value="datetime(6)" dbms="mysql"/>
+<%_ } _%>
+<%_ if (devDatabaseTypeMariadb || prodDatabaseTypeMariadb) { _%>
+    <property name="now" value="now()" dbms="mariadb"/>
+    <property name="floatType" value="float" dbms="mariadb"/>
+    <property name="clobType" value="clob" dbms="mariadb"/>
+    <property name="blobType" value="longblob" dbms="mariadb"/>
+    <property name="uuidType" value="varchar(36)" dbms="mariadb"/>
+    <property name="datetimeType" value="datetime(6)" dbms="mariadb"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypePostgres) { _%>
+<%_ if (devDatabaseTypePostgres || prodDatabaseTypePostgres) { _%>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
+    <property name="floatType" value="float4" dbms="postgresql"/>
+    <property name="clobType" value="longvarchar" dbms="postgresql"/>
+    <property name="blobType" value="bytea" dbms="postgresql"/>
+    <property name="uuidType" value="uuid" dbms="postgresql"/>
+    <property name="datetimeType" value="datetime" dbms="postgresql"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypeOracle) { _%>
+<%_ if (devDatabaseTypeOracle || prodDatabaseTypeOracle) { _%>
     <property name="now" value="sysdate" dbms="oracle"/>
+    <property name="floatType" value="float" dbms="oracle"/>
+    <property name="clobType" value="clob" dbms="oracle"/>
+    <property name="blobType" value="blob" dbms="oracle"/>
+    <property name="uuidType" value="uuid" dbms="oracle"/>
+    <property name="datetimeType" value="datetime" dbms="oracle"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypeMssql) { _%>
+<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
     <property name="now" value="GETDATE()" dbms="mssql"/>
+    <property name="floatType" value="float" dbms="mssql"/>
+    <property name="clobType" value="clob" dbms="mssql"/>
+    <property name="blobType" value="blob" dbms="mssql"/>
+    <property name="uuidType" value="uuid" dbms="mssql"/>
+    <property name="datetimeType" value="datetime" dbms="mssql"/>
 <%_ } _%>
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
-    <property name="floatType" value="float" dbms="mysql, oracle, mssql, mariadb"/>
-<%_ if (prodDatabaseTypePostgres) { _%>
-    <property name="clobType" value="longvarchar" dbms="h2"/>
-<%_ } else if (reactive) { _%>
-    <property name="clobType" value="varchar(1000000)" dbms="h2"/>
-<%_ } else { _%>
-    <property name="clobType" value="clob" dbms="h2"/>
-<%_ } _%>
-    <property name="clobType" value="clob" dbms="mysql, oracle, mssql, mariadb, postgresql"/>
-<%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
-    <property name="uuidType" value="varchar(36)" dbms="h2, mysql, mariadb"/>
-<%_ } else { _%>
-    <property name="uuidType" value="uuid" dbms="h2, <%= prodDatabaseType %>"/>
-<%_ } _%>
-    <property name="datetimeType" value="datetime(6)" dbms="mysql, mariadb"/>
-    <property name="datetimeType" value="datetime" dbms="oracle, mssql, postgresql, h2"/>
 
     <include file="config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/>
     <!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->

package/generators/server/templates/src/main/resources/swagger/api.yml.ejs

@@ -62,8 +62,8 @@ security:
       description: OAuth2 authentication with KeyCloak
       flows:
         authorizationCode:
-          authorizationUrl: http://localhost:9080/auth/realms/jhipster/protocol/openid-connect/auth
-          tokenUrl: http://localhost:9080/auth/realms/jhipster/protocol/openid-connect/token
+          authorizationUrl: http://localhost:9080/realms/jhipster/protocol/openid-connect/auth
+          tokenUrl: http://localhost:9080/realms/jhipster/protocol/openid-connect/token
           scopes:
             jhipster: Jhipster specific claims
             email: Email claims
@@ -71,7 +71,7 @@ security:
     openId:
       type: openIdConnect
       description: OpenID Connect authentication with KeyCloak
-      openIdConnectUrl: http://localhost:9080/auth/realms/jhipster/.well-known/openid-configuration
+      openIdConnectUrl: http://localhost:9080/realms/jhipster/.well-known/openid-configuration
 security:
   - oauth: [jhipster, email, profile]
   - openId: [jhipster, email, profile]

package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs

@@ -19,32 +19,42 @@
 package <%= packageName %>;
 
 import <%= packageName %>.<%= mainClass %>;
+import <%= packageName %>.config.AsyncSyncConfiguration;
 <%_ if (databaseTypeCouchbase) { _%>
 import org.springframework.test.context.ActiveProfiles;
 import tech.jhipster.config.JHipsterConstants;
 <%_ } _%>
-<%_ if (databaseTypeNeo4j) { _%>
-import <%= packageName %>.AbstractNeo4jIT;
-<%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
 import <%= packageName %>.config.EmbeddedMongo;
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.config.EmbeddedCassandra;
 <%_ } _%>
-<%_ if (reactiveSqlTestContainers) { _%>
-import <%= packageName %>.ReactiveSqlTestContainerExtension;
+<%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
+import <%= packageName %>.config.EmbeddedCouchbase;
+<%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+import <%= packageName %>.config.EmbeddedElasticsearch;
+<%_ } _%>
+<%_ if (messageBrokerKafka) { _%>
+import <%= packageName %>.config.EmbeddedKafka;
+<%_ } _%>
+<%_ if (databaseTypeNeo4j) { _%>
+import <%= packageName %>.config.EmbeddedNeo4j;
+<%_ } _%>
+<%_ if (databaseTypeSql) { _%>
+import <%= packageName %>.config.EmbeddedSQL;
 <%_ } _%>
 <%_ if (cacheProviderRedis) { _%>
-import <%= packageName %>.RedisTestContainerExtension;
+import <%= packageName %>.config.EmbeddedRedis;
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.config.TestSecurityConfiguration;
 <%_ } _%>
-<%_ if (cacheProviderRedis || databaseTypeNeo4j || databaseTypeCouchbase || reactiveSqlTestContainers) { _%>
+<%_ if (cacheProviderRedis) { _%>
 import org.junit.jupiter.api.extension.ExtendWith;
 <%_ } _%>
-
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.lang.annotation.ElementType;
@@ -57,16 +67,12 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-<%_ if (authenticationTypeOauth2) { _%>
-@SpringBootTest(classes = {<%= mainClass %>.class, TestSecurityConfiguration.class})
-<%_ } else { _%>
-@SpringBootTest(classes = <%= mainClass %>.class)
-<%_ } _%>
+@SpringBootTest(classes = {<%= mainClass %>.class, AsyncSyncConfiguration.class<% if (authenticationTypeOauth2) { %>, TestSecurityConfiguration.class<% } %>})
 <%_ if (cacheProviderRedis) { _%>
-@ExtendWith(RedisTestContainerExtension.class)
+@EmbeddedRedis
 <%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-@ExtendWith(CouchbaseTestContainerExtension.class)
+<%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
+@EmbeddedCouchbase
 @ActiveProfiles(JHipsterConstants.SPRING_PROFILE_TEST)
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
@@ -75,12 +81,19 @@ import java.lang.annotation.Target;
 <%_ if (databaseTypeCassandra) { _%>
 @EmbeddedCassandra
 <%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+@EmbeddedElasticsearch
+<%_ } _%>
+<%_ if (messageBrokerKafka) { _%>
+@EmbeddedKafka
+<%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
-@ExtendWith(AbstractNeo4jIT.class)
+@EmbeddedNeo4j
 <%_ } _%>
-<%_ if (reactiveSqlTestContainers) { _%>
-@ExtendWith(ReactiveSqlTestContainerExtension.class)
+<%_ if (databaseTypeSql) { _%>
+@EmbeddedSQL
 <%_ } _%>
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public @interface IntegrationTest {
 <%_ if (reactive) { _%>
     // 5s is the spring default https://github.com/spring-projects/spring-framework/blob/29185a3d28fa5e9c1b4821ffe519ef6f56b51962/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java#L106

package/generators/server/templates/src/test/java/package/{repository/search/UserSearchRepositoryMockConfiguration.java.ejs → config/AsyncSyncConfiguration.java.ejs}

@@ -16,19 +16,21 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository.search;
+package <%=packageName%>.config;
 
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-/**
- * Configure a Mock version of {@link UserSearchRepository} to test the
- * application without starting Elasticsearch.
- */
-@Configuration
-public class UserSearchRepositoryMockConfiguration {
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.task.SyncTaskExecutor;
+
+import java.util.concurrent.Executor;
 
-    @MockBean
-    private UserSearchRepository mockUserSearchRepository;
+@Configuration
+public class AsyncSyncConfiguration {
 
+    @Bean(name = "taskExecutor")
+    public Executor taskExecutor() {
+        return new SyncTaskExecutor();
+    }
 }

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

@@ -1,5 +1,24 @@
+<%#
+ 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 static java.nio.file.Files.newDirectoryStream;
 import static java.nio.file.Paths.get;
 import static java.util.Spliterator.SORTED;
@@ -45,7 +64,7 @@ public class CassandraTestContainer implements InitializingBean, DisposableBean
     @Override
     public void destroy() {
         if (null != cassandraContainer && cassandraContainer.isRunning()) {
-            cassandraContainer.stop();
+            cassandraContainer.close();
         }
     }
 

package/generators/{entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs → server/templates/src/test/java/package/config/ElasticsearchReactiveTestConfiguration.java.ejs}

@@ -16,19 +16,22 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= entityAbsolutePackage %>.repository.search;
+package <%= packageName %>.config;
 
-import org.springframework.boot.test.mock.mockito.MockBean;
+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.RefreshPolicy;
 
-/**
- * Configure a Mock version of {@link <%= entityClass %>SearchRepository} to test the
- * application without starting Elasticsearch.
- */
 @Configuration
-public class <%= entityClass %>SearchRepositoryMockConfiguration {
-
-    @MockBean
-    private <%= entityClass %>SearchRepository mock<%= entityClass %>SearchRepository;
-
+public class ElasticsearchReactiveTestConfiguration {
+    @Autowired
+    ReactiveElasticsearchTemplate template;
+
+    @PostConstruct
+    public void configureTemplate() {
+        this.template.setRefreshPolicy(RefreshPolicy.IMMEDIATE);
+    }
 }

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

@@ -0,0 +1,68 @@
+<%#
+ 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+/**
+ * Base class for starting/stopping ElasticSearch during tests.
+ */
+public class ElasticsearchTestContainer implements InitializingBean, DisposableBean {
+
+    private static final Logger log = LoggerFactory.getLogger(ElasticsearchTestContainer.class);
+    private static final Integer CONTAINER_STARTUP_TIMEOUT_MINUTES = 10;
+    private ElasticsearchContainer elasticsearchContainer;
+
+    @Override
+    public void destroy() {
+        if (null != elasticsearchContainer && elasticsearchContainer.isRunning()) {
+            elasticsearchContainer.close();
+        }
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        if (null == elasticsearchContainer) {
+            elasticsearchContainer =
+                new ElasticsearchContainer(DockerImageName.parse("<%= DOCKER_ELASTICSEARCH_CONTAINER %>").withTag("<%= ELASTICSEARCH_VERSION %>%>"))
+                    .withStartupTimeout(Duration.of(CONTAINER_STARTUP_TIMEOUT_MINUTES, ChronoUnit.MINUTES))
+                    .withSharedMemorySize(256000000L)
+                    .withEnv("ES_JAVA_OPTS", "-Xms256m -Xmx256m")
+                    .withLogConsumer(new Slf4jLogConsumer(log))
+                    .withReuse(true);
+        }
+        if (!elasticsearchContainer.isRunning()) {
+            elasticsearchContainer.start();
+        }
+    }
+
+    public ElasticsearchContainer getElasticsearchContainer() {
+        return elasticsearchContainer;
+    }
+
+}

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

@@ -1,5 +1,24 @@
+<%#
+ 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;

package/generators/server/templates/src/test/java/package/config/EmbeddedElasticsearch.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 EmbeddedElasticsearch {
+}

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

@@ -1,5 +1,24 @@
+<%#
+ 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;

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

@@ -1,5 +1,24 @@
+<%#
+ 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;

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

@@ -0,0 +1,29 @@
+<%#
+ 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 EmbeddedNeo4j {
+}

package/generators/server/templates/src/test/java/package/config/EmbeddedRedis.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 EmbeddedRedis {
+}

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

@@ -28,11 +28,20 @@ public class JHipsterBlockHoundIntegration implements BlockHoundIntegration {
         builder.allowBlockingCallsInside("reactor.core.scheduler.BoundedElasticScheduler$BoundedState", "dispose");
         builder.allowBlockingCallsInside("reactor.core.scheduler.BoundedElasticScheduler", "schedule");
         builder.allowBlockingCallsInside("org.springframework.validation.beanvalidation.SpringValidatorAdapter", "validate");
-    <%_ if (databaseTypeCouchbase) { _%>
+        builder.allowBlockingCallsInside("<%= packageName %>.service.MailService", "sendEmailFromTemplate");
+        builder.allowBlockingCallsInside("<%= packageName %>.security.DomainUserDetailsService", "createSpringSecurityUser");
+<%_ if (databaseTypeCouchbase) { _%>
         builder.allowBlockingCallsInside("org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter", "read");
         builder.allowBlockingCallsInside("com.github.couchmove.repository.CouchbaseRepositoryImpl", "lambda$query$2");
         builder.allowBlockingCallsInside("com.github.couchmove.repository.CouchbaseRepositoryImpl", "lambda$importFtsIndex$1");
-    <%_} _%>
+<%_} _%>
+<%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
+        builder.allowBlockingCallsInside("org.mariadb.r2dbc.message.client.HandshakeResponse", "writeConnectAttributes");
+        builder.allowBlockingCallsInside("org.mariadb.r2dbc.client.MariadbPacketDecoder", "decode");
+<%_} _%>
+<%_ if (searchEngineElasticsearch) { _%>
+        builder.allowBlockingCallsInside("org.elasticsearch.client.indices.CreateIndexRequest", "settings");
+<%_} _%>
     }
 
 }

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

@@ -1,3 +1,21 @@
+<%#
+ 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;
@@ -16,7 +34,7 @@ public class KafkaTestContainer implements InitializingBean, DisposableBean {
     @Override
     public void destroy() {
         if (null != kafkaContainer && kafkaContainer.isRunning()) {
-            kafkaContainer.stop();
+            kafkaContainer.close();
         }
     }
 

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

@@ -28,9 +28,9 @@ import org.testcontainers.containers.MongoDBContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 public class MongoDbTestContainer implements InitializingBean, DisposableBean {
-    private final long memoryInBytes = Math.round(1024 * 1024 * 1024 * 0.6);
+    /* private final long memoryInBytes = Math.round(1024 * 1024 * 1024 * 0.6);
     private final long memorySwapInBytes = Math.round(1024 * 1024 * 1024 * 0.8);
-    private final long nanoCpu = Math.round(1_000_000_000L * 0.1);
+    private final long nanoCpu = Math.round(1_000_000_000L * 0.1); */
     private static final Logger log = LoggerFactory.getLogger(MongoDbTestContainer.class);
 
     private MongoDBContainer mongodbContainer;
@@ -38,7 +38,7 @@ public class MongoDbTestContainer implements InitializingBean, DisposableBean {
     @Override
     public void destroy() {
         if (null != mongodbContainer && mongodbContainer.isRunning()) {
-            mongodbContainer.stop();
+           mongodbContainer.stop();
         }
     }
 
@@ -47,12 +47,12 @@ public class MongoDbTestContainer implements InitializingBean, DisposableBean {
         if (null == mongodbContainer) {
             mongodbContainer = new MongoDBContainer("<%= DOCKER_MONGODB %>")
                 .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
-                .withCommand(
+                /* .withCommand(
                     "--nojournal --wiredTigerCacheSizeGB 0.25 --wiredTigerCollectionBlockCompressor none --slowOpSampleRate 0 --setParameter ttlMonitorEnabled=false --setParameter diagnosticDataCollectionEnabled=false --setParameter logicalSessionRefreshMillis=6000000 --setParameter enableFlowControl=false --setParameter oplogFetcherUsesExhaust=false --setParameter disableResumableRangeDeleter=true --setParameter enableShardedIndexConsistencyCheck=false --setParameter enableFinerGrainedCatalogCacheRefresh=false --setParameter readHedgingMode=off --setParameter loadRoutingTableOnStartup=false --setParameter rangeDeleterBatchDelayMS=2000000 --setParameter skipShardingConfigurationChecks=true --setParameter syncdelay=3600"
                 )
                 .withCreateContainerCmdModifier(cmd ->
                     cmd.getHostConfig().withMemory(memoryInBytes).withMemorySwap(memorySwapInBytes).withNanoCPUs(nanoCpu)
-                )
+                ) */
                 .withLogConsumer(new Slf4jLogConsumer(log))
                 .withReuse(true);
         }