generator-jhipster 7.1.0 → 7.4.0

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

@@ -18,23 +18,23 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 import <%= packageName %>.IntegrationTest;
-<%_ if (databaseType === 'sql' && reactive) { _%>
+<%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.config.TestSecurityConfiguration;
 <%_ } _%>
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 import <%= packageName %>.repository.UserRepository;
-<%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ if (searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
-<%_ if (databaseType === 'sql' && reactive) { _%>
+<%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.service.EntityManager;
 <%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
@@ -45,14 +45,14 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 <%_ } else { _%>
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 <%_ } _%>
-<%_ if (cacheManagerIsAvailable === true) { _%>
+<%_ if (cacheManagerIsAvailable) { _%>
 import org.springframework.cache.CacheManager;
 <%_ } _%>
-<%_ if (cacheProvider === 'memcached' ) { _%>
+<%_ if (cacheProviderMemcached) { _%>
 import org.springframework.cache.support.NoOpCacheManager;
 <%_ } _%>
 import org.springframework.http.MediaType;
-<%_ if (databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeCouchbase) { _%>
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.test.context.TestSecurityContextHolder;
 <%_ } _%>
@@ -64,34 +64,34 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 <%_ if (!reactive) { _%>
 import org.springframework.test.web.servlet.MockMvc;
 <%_ } _%>
-<%_ if (databaseType === 'sql' && !reactive) { _%>
+<%_ if (databaseTypeSql && !reactive) { _%>
 import org.springframework.transaction.annotation.Transactional;
 <%_ } _%>
-<%_ if (reactive && searchEngine === 'elasticsearch') { _%>
+<%_ if (reactive && searchEngineElasticsearch) { _%>
 import reactor.core.publisher.Mono;
 <%_ } _%>
 
-<%_ if (databaseType === 'sql' && !reactive) { _%>
+<%_ if (databaseTypeSql && !reactive) { _%>
 import javax.persistence.EntityManager;
 <%_ } _%>
-<%_ if (databaseType === 'cassandra' || databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%>
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 <%_ } _%>
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseTypeCassandra) { _%>
 import java.util.UUID;
 <%_ } _%>
 
 <%_ if (reactive) { _%>
 import static org.assertj.core.api.Assertions.assertThat;
 <%_ } _%>
-<%_ if (reactive && searchEngine === 'elasticsearch') { _%>
+<%_ if (reactive && searchEngineElasticsearch) { _%>
 import static org.mockito.Mockito.*;
 <%_ } _%>
 <%_ if (!reactive) { _%>
-    <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
+  <%_ 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.*;
@@ -109,7 +109,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
 <%_ } _%>
 @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
 @IntegrationTest
-class PublicUserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCassandraTest <% } %>{
+class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
 
     private static final String DEFAULT_LOGIN = "johndoe";
 
@@ -120,7 +120,7 @@ class PublicUserResourceIT <% if (databaseType === 'cassandra') { %>extends Abst
 
     @Autowired
     private UserRepository userRepository;
-    <%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ if (searchEngineElasticsearch) { _%>
 
     /**
      * This repository is mocked in the <%= packageName %>.repository.search test package.
@@ -129,71 +129,71 @@ class PublicUserResourceIT <% if (databaseType === 'cassandra') { %>extends Abst
      */
     @Autowired
     private UserSearchRepository mockUserSearchRepository;
-    <%_ } _%>
-    <%_ if (databaseType === 'sql') { _%>
+<%_ } _%>
+<%_ if (databaseTypeSql) { _%>
 
     @Autowired
     private EntityManager em;
-    <%_ } _%>
-    <%_ if (cacheManagerIsAvailable === true) { _%>
+<%_ } _%>
+<%_ if (cacheManagerIsAvailable) { _%>
 
     @Autowired
     private CacheManager cacheManager;
-    <%_ } _%>
+<%_ } _%>
 
     @Autowired
-    <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
     private WebTestClient webTestClient;
-    <%_ } else { _%>
+<%_ } else { _%>
     private MockMvc restUserMockMvc;
-    <%_ } _%>
+<%_ } _%>
 
     private <%= asEntity('User') %> user;
 
-    <%_ if (cacheManagerIsAvailable === true) { _%>
+<%_ if (cacheManagerIsAvailable) { _%>
     @BeforeEach
     public void setup() {
         cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear();
         cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE).clear();
     }
 
-    <%_ } _%>
-    <%_ if (reactive && testsNeedCsrf) { _%>
+<%_ } _%>
+<%_ if (reactive && testsNeedCsrf) { _%>
     @BeforeEach
     public void setupCsrf() {
         webTestClient = webTestClient.mutateWith(csrf());
     }
 
-    <%_ } _%>
+<%_ } _%>
     @BeforeEach
     public void initTest() {
-        user = UserResourceIT.initTestUser(userRepository<% if (databaseType === 'sql') { %>, em<% } %>);
+        user = UserResourceIT.initTestUser(userRepository<% if (databaseTypeSql) { %>, em<% } %>);
     }
 
     @Test
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+<%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+<%_ } _%>
     void getAllPublicUsers()<% if (!reactive) { %> throws Exception<% } %> {
         // Initialize the database
-        userRepository.<% if (databaseType === 'sql' && reactive && authenticationType === 'oauth2') { %>create<% } else { %>save<% } %><% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
         // Get all the users
-        <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(get("/api/users<% if (databaseType === 'sql') { %>?sort=id,desc<% } %>")
+<%_ if (!reactive) { _%>
+        restUserMockMvc.perform(get("/api/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
             .andExpect(jsonPath("$.[*].login").value(hasItem(DEFAULT_LOGIN)))
-<%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
+  <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
             .andExpect(jsonPath("$.[*].<%= field.fieldName %>").value(hasItem(DEFAULT_<%= field.fieldName.toUpperCase() %>)))
-<%_ } _%>
+  <%_ } _%>
             .andExpect(jsonPath("$.[*].email").doesNotExist())
-            <%_ if (databaseType !== 'cassandra') { _%>
+  <%_ if (!databaseTypeCassandra) { _%>
             .andExpect(jsonPath("$.[*].imageUrl").doesNotExist())
-            <%_ } _%>
+  <%_ } _%>
             .andExpect(jsonPath("$.[*].langKey").doesNotExist());
-        <%_ } else { _%>
+<%_ } else { _%>
         <%= asDto('User') %> foundUser = webTestClient.get().uri("/api/users?sort=id,DESC")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
@@ -202,20 +202,20 @@ class PublicUserResourceIT <% if (databaseType === 'cassandra') { %>extends Abst
             .returnResult(<%= asDto('User') %>.class).getResponseBody().blockFirst();
 
         assertThat(foundUser.getLogin()).isEqualTo(DEFAULT_LOGIN);
-<%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
+  <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
         assertThat(foundUser.get<%= javaBeanCase(field.fieldName) %>()).isEqualTo(DEFAULT_<%= field.fieldName.toUpperCase() %>);
-<%_ } _%>       
-        <% } _%>
+  <%_ } _%>
+<% } _%>
     }
 
-    <%_ if ((databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase')
-            && (!(authenticationType === 'oauth2' && applicationType === 'microservice'))) { _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase)
+  && (!(authenticationTypeOauth2 && applicationTypeMicroservice))) { _%>
     @Test
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void getAllAuthorities()<% if (!reactive) { %> throws Exception<% } %> {
-        <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
         restUserMockMvc.perform(get("/api/authorities")
             .accept(MediaType.APPLICATION_JSON)
             .contentType(MediaType.APPLICATION_JSON))
@@ -223,7 +223,7 @@ class PublicUserResourceIT <% if (databaseType === 'cassandra') { %>extends Abst
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
             .andExpect(jsonPath("$").isArray())
             .andExpect(jsonPath("$").value(hasItems(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN)));
-        <%_ } else { _%>
+  <%_ } else { _%>
         webTestClient.get().uri("/api/authorities")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
@@ -233,30 +233,30 @@ class PublicUserResourceIT <% if (databaseType === 'cassandra') { %>extends Abst
             .jsonPath("$").isArray()
             .jsonPath("$[?(@=='" + AuthoritiesConstants.ADMIN + "')]").hasJsonPath()
             .jsonPath("$[?(@=='" + AuthoritiesConstants.USER + "')]").hasJsonPath();
-        <%_ } _%>
+  <%_ } _%>
     }
-    <%_ } _%>
+<%_ } _%>
 
-    <%_ if (databaseType === 'sql' && authenticationType !== 'oauth2') { _%>
+<%_ if (databaseTypeSql && !authenticationTypeOauth2) { _%>
     @Test
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void getAllUsersSortedByParameters() throws Exception {
         // Initialize the database
         userRepository.<% if (reactive) { %>save<% } else { %>saveAndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
-        <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
             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=id,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk());
-        <%_ } else { _%>
+  <%_ } 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

@@ -18,17 +18,10 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (searchEngine === 'couchbase') { _%>
-import com.couchbase.client.core.time.Delay;
-import com.couchbase.client.java.util.retry.Retry;
-<%_ } _%>
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-<%_ if (authenticationType === 'oauth2') { _%>
-import <%= packageName %>.security.SecurityUtils;
-<%_ } _%>
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -37,30 +30,16 @@ import org.springframework.format.datetime.standard.DateTimeFormatterRegistrar;
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.format.support.FormattingConversionService;
 <%_ } _%>
-<%_ if (databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeCouchbase) { _%>
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.test.context.TestSecurityContextHolder;
 <%_ } _%>
-<%_ if (searchEngine === 'couchbase') { _%>
-import rx.Observable;
-import rx.internal.util.UtilityFunctions;
-<%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
-import org.springframework.security.oauth2.core.oidc.OidcIdToken;
-import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
-import org.springframework.security.oauth2.core.oidc.user.OidcUser;
-<%_ } _%>
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
-<%_ if (authenticationType === 'oauth2') { _%>
-import java.util.Collection;
-<%_ } _%>
-<%_ if (databaseType === 'sql') { _%>
+<%_ if (databaseTypeSql) { _%>
 import java.util.List;
 
 import javax.persistence.EntityManager;
@@ -69,10 +48,13 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 <%_ } _%>
-<%_ if (searchEngine === 'couchbase') { _%>
+<%_ 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;
 <%_ } _%>
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -83,9 +65,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 public final class TestUtil {
 
     private static final ObjectMapper mapper = createObjectMapper();
-<%_ if (searchEngine === 'couchbase') { _%>
+<%_ if (searchEngineCouchbase) { _%>
     private static final int MAX_ATTEMPTS = 3;
-    private static final Delay DEFAULT_DELAY = Delay.exponential(TimeUnit.SECONDS);
+    // private static final Delay DEFAULT_DELAY = Delay.exponential(TimeUnit.SECONDS);
 <%_ } _%>
 
     private static ObjectMapper createObjectMapper() {
@@ -121,15 +103,15 @@ public final class TestUtil {
         }
         return byteArray;
     }
-    <%_ if (databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeCouchbase) { _%>
 
     /**
-     * Mock user authentication for Spring SpEL expression used in {@link <%= packageName %>.repository.N1qlCouchbaseRepository}.
+     * Mock user authentication
      */
     public static void mockAuthentication() {
         TestSecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("user", null));
     }
-    <%_ } _%>
+<%_ } _%>
 
     /**
      * A matcher that tests that the examined string represents the same instant as the reference datetime.
@@ -239,10 +221,10 @@ public final class TestUtil {
         // Test with an instance of the same class
         T domainObject2 = clazz.getConstructor().newInstance();
         assertThat(domainObject1).isNotEqualTo(domainObject2);
-        <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase) { _%>
         // HashCodes are equals because the objects are not persisted yet
         assertThat(domainObject1).hasSameHashCodeAs(domainObject2);
-        <%_ } _%>
+<%_ } _%>
     }
 <%_ if (!reactive) { _%>
 
@@ -258,7 +240,7 @@ public final class TestUtil {
         return dfcs;
     }
 <%_ } _%>
-<%_ if (databaseType === 'sql') { _%>
+<%_ if (databaseTypeSql) { _%>
 
     /**
      * Makes a an executes a query to the EntityManager finding all stored objects.
@@ -276,31 +258,19 @@ public final class TestUtil {
         return allQuery.getResultList();
     }
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
-
-    final static String ID_TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9" +
-        ".eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsIm" +
-        "p0aSI6ImQzNWRmMTRkLTA5ZjYtNDhmZi04YTkzLTdjNmYwMzM5MzE1OSIsImlhdCI6MTU0M" +
-        "Tk3MTU4MywiZXhwIjoxNTQxOTc1MTgzfQ.QaQOarmV8xEUYV7yvWzX3cUE_4W1luMcWCwpr" +
-        "oqqUrg";
-
-    public static OAuth2AuthenticationToken authenticationToken(OidcIdToken idToken) {
-        Collection<GrantedAuthority> authorities = SecurityUtils.extractAuthorityFromClaims(idToken.getClaims());
-        OidcUser user = new DefaultOidcUser(authorities, idToken);
-        return new OAuth2AuthenticationToken(user, authorities, "oidc");
-    }
-<%_ } _%>
-<%_ if (searchEngine === 'couchbase') { _%>
-
+<%_ if (searchEngineCouchbase) { _%>
     public static <T> void retryUntilNotEmpty(Callable<Iterable<T>> iterableCallable) {
-        Retry.wrapForRetry(
-            Observable.fromCallable(iterableCallable)
-                .flatMapIterable(UtilityFunctions.identity())
-                .switchIfEmpty(Observable.error(new NoSuchElementException())),
-            MAX_ATTEMPTS, DEFAULT_DELAY)
-            .toBlocking()
-            .subscribe();
+        Mono.defer(
+                () -> Mono.fromCallable(iterableCallable)
+                    .flatMapIterable(Function.identity())
+                    .next()
+                    .switchIfEmpty(Mono.error(new NoSuchElementException()))
+            )
+            .retry()
+            .timeout(Duration.ofSeconds(5))
+            .block();
     }
+
 <%_ } _%>
 
     private TestUtil() {}

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

@@ -18,14 +18,14 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (!skipUserManagement) { _%>
-    <%_ if (databaseType === 'sql' && reactive) { _%>
+  <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
-    <%_ } _%>
+  <%_ } _%>
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 import <%= packageName %>.repository.UserRepository;
 <%_ } _%>
@@ -46,11 +46,11 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 <%_ } _%>
 <%_ if (!reactive) { _%>
 import org.springframework.test.web.servlet.MockMvc;
-    <%_ if (databaseType === 'sql') { _%>
+  <%_ if (databaseTypeSql) { _%>
 import org.springframework.transaction.annotation.Transactional;
-    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseTypeCassandra) { _%>
 
 import java.util.UUID;
 <%_ } _%>
@@ -75,42 +75,42 @@ import static org.hamcrest.Matchers.not;
 @AutoConfigureWebTestClient
 <%_ } _%>
 @IntegrationTest
-class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends AbstractCassandraTest <% } %>{
+class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
 
-    <%_ if (!skipUserManagement) { _%>
+<%_ if (!skipUserManagement) { _%>
     @Autowired
     private UserRepository userRepository;
 
     @Autowired
     private PasswordEncoder passwordEncoder;
 
-    <%_ }  _%>
+<%_ } _%>
     @Autowired
-    <%_ if (reactive) { _%>
+<%_ if (reactive) { _%>
     private WebTestClient webTestClient;
-    <%_ } else { _%>
+<%_ } else { _%>
     private MockMvc mockMvc;
-    <%_ }  _%>
+<%_ } _%>
 
     @Test
 <%_ if (!skipUserManagement) { _%>
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void testAuthorize() throws Exception {
         <%= asEntity('User') %> user = new <%= asEntity('User') %>();
-        <%_ if (databaseType === 'cassandra') { _%>
+  <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
-        <%_ } _%>
+  <%_ } _%>
         user.setLogin("user-jwt-controller");
         user.setEmail("user-jwt-controller@example.com");
         user.setActivated(true);
         user.setPassword(passwordEncoder.encode("test"));
-        <%_ if (databaseType === 'sql' && reactive) { _%>
+  <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
-        <%_ } _%>
+  <%_ } _%>
 
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
         LoginVM login = new LoginVM();
         login.setUsername("user-jwt-controller");
@@ -120,7 +120,7 @@ class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends Abstr
         login.setUsername("test");
 <%_ } _%>
         login.setPassword("test");
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         mockMvc.perform(post("/api/authenticate")
             .contentType(MediaType.APPLICATION_JSON)
             .content(TestUtil.convertObjectToJsonBytes(login)))
@@ -129,7 +129,7 @@ class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends Abstr
             .andExpect(jsonPath("$.id_token").isNotEmpty())
             .andExpect(header().string("Authorization", not(nullValue())))
             .andExpect(header().string("Authorization", not(is(emptyString()))));
-        <%_ } else { _%>
+<%_ } else { _%>
         webTestClient.post().uri("/api/authenticate")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(login))
@@ -138,28 +138,28 @@ class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends Abstr
             .expectHeader().valueMatches("Authorization", "Bearer .+")
             .expectBody()
             .jsonPath("$.id_token").isNotEmpty();
-        <%_ } _%>
+<%_ } _%>
     }
 
     @Test
 <%_ if (!skipUserManagement) { _%>
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void testAuthorizeWithRememberMe() throws Exception {
         <%= asEntity('User') %> user = new <%= asEntity('User') %>();
-        <%_ if (databaseType === 'cassandra') { _%>
+  <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
-        <%_ } _%>
+  <%_ } _%>
         user.setLogin("user-jwt-controller-remember-me");
         user.setEmail("user-jwt-controller-remember-me@example.com");
         user.setActivated(true);
         user.setPassword(passwordEncoder.encode("test"));
-        <%_ if (databaseType === 'sql' && reactive) { _%>
+  <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
-        <%_ } _%>
+  <%_ } _%>
 
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
         LoginVM login = new LoginVM();
         login.setUsername("user-jwt-controller-remember-me");
@@ -170,7 +170,7 @@ class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends Abstr
 <%_ } _%>
         login.setPassword("test");
         login.setRememberMe(true);
-        <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
         mockMvc.perform(post("/api/authenticate")
             .contentType(MediaType.APPLICATION_JSON)
             .content(TestUtil.convertObjectToJsonBytes(login)))
@@ -179,7 +179,7 @@ class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends Abstr
             .andExpect(jsonPath("$.id_token").isNotEmpty())
             .andExpect(header().string("Authorization", not(nullValue())))
             .andExpect(header().string("Authorization", not(is(emptyString()))));
-        <%_ } else { _%>
+<%_ } else { _%>
         webTestClient.post().uri("/api/authenticate")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(login))
@@ -188,7 +188,7 @@ class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends Abstr
             .expectHeader().valueMatches("Authorization", "Bearer .+")
             .expectBody()
             .jsonPath("$.id_token").isNotEmpty();
-        <%_ } _%>
+<%_ } _%>
     }
 
     @Test
@@ -196,14 +196,14 @@ class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends Abstr
         LoginVM login = new LoginVM();
         login.setUsername("wrong-user");
         login.setPassword("wrong password");
-        <%_ if (!reactive) { _%>
+<%_ 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 { _%>
+<%_ } else { _%>
         webTestClient.post().uri("/api/authenticate")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(login))
@@ -212,6 +212,6 @@ class UserJWTControllerIT <% if (databaseType === 'cassandra') { %>extends Abstr
             .expectHeader().doesNotExist("Authorization")
             .expectBody()
             .jsonPath("$.id_token").doesNotExist();
-        <%_ } _%>
+<%_ } _%>
     }
 }