generator-jhipster 7.7.0 → 7.8.0

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

@@ -0,0 +1,38 @@
+package <%= packageName %>.config;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
+
+public class KafkaTestContainer implements InitializingBean, DisposableBean {
+
+    private KafkaContainer kafkaContainer;
+    private static final Logger log = LoggerFactory.getLogger(KafkaTestContainer.class);
+
+    @Override
+    public void destroy() {
+        if (null != kafkaContainer && kafkaContainer.isRunning()) {
+            kafkaContainer.stop();
+        }
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        if (null == kafkaContainer) {
+            kafkaContainer = new KafkaContainer(DockerImageName.parse("<%= DOCKER_KAFKA %>"))
+                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withReuse(true);
+        }
+        if (!kafkaContainer.isRunning()) {
+            kafkaContainer.start();
+        }
+    }
+
+    public KafkaContainer getKafkaContainer() {
+        return kafkaContainer;
+    }
+}

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

@@ -0,0 +1,67 @@
+<%#
+ 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.util.Collections;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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 memorySwapInBytes = Math.round(1024 * 1024 * 1024 * 0.8);
+    private final long nanoCpu = Math.round(1_000_000_000L * 0.1);
+    private static final Logger log = LoggerFactory.getLogger(MongoDbTestContainer.class);
+
+    private MongoDBContainer mongodbContainer;
+
+    @Override
+    public void destroy() {
+        if (null != mongodbContainer && mongodbContainer.isRunning()) {
+            mongodbContainer.stop();
+        }
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        if (null == mongodbContainer) {
+            mongodbContainer = new MongoDBContainer("<%= DOCKER_MONGODB %>")
+                .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
+                .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);
+        }
+        if (!mongodbContainer.isRunning()) {
+            mongodbContainer.start();
+        }
+    }
+
+    public MongoDBContainer getMongoDBContainer() {
+        return mongodbContainer;
+    }
+}

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

