generator-jhipster 7.7.0 → 7.9.0

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;
     }
 }

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

@@ -0,0 +1,99 @@
+<%#
+ 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 %>.web.rest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+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.http.MediaType;
+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.reactive.server.WebTestClient;
+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 {
+
+    @Autowired
+    private WebTestClient client;
+
+    @Autowired
+    @Qualifier(KafkaSseProducer.CHANNELNAME)
+    private MessageChannel output;
+
+    @Autowired
+    @Qualifier(KafkaSseConsumer.CHANNELNAME)
+    private MessageChannel input;
+
+    @Autowired
+    private MessageCollector collector;
+
+    @Test
+    void producesMessages() throws InterruptedException {
+        client.post().uri("/api/<%= dasherizedBaseName %>-kafka/publish?message=value-produce")
+            .exchange()
+            .expectStatus()
+            .isNoContent();
+
+        BlockingQueue<Message<?>> messages = collector.forChannel(output);
+        GenericMessage<String> payload = (GenericMessage<String>) messages.take();
+        assertThat(payload.getPayload()).isEqualTo("value-produce");
+    }
+
+    @Test
+    void consumesMessages() {
+        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);
+        input.send(testMessage);
+        String value = client
+            .get()
+            .uri("/api/<%= dasherizedBaseName %>-kafka/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");
+    }
+}

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

@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
@@ -108,7 +105,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 <%_ } _%>
 @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
 @IntegrationTest
-class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class PublicUserResourceIT {
 
     private static final String DEFAULT_LOGIN = "johndoe";
 
@@ -179,7 +176,7 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
 
         // Get all the users
 <%_ if (reactive) { _%>
-        <%= asDto('User') %> foundUser = webTestClient.get().uri("/api/users?sort=id,DESC")
+        <%= asDto('User') %> foundUser = webTestClient.get().uri("/api/users?sort=id,desc")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk()
@@ -246,14 +243,14 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
         userRepository.<% if (reactive) { %>save<% } else { %>saveAndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
   <%_ if (reactive) { _%>
-            webTestClient.get().uri("/api/users?sort=resetKey,DESC").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
-            webTestClient.get().uri("/api/users?sort=password,DESC").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
-            webTestClient.get().uri("/api/users?sort=resetKey,id,DESC").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
-            webTestClient.get().uri("/api/users?sort=id,DESC").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk();
+            webTestClient.get().uri("/api/users?sort=resetKey,desc").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
+            webTestClient.get().uri("/api/users?sort=password,desc").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
+            webTestClient.get().uri("/api/users?sort=resetKey,desc&sort=id,desc").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
+            webTestClient.get().uri("/api/users?sort=id,desc").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk();
   <%_ } else { _%>
             restUserMockMvc.perform(get("/api/users?sort=resetKey,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
             restUserMockMvc.perform(get("/api/users?sort=password,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
-            restUserMockMvc.perform(get("/api/users?sort=resetKey,id,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
+            restUserMockMvc.perform(get("/api/users?sort=resetKey,desc&sort=id,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
             restUserMockMvc.perform(get("/api/users?sort=id,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk());
   <%_ } _%>
     }

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

@@ -54,6 +54,7 @@ import java.util.concurrent.Callable;
 import java.util.function.Function;
 import java.time.Duration;
 import reactor.core.publisher.Mono;
+import reactor.util.retry.Retry;
 <%_ } _%>
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -254,18 +255,20 @@ public final class TestUtil {
     }
 <%_ } _%>
 <%_ if (searchEngineCouchbase) { _%>
+
     public static <T> void retryUntilNotEmpty(Callable<Iterable<T>> iterableCallable) {
-        Mono.defer(
-                () -> Mono.fromCallable(iterableCallable)
-                    .flatMapIterable(Function.identity())
-                    .next()
-                    .switchIfEmpty(Mono.error(new NoSuchElementException()))
-            )
-            .retry()
-            .timeout(Duration.ofSeconds(60))
-            .block();
-    }
+        Mono.defer(() ->
+            Mono
+                .fromCallable(iterableCallable)
+                .flatMapIterable(Function.identity())
+                .next()
+                .switchIfEmpty(Mono.error(new NoSuchElementException()))
+        )
+        .retry()
+        .timeout(Duration.ofMinutes(15))
+        .block();
 
+    }
 <%_ } _%>
 
     private TestUtil() {}

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

@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (!skipUserManagement) { _%>
   <%_ if (databaseTypeSql && reactive) { _%>
@@ -74,7 +71,7 @@ import static org.hamcrest.Matchers.not;
 @AutoConfigureMockMvc
 <%_ } _%>
 @IntegrationTest
-class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class UserJWTControllerIT {
 
 <%_ if (!skipUserManagement) { _%>
     @Autowired