generator-jhipster 7.5.0 → 7.8.0

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/LogoutResourceIT.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -22,11 +22,11 @@ package <%= packageName %>.web.rest;
 import static <%= packageName %>.test.util.OAuth2TestUtil.ID_TOKEN;
 import static <%= packageName %>.test.util.OAuth2TestUtil.authenticationToken;
 import static <%= packageName %>.test.util.OAuth2TestUtil.registerAuthenticationToken;
-<%_ if (!reactive) { _%>
+<%_ if (reactive) { _%>
+import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.*;
+<%_ } else { _%>
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-<%_ } else { _%>
-import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.*;
 <%_ } _%>
 
 import <%= packageName %>.IntegrationTest;
@@ -39,15 +39,15 @@ import org.springframework.http.MediaType;
 import org.springframework.security.oauth2.client.<% if (reactive) { %>Reactive<% } %>OAuth2AuthorizedClientService;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.<% if (reactive) { %>Reactive<% } %>ClientRegistrationRepository;
-<%_ if (!reactive) { _%>
+<%_ if (reactive) { _%>
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.web.reactive.server.WebTestClient;
+<%_ } else { _%>
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
-<%_ } else { _%>
-import org.springframework.context.ApplicationContext;
-import org.springframework.test.web.reactive.server.WebTestClient;
 <%_ } _%>
 
 import java.util.Collections;
@@ -72,10 +72,10 @@ class LogoutResourceIT {
     @Autowired
     private ClientRegistration clientRegistration;
 
-<%_ if (!reactive) { _%>
-    private MockMvc restLogoutMockMvc;
-<%_ } else { _%>
+<%_ if (reactive) { _%>
     private WebTestClient webTestClient;
+<%_ } else { _%>
+    private MockMvc restLogoutMockMvc;
 <%_ } _%>
 
     private Map<String, Object> claims;
@@ -86,7 +86,12 @@ class LogoutResourceIT {
         claims.put("groups", Collections.singletonList(AuthoritiesConstants.USER));
         claims.put("sub", 123);
 
-<%_ if (!reactive) { _%>
+<%_ if (reactive) { _%>
+        this.webTestClient = WebTestClient.bindToApplicationContext(this.context)
+            .apply(springSecurity())
+            .configureClient()
+            .build();
+<%_ } else { _%>
         SecurityContextHolder
             .getContext()
             .setAuthentication(registerAuthenticationToken(authorizedClientService, clientRegistration, authenticationToken(claims)));
@@ -94,26 +99,13 @@ class LogoutResourceIT {
         authInjector.afterPropertiesSet();
 
         this.restLogoutMockMvc = MockMvcBuilders.webAppContextSetup(this.context).build();
-<%_ } else { _%>
-        this.webTestClient = WebTestClient.bindToApplicationContext(this.context)
-            .apply(springSecurity())
-            .configureClient()
-            .build();
 <%_ } _%>
     }
 
     @Test
     void getLogoutInformation() <% if (!reactive) { %>throws Exception <% } %>{
         final String ORIGIN_URL = "http://localhost:8080";
-<%_ if (!reactive) { _%>
-        String logoutUrl = this.registrations.findByRegistrationId("oidc").getProviderDetails()
-            .getConfigurationMetadata().get("end_session_endpoint").toString();
-        logoutUrl = logoutUrl + "?id_token_hint=" + ID_TOKEN + "&post_logout_redirect_uri=" + ORIGIN_URL;
-        restLogoutMockMvc.perform(post("http://localhost:8080/api/logout").header(HttpHeaders.ORIGIN, ORIGIN_URL))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-            .andExpect(jsonPath("$.logoutUrl").value(logoutUrl));
-<%_ } else { _%>
+<%_ if (reactive) { _%>
         String logoutUrl = this.registrations.findByRegistrationId("oidc")
             .map(oidc -> oidc.getProviderDetails().getConfigurationMetadata()
                 .get("end_session_endpoint").toString()).block();
@@ -125,6 +117,14 @@ class LogoutResourceIT {
             .expectHeader().contentType(MediaType.APPLICATION_JSON_VALUE)
             .expectBody()
             .jsonPath("$.logoutUrl").isEqualTo(logoutUrl);
+<%_ } else { _%>
+        String logoutUrl = this.registrations.findByRegistrationId("oidc").getProviderDetails()
+            .getConfigurationMetadata().get("end_session_endpoint").toString();
+        logoutUrl = logoutUrl + "?id_token_hint=" + ID_TOKEN + "&post_logout_redirect_uri=" + ORIGIN_URL;
+        restLogoutMockMvc.perform(post("http://localhost:8080/api/logout").header(HttpHeaders.ORIGIN, ORIGIN_URL))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(jsonPath("$.logoutUrl").value(logoutUrl));
 <%_ } _%>
     }
 }

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
@@ -35,15 +32,15 @@ import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
 <%_ if (databaseTypeSql && reactive) { _%>
-import <%= packageName %>.service.EntityManager;
+import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-<%_ if (!reactive) { _%>
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-<%_ } else { _%>
+<%_ if (reactive) { _%>
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+<%_ } else { _%>
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 <%_ } _%>
 <%_ if (cacheManagerIsAvailable) { _%>
 import org.springframework.cache.CacheManager;
@@ -60,8 +57,7 @@ import org.springframework.security.test.context.support.WithMockUser;
 <%_ if (reactive) { _%>
 import <%= packageName %>.service.dto.<%= asDto('User') %>;
 import org.springframework.test.web.reactive.server.WebTestClient;
-<%_ } _%>
-<%_ if (!reactive) { _%>
+<%_ } else { _%>
 import org.springframework.test.web.servlet.MockMvc;
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
@@ -88,28 +84,28 @@ import static org.assertj.core.api.Assertions.assertThat;
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import static org.mockito.Mockito.*;
 <%_ } _%>
-<%_ if (!reactive) { _%>
+<%_ if (reactive && testsNeedCsrf) { _%>
+import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
+<%_ } else if (!reactive) { _%>
   <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
 import static org.hamcrest.Matchers.hasItems;
   <%_ } _%>
 import static org.hamcrest.Matchers.hasItem;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-<%_ } else if (testsNeedCsrf) { _%>
-import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
 <%_ } _%>
 
 /**
  * Integration tests for the {@link UserResource} REST controller.
  */
-<%_ if (!reactive) { _%>
-@AutoConfigureMockMvc
+<%_ if (reactive) { _%>
+@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 <%_ } else { _%>
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 <%_ } _%>
 @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
 @IntegrationTest
-class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class PublicUserResourceIT {
 
     private static final String DEFAULT_LOGIN = "johndoe";
 
@@ -179,7 +175,19 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
         userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
         // Get all the users
-<%_ if (!reactive) { _%>
+<%_ if (reactive) { _%>
+        <%= asDto('User') %> foundUser = webTestClient.get().uri("/api/users?sort=id,desc")
+            .accept(MediaType.APPLICATION_JSON)
+            .exchange()
+            .expectStatus().isOk()
+            .expectHeader().contentType(MediaType.APPLICATION_JSON)
+            .returnResult(<%= asDto('User') %>.class).getResponseBody().blockFirst();
+
+        assertThat(foundUser.getLogin()).isEqualTo(DEFAULT_LOGIN);
+  <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
+        assertThat(foundUser.get<%= javaBeanCase(field.fieldName) %>()).isEqualTo(DEFAULT_<%= field.fieldName.toUpperCase() %>);
+  <%_ } _%>
+<%_ } else { _%>
         restUserMockMvc.perform(get("/api/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
@@ -193,18 +201,6 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
             .andExpect(jsonPath("$.[*].imageUrl").doesNotExist())
   <%_ } _%>
             .andExpect(jsonPath("$.[*].langKey").doesNotExist());
-<%_ } else { _%>
-        <%= asDto('User') %> foundUser = webTestClient.get().uri("/api/users?sort=id,DESC")
-            .accept(MediaType.APPLICATION_JSON)
-            .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType(MediaType.APPLICATION_JSON)
-            .returnResult(<%= asDto('User') %>.class).getResponseBody().blockFirst();
-
-        assertThat(foundUser.getLogin()).isEqualTo(DEFAULT_LOGIN);
-  <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
-        assertThat(foundUser.get<%= javaBeanCase(field.fieldName) %>()).isEqualTo(DEFAULT_<%= field.fieldName.toUpperCase() %>);
-  <%_ } _%>
 <% } _%>
     }
 
@@ -215,15 +211,7 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
     @Transactional
   <%_ } _%>
     void getAllAuthorities()<% if (!reactive) { %> throws Exception<% } %> {
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(get("/api/authorities")
-            .accept(MediaType.APPLICATION_JSON)
-            .contentType(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-            .andExpect(jsonPath("$").isArray())
-            .andExpect(jsonPath("$").value(hasItems(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN)));
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.get().uri("/api/authorities")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
@@ -233,6 +221,14 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
             .jsonPath("$").isArray()
             .jsonPath("$[?(@=='" + AuthoritiesConstants.ADMIN + "')]").hasJsonPath()
             .jsonPath("$[?(@=='" + AuthoritiesConstants.USER + "')]").hasJsonPath();
+  <%_ } else { _%>
+        restUserMockMvc.perform(get("/api/authorities")
+            .accept(MediaType.APPLICATION_JSON)
+            .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(jsonPath("$").isArray())
+            .andExpect(jsonPath("$").value(hasItems(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN)));
   <%_ } _%>
     }
 <%_ } _%>
@@ -246,16 +242,16 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
         // Initialize the database
         userRepository.<% if (reactive) { %>save<% } else { %>saveAndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
-  <%_ if (!reactive) { _%>
+  <%_ 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,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());
-  <%_ } else { _%>
-            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();
   <%_ } _%>
     }
 <%_ } _%>

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -51,7 +51,6 @@ import javax.persistence.criteria.Root;
 <%_ if (searchEngineCouchbase) { _%>
 import java.util.NoSuchElementException;
 import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.time.Duration;
 import reactor.core.publisher.Mono;
@@ -65,10 +64,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 public final class TestUtil {
 
     private static final ObjectMapper mapper = createObjectMapper();
-<%_ if (searchEngineCouchbase) { _%>
-    private static final int MAX_ATTEMPTS = 3;
-    // private static final Delay DEFAULT_DELAY = Delay.exponential(TimeUnit.SECONDS);
-<%_ } _%>
 
     private static ObjectMapper createObjectMapper() {
         ObjectMapper mapper = new ObjectMapper();
@@ -267,7 +262,7 @@ public final class TestUtil {
                     .switchIfEmpty(Mono.error(new NoSuchElementException()))
             )
             .retry()
-            .timeout(Duration.ofSeconds(5))
+            .timeout(Duration.ofSeconds(60))
             .block();
     }
 

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (!skipUserManagement) { _%>
   <%_ if (databaseTypeSql && reactive) { _%>
@@ -32,10 +29,10 @@ import <%= packageName %>.repository.UserRepository;
 import <%= packageName %>.web.rest.vm.LoginVM;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-<%_ if (!reactive) { _%>
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-<%_ } else { _%>
+<%_ if (reactive) { _%>
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+<%_ } else { _%>
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 <%_ } _%>
 import org.springframework.http.MediaType;
 <%_ if (!skipUserManagement) { _%>
@@ -43,8 +40,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 <%_ } _%>
 <%_ if (reactive) { _%>
 import org.springframework.test.web.reactive.server.WebTestClient;
-<%_ } _%>
-<%_ if (!reactive) { _%>
+<%_ } else { _%>
 import org.springframework.test.web.servlet.MockMvc;
   <%_ if (databaseTypeSql) { _%>
 import org.springframework.transaction.annotation.Transactional;
@@ -69,13 +65,13 @@ import static org.hamcrest.Matchers.not;
 /**
  * Integration tests for the {@link UserJWTController} REST controller.
  */
-<%_ if (!reactive) { _%>
-@AutoConfigureMockMvc
+<%_ if (reactive) { _%>
+@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 <%_ } else { _%>
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 <%_ } _%>
 @IntegrationTest
-class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class UserJWTControllerIT {
 
 <%_ if (!skipUserManagement) { _%>
     @Autowired
@@ -120,16 +116,7 @@ class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCass
         login.setUsername("test");
 <%_ } _%>
         login.setPassword("test");
-<%_ if (!reactive) { _%>
-        mockMvc.perform(post("/api/authenticate")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(login)))
-            .andExpect(status().isOk())
-            .andExpect(jsonPath("$.id_token").isString())
-            .andExpect(jsonPath("$.id_token").isNotEmpty())
-            .andExpect(header().string("Authorization", not(nullValue())))
-            .andExpect(header().string("Authorization", not(is(emptyString()))));
-<%_ } else { _%>
+<%_ if (reactive) { _%>
         webTestClient.post().uri("/api/authenticate")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(login))
@@ -138,6 +125,15 @@ class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCass
             .expectHeader().valueMatches("Authorization", "Bearer .+")
             .expectBody()
             .jsonPath("$.id_token").isNotEmpty();
+<%_ } else { _%>
+        mockMvc.perform(post("/api/authenticate")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(login)))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id_token").isString())
+            .andExpect(jsonPath("$.id_token").isNotEmpty())
+            .andExpect(header().string("Authorization", not(nullValue())))
+            .andExpect(header().string("Authorization", not(is(emptyString()))));
 <%_ } _%>
     }
 
@@ -170,16 +166,7 @@ class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCass
 <%_ } _%>
         login.setPassword("test");
         login.setRememberMe(true);
-<%_ if (!reactive) { _%>
-        mockMvc.perform(post("/api/authenticate")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(login)))
-            .andExpect(status().isOk())
-            .andExpect(jsonPath("$.id_token").isString())
-            .andExpect(jsonPath("$.id_token").isNotEmpty())
-            .andExpect(header().string("Authorization", not(nullValue())))
-            .andExpect(header().string("Authorization", not(is(emptyString()))));
-<%_ } else { _%>
+<%_ if (reactive) { _%>
         webTestClient.post().uri("/api/authenticate")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(login))
@@ -188,6 +175,15 @@ class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCass
             .expectHeader().valueMatches("Authorization", "Bearer .+")
             .expectBody()
             .jsonPath("$.id_token").isNotEmpty();
+<%_ } else { _%>
+        mockMvc.perform(post("/api/authenticate")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(login)))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id_token").isString())
+            .andExpect(jsonPath("$.id_token").isNotEmpty())
+            .andExpect(header().string("Authorization", not(nullValue())))
+            .andExpect(header().string("Authorization", not(is(emptyString()))));
 <%_ } _%>
     }
 
@@ -196,14 +192,7 @@ class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCass
         LoginVM login = new LoginVM();
         login.setUsername("wrong-user");
         login.setPassword("wrong password");
-<%_ if (!reactive) { _%>
-        mockMvc.perform(post("/api/authenticate")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(login)))
-            .andExpect(status().isUnauthorized())
-            .andExpect(jsonPath("$.id_token").doesNotExist())
-            .andExpect(header().doesNotExist("Authorization"));
-<%_ } else { _%>
+<%_ if (reactive) { _%>
         webTestClient.post().uri("/api/authenticate")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(login))
@@ -212,6 +201,13 @@ class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCass
             .expectHeader().doesNotExist("Authorization")
             .expectBody()
             .jsonPath("$.id_token").doesNotExist();
+<%_ } else { _%>
+        mockMvc.perform(post("/api/authenticate")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(login)))
+            .andExpect(status().isUnauthorized())
+            .andExpect(jsonPath("$.id_token").doesNotExist())
+            .andExpect(header().doesNotExist("Authorization"));
 <%_ } _%>
     }
 }