@@ -0,0 +1,114 @@
+<%#
+ 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.util.List;
+
+<%_ if (databaseTypeCassandra) { _%>
+import org.cassandraunit.CQLDataLoader;
+<%_ } _%>
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+
+import org.springframework.test.context.ContextConfigurationAttributes;
+import org.springframework.test.context.ContextCustomizer;
+import org.springframework.test.context.ContextCustomizerFactory;
+import org.springframework.boot.test.util.TestPropertyValues;
+<%_ if (databaseTypeCassandra) { _%>
+import org.testcontainers.containers.CassandraContainer;
+<%_ } _%>
+<%_ if (messageBrokerKafka) { _%>
+import org.testcontainers.containers.KafkaContainer;
+<%_ } _%>
+
+
+public class TestContainersSpringContextCustomizerFactory implements ContextCustomizerFactory {
+
+    private Logger log = LoggerFactory.getLogger(TestContainersSpringContextCustomizerFactory.class);
+<%_ if (messageBrokerKafka) { _%>
+    private static KafkaTestContainer kafkaBean;
+<%_ } _%>
+<%_ if (databaseTypeMongodb) { _%>
+    private static MongoDbTestContainer mongoDbBean;
+<%_ } _%>
+<%_ if (databaseTypeCassandra) { _%>
+    private static CassandraTestContainer cassandraBean;
+<%_ } _%>
+
+    @Override
+    public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
+
+        return (context, mergedConfig) -> {
+            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+            TestPropertyValues testValues = TestPropertyValues.empty();
+<%_ if (databaseTypeMongodb) { _%>
+        EmbeddedMongo mongoAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedMongo.class);
+        if (null != mongoAnnotation) {
+            log.debug("detected the EmbeddedMongo annotation on class {}", testClass.getName());
+            if (mongoDbBean == null) {
+                log.info("Warming up the mongo database");
+                mongoDbBean =  new MongoDbTestContainer();
+                beanFactory.initializeBean(mongoDbBean, MongoDbTestContainer.class.getName().toLowerCase());
+                beanFactory.registerSingleton(MongoDbTestContainer.class.getName().toLowerCase(), mongoDbBean);
+                ((DefaultSingletonBeanRegistry)beanFactory).registerDisposableBean(MongoDbTestContainer.class.getName().toLowerCase(), mongoDbBean);
+            }
+            testValues = testValues.and("spring.data.mongodb.uri=" + mongoDbBean.getMongoDBContainer().getReplicaSetUrl());
+        }
+<%_ } _%>
+<%_ if (databaseTypeCassandra) { _%>
+        EmbeddedCassandra cassandraAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCassandra.class);
+        if (null != cassandraAnnotation) {
+            log.debug("detected the EmbeddedCassandra annotation on class {}", testClass.getName());
+            if (cassandraBean == null) {
+                log.info("Warming up the cassandra database");
+                cassandraBean =  new CassandraTestContainer();
+                beanFactory.initializeBean(cassandraBean, CassandraTestContainer.class.getName().toLowerCase());
+                beanFactory.registerSingleton(CassandraTestContainer.class.getName().toLowerCase(), cassandraBean);
+                ((DefaultSingletonBeanRegistry)beanFactory).registerDisposableBean(CassandraTestContainer.class.getName().toLowerCase(), cassandraBean);
+            }
+            testValues = testValues.and("spring.data.cassandra.port=" +  cassandraBean.getCassandraContainer().getMappedPort(CassandraContainer.CQL_PORT))
+                    .and("spring.data.cassandra.contact-points=" +  cassandraBean.getCassandraContainer().getHost())
+                    .and("spring.data.cassandra.keyspace-name=" + CQLDataLoader.DEFAULT_KEYSPACE_NAME)
+                    .and("spring.data.cassandra.local-datacenter=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getAllHosts().iterator().next().getDatacenter())
+                    .and("spring.data.cassandra.cluster-name=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getClusterName());
+        }
+<%_ } _%>
+
+<%_ if (messageBrokerKafka) { _%>
+            EmbeddedKafka kafkaAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedKafka.class);
+            if (null != kafkaAnnotation) {
+                log.debug("detected the EmbeddedKafka annotation on class {}", testClass.getName());
+                if (kafkaBean == null) {
+                    log.info("Warming up the kafka broker");
+                    kafkaBean = new KafkaTestContainer();
+                    beanFactory.initializeBean(kafkaBean, KafkaTestContainer.class.getName().toLowerCase());
+                    beanFactory.registerSingleton(KafkaTestContainer.class.getName().toLowerCase(), kafkaBean);
+                    ((DefaultSingletonBeanRegistry)beanFactory).registerDisposableBean(KafkaTestContainer.class.getName().toLowerCase(), kafkaBean);
+                }
+                testValues = testValues.and("spring.cloud.stream.kafka.binder.brokers=" + kafkaBean.getKafkaContainer().getHost() + ':' + kafkaBean.getKafkaContainer().getMappedPort(KafkaContainer.KAFKA_PORT));
+            }
+<%_ } _%>
+            testValues.applyTo(context);
+        };
+    }
+}

package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs

@@ -18,18 +18,11 @@
 -%>
 package <%= packageName %>.cucumber;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
-<%_ if (databaseTypeNeo4j) { _%>
-import <%= packageName %>.AbstractNeo4jIT;
-<%_ } _%>
+import <%= packageName %>.IntegrationTest;
 import io.cucumber.junit.platform.engine.Cucumber;
 
 @Cucumber
-<%_ if (databaseTypeNeo4j) { _%>
-@ExtendWith(AbstractNeo4jIT)
-<%_ } _%>
-class CucumberIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest<% } %> {
+@IntegrationTest
+class CucumberIT {
 
 }

package/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs

@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.security;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
@@ -64,7 +61,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 @WithMockUser("test-user-one")
 <%_ } _%>
 @IntegrationTest
-class DomainUserDetailsServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class DomainUserDetailsServiceIT {
 
     private static final String USER_ONE_LOGIN = "test-user-one";
     private static final String USER_ONE_EMAIL = "test-user-one@localhost";

package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs

@@ -93,7 +93,7 @@ class JWTFilterTest {
         MockServerWebExchange exchange = MockServerWebExchange.from(request);
         jwtFilter.filter(
             exchange,
-            it -> Mono.subscriberContext()
+            it -> Mono.deferContextual(Mono::just)
                 .flatMap(c -> ReactiveSecurityContextHolder.getContext())
                 .map(SecurityContext::getAuthentication)
                 .doOnSuccess(auth -> assertThat(auth.getName()).isEqualTo("test-user"))
@@ -123,7 +123,7 @@ class JWTFilterTest {
         MockServerWebExchange exchange = MockServerWebExchange.from(request);
         jwtFilter.filter(
             exchange,
-            it -> Mono.subscriberContext()
+            it -> Mono.deferContextual(Mono::just)
                 .flatMap(c -> ReactiveSecurityContextHolder.getContext())
                 .map(SecurityContext::getAuthentication)
                 .doOnSuccess(auth -> assertThat(auth).isNull())
@@ -149,7 +149,7 @@ class JWTFilterTest {
         MockServerWebExchange exchange = MockServerWebExchange.from(request);
         jwtFilter.filter(
             exchange,
-            it -> Mono.subscriberContext()
+            it -> Mono.deferContextual(Mono::just)
                 .flatMap(c -> ReactiveSecurityContextHolder.getContext())
                 .map(SecurityContext::getAuthentication)
                 .doOnSuccess(auth -> assertThat(auth).isNull())
@@ -175,7 +175,7 @@ class JWTFilterTest {
         MockServerWebExchange exchange = MockServerWebExchange.from(request);
         jwtFilter.filter(
             exchange,
-            it -> Mono.subscriberContext()
+            it -> Mono.deferContextual(Mono::just)
                 .flatMap(c -> ReactiveSecurityContextHolder.getContext())
                 .map(SecurityContext::getAuthentication)
                 .doOnSuccess(auth -> assertThat(auth).isNull())
@@ -208,7 +208,7 @@ class JWTFilterTest {
         MockServerWebExchange exchange = MockServerWebExchange.from(request);
         jwtFilter.filter(
             exchange,
-            it -> Mono.subscriberContext()
+            it -> Mono.deferContextual(Mono::just)
                 .flatMap(c -> ReactiveSecurityContextHolder.getContext())
                 .map(SecurityContext::getAuthentication)
                 .doOnSuccess(auth -> assertThat(auth).isNull())

package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs

@@ -19,8 +19,6 @@
 package <%= packageName %>.service;
 
 import <%= packageName %>.config.Constants;
-<% if (databaseTypeCassandra) { %>
-import <%= packageName %>.AbstractCassandraTest;<% } %>
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 import tech.jhipster.config.JHipsterProperties;
@@ -59,7 +57,7 @@ import static org.mockito.Mockito.*;
  * Integration tests for {@link MailService}.
  */
 @IntegrationTest
-class MailServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class MailServiceIT {
 
     private static final String[] languages = {
         // jhipster-needle-i18n-language-constant - JHipster will add/remove languages in this array
@@ -154,9 +152,9 @@ class MailServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
     @Test
     void testSendEmailFromTemplate() throws Exception {
         <%= asEntity('User') %> user = new <%= asEntity('User') %>();
+        user.setLangKey(Constants.DEFAULT_LANGUAGE);
         user.setLogin("john");
         user.setEmail("john.doe@example.com");
-        user.setLangKey("en");
         mailService.sendEmailFromTemplate(user, "mail/testEmail", "email.test.title");
         verify(javaMailSender).send(messageCaptor.capture());
         MimeMessage message = messageCaptor.getValue();

package/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs

@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.service;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.config.Constants;
 <%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
@@ -135,7 +132,7 @@ import static org.mockito.Mockito.when;
 <%_ if (databaseTypeSql && !reactive) { _%>
 @Transactional
 <%_ } _%>
-class UserServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class UserServiceIT {
 
     private static final String DEFAULT_LOGIN = "johndoe";
 

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs

@@ -18,8 +18,8 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
+<%_ if (databaseTypeCouchbase) { _%>
+import <%= packageName %>.CouchbaseTestContainerExtension;
 <%_ } _%>
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.config.Constants;
@@ -113,7 +113,7 @@ import static org.springframework.security.test.web.servlet.response.SecurityMoc
 <%_ } _%>
 @WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
-class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class AccountResourceIT {
     static final String TEST_USER_LOGIN = "test";
 
     @Autowired

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs

@@ -32,9 +32,6 @@ import static org.mockito.Mockito.*;
   <%_ } _%>
 <%_ } _%>
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.security.AuthoritiesConstants;
 
@@ -77,7 +74,7 @@ import org.springframework.transaction.annotation.Transactional;
 <%_ } _%>
 @WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
-class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class AccountResourceIT {
 
 <%_ if (reactive) { _%>
     private Map<String, Object> claims;

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs

@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
@@ -63,7 +60,7 @@ import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
 <%_ } _%>
 @WithMockUser(value = TEST_USER_LOGIN)
 @IntegrationTest
-class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class AccountResourceIT {
     static final String TEST_USER_LOGIN = "test";
 
     @Autowired

package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs

@@ -18,156 +18,85 @@
 -%>
 package <%= packageName %>.web.rest;
 
-import <%= packageName %>.config.KafkaProperties;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.http.MediaType;
-<%_ if (reactive) { _%>
-import org.springframework.test.web.reactive.server.WebTestClient;
-<%_ } else { _%>
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-<%_ } _%>
-import org.testcontainers.containers.KafkaContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import java.time.Duration;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import static org.assertj.core.api.Assertions.assertThat;
-<%_ if (!reactive) { _%>
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-<%_ } _%>
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.cloud.stream.test.binder.MessageCollector;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.support.GenericMessage;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.util.MimeTypeUtils;
+import <%= packageName %>.IntegrationTest;
+import <%= packageName %>.config.EmbeddedKafka;
+import <%= packageName %>.config.KafkaSseConsumer;
+import <%= packageName %>.config.KafkaSseProducer;
+
+@IntegrationTest
+@AutoConfigureMockMvc
+@WithMockUser
+@EmbeddedKafka
 class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
 
-    private static boolean started = false;
-    private static KafkaContainer kafkaContainer;
+    @Autowired
+    private MessageCollector collector;
 
-<%_ if (reactive) { _%>
-    private WebTestClient client;
-<%_ } else { _%>
+    @Autowired
     private MockMvc restMockMvc;
-<%_ } _%>
-
-    @BeforeAll
-    static void startServer() {
-        if (!started) {
-            startTestcontainer();
-            started = true;
-        }
-    }
 
-    private static void startTestcontainer() {
-        // TODO: withNetwork will need to be removed soon
-        // See discussion at https://github.com/jhipster/generator-jhipster/issues/11544#issuecomment-609065206
-        kafkaContainer = new KafkaContainer(DockerImageName.parse("<%= DOCKER_KAFKA %>")).withNetwork(null);
-        kafkaContainer.start();
-    }
-
-    @BeforeEach
-    void setup() {
-        KafkaProperties kafkaProperties = new KafkaProperties();
-        Map<String, String> producerProps = getProducerProps();
-        kafkaProperties.setProducer(new HashMap<>(producerProps));
-
-        Map<String, String> consumerProps = getConsumerProps("default-group");
-        consumerProps.put("client.id", "default-client");
-        kafkaProperties.setConsumer(consumerProps);
-
-        <%= upperFirstCamelCase(baseName) %>KafkaResource kafkaResource = new <%= upperFirstCamelCase(baseName) %>KafkaResource(kafkaProperties);
+    @Autowired
+    @Qualifier(KafkaSseProducer.CHANNELNAME)
+    private MessageChannel output;
 
-<%_ if (reactive) { _%>
-        client = WebTestClient.bindToController(kafkaResource).build();
-<%_ } else { _%>
-        restMockMvc = MockMvcBuilders.standaloneSetup(kafkaResource).build();
-<%_ } _%>
-    }
+    @Autowired
+    @Qualifier(KafkaSseConsumer.CHANNELNAME)
+    private MessageChannel input;
 
     @Test
-    void producesMessages()<% if (!reactive) { %> throws Exception<% } %> {
-<%_ if (reactive) { _%>
-        client.post().uri("/api/<%= dasherizedBaseName %>-kafka/publish/topic-produce?message=value-produce")
-            .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType(MediaType.APPLICATION_JSON);
-<%_ } else { _%>
-        restMockMvc.perform(post("/api/<%= dasherizedBaseName %>-kafka/publish/topic-produce?message=value-produce"))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(MediaType.APPLICATION_JSON));
-<%_ } _%>
-
-        Map<String, Object> consumerProps = new HashMap<>(getConsumerProps("group-produce"));
-        KafkaConsumer<String, String> consumer = new KafkaConsumer<>(consumerProps);
-        consumer.subscribe(Collections.singletonList("topic-produce"));
-        ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(1));
-
-        assertThat(records.count()).isEqualTo(1);
-        ConsumerRecord<String, String> record = records.iterator().next();
-        assertThat(record.value()).isEqualTo("value-produce");
+    void producesMessages() throws Exception {
+        restMockMvc
+            .perform(post("/api/<%= dasherizedBaseName %>-kafka/publish?message=value-produce"))
+            .andExpect(status().isOk());
+        BlockingQueue<Message<?>> messages = collector.forChannel(output);
+        GenericMessage<String> payload = (GenericMessage<String>) messages.take();
+        assertThat(payload.getPayload()).isEqualTo("value-produce");
     }
 
     @Test
-    void consumesMessages()<% if (!reactive) { %> throws Exception<% } %> {
-        Map<String, Object> producerProps = new HashMap<>(getProducerProps());
-        KafkaProducer<String, String> producer = new KafkaProducer<>(producerProps);
-
-        producer.send(new ProducerRecord<>("topic-consume", "value-consume"));
-
-<%_ if (reactive) { _%>
-        String value = client.get().uri("/api/<%= dasherizedBaseName %>-kafka/consume?topic=topic-consume")
-            .accept(MediaType.TEXT_EVENT_STREAM)
-            .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentTypeCompatibleWith(MediaType.TEXT_EVENT_STREAM)
-            .returnResult(String.class)
-            .getResponseBody().blockFirst(Duration.ofSeconds(10));
-
-        assertThat(value).isEqualTo("value-consume");
-<%_ } else { _%>
-        MvcResult mvcResult = restMockMvc.perform(get("/api/<%= dasherizedBaseName %>-kafka/consume?topic=topic-consume"))
+    void consumesMessages() throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        map.put(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN_VALUE);
+        MessageHeaders headers = new MessageHeaders(map);
+        Message<String> testMessage = new GenericMessage<>("value-consume", headers);
+        MvcResult mvcResult = restMockMvc
+            .perform(get("/api/<%= dasherizedBaseName %>-kafka/register"))
             .andExpect(status().isOk())
             .andExpect(request().asyncStarted())
             .andReturn();
-
         for (int i = 0; i < 100; i++) {
+            input.send(testMessage);
             Thread.sleep(100);
             String content = mvcResult.getResponse().getContentAsString();
             if (content.contains("data:value-consume")) {
+                restMockMvc
+                    .perform(get("/api/<%= dasherizedBaseName %>-kafka/unregister"));
                 return;
             }
         }
         fail("Expected content data:value-consume not received");
-<%_ } _%>
-    }
-
-    private Map<String, String> getProducerProps() {
-        Map<String, String> producerProps = new HashMap<>();
-        producerProps.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-        producerProps.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-        producerProps.put("bootstrap.servers", kafkaContainer.getBootstrapServers());
-        return producerProps;
-    }
-
-    private Map<String, String> getConsumerProps(String group) {
-        Map<String, String> consumerProps = new HashMap<>();
-        consumerProps.put("key.deserializer", "org.apache.kafka.common.serialization.StringDeserializer");
-        consumerProps.put("value.deserializer", "org.apache.kafka.common.serialization.StringDeserializer");
-        consumerProps.put("bootstrap.servers", kafkaContainer.getBootstrapServers());
-        consumerProps.put("auto.offset.reset", "earliest");
-        consumerProps.put("group.id", group);
-        return consumerProps;
     }
 }