generator-jhipster 7.1.0 → 7.4.0

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

@@ -18,53 +18,53 @@
 -%>
 package <%= packageName %>.service;
 
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.config.Constants;
-<%_ if ((databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') && authenticationType === 'session' && !reactive) { _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.domain.PersistentToken;
 <%_ } _%>
-<%_ if (databaseType !== 'no') { _%>
+<%_ if (!databaseTypeNo) { _%>
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 <%_ } _%>
-<%_ if ((databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') && authenticationType === 'session' && !reactive) { _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.repository.PersistentTokenRepository;
 <%_ } _%>
-<%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ if (searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
-<%_ if (databaseType !== 'no') { _%>
+<%_ if (!databaseTypeNo) { _%>
 import <%= packageName %>.repository.UserRepository;
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.security.AuthoritiesConstants;
 <%_ } _%>
 import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
-<%_ if (authenticationType !== 'oauth2' && (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase')) { _%>
+<%_ if (!authenticationTypeOauth2 && (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase)) { _%>
 
 import tech.jhipster.security.RandomUtil;
 <%_ } _%>
 
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 import org.apache.commons.lang3.RandomStringUtils;
 <%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-<%_ if (databaseType === 'sql' && !reactive && authenticationType !== 'oauth2') { _%>
+<%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.auditing.AuditingHandler;
 import org.springframework.data.auditing.DateTimeProvider;
 <%_ } _%>
-<%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
-    <%_ if (!reactive) { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
+  <%_ if (!reactive) { _%>
 import org.springframework.data.domain.Page;
-    <%_ } _%>
+  <%_ } _%>
 import org.springframework.data.domain.PageRequest;
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -72,59 +72,59 @@ import org.springframework.security.oauth2.client.authentication.OAuth2Authentic
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 <%_ } _%>
-<%_ if (databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeCouchbase) { _%>
 import org.springframework.security.test.context.support.WithAnonymousUser;
 <%_ } _%>
-<%_ if (databaseType === 'sql' && !reactive) { _%>
+<%_ if (databaseTypeSql && !reactive) { _%>
 import org.springframework.transaction.annotation.Transactional;
 <%_ } _%>
-<%_ if (searchEngine === 'elasticsearch' && reactive) { _%>
+<%_ if (searchEngineElasticsearch && reactive) { _%>
 import reactor.core.publisher.Mono;
 <%_ } _%>
 
-<%_ if (authenticationType !== 'oauth2' && (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase')) { _%>
+<%_ if (!authenticationTypeOauth2 && (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase)) { _%>
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 <%_ } _%>
-<%_ if ((databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') && authenticationType === 'session' && !reactive) { _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 import java.time.LocalDate;
 <%_ } _%>
-<%_ if (databaseType === 'sql' && reactive) { _%>
+<%_ if (databaseTypeSql && reactive) { _%>
 import java.time.ZoneOffset;
 <%_ } _%>
-<%_ if (databaseType === 'sql' && authenticationType !== 'oauth2') { _%>
+<%_ if (databaseTypeSql && !authenticationTypeOauth2) { _%>
 import java.time.LocalDateTime;
 <%_ } _%>
-<%_ if (authenticationType !== 'oauth2' || reactive) { _%>
+<%_ if (!authenticationTypeOauth2 || reactive) { _%>
 import java.util.List;
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 <%_ } _%>
-<%_ if (authenticationType !== 'oauth2' && ['sql', 'mongodb', 'neo4j', 'couchbase'].includes(databaseType)) { _%>
+<%_ if (!authenticationTypeOauth2 && (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase)) { _%>
 import java.util.Optional;
 <%_ } _%>
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseTypeCassandra) { _%>
 import java.util.UUID;
 <%_ } _%>
 
-<%_ if (databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeCouchbase) { _%>
 import static <%= packageName %>.web.rest.TestUtil.mockAuthentication;
 <%_ } _%>
 import static org.assertj.core.api.Assertions.assertThat;
-<%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ if (searchEngineElasticsearch) { _%>
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 <%_ } _%>
-<%_ if (reactive && searchEngine === 'elasticsearch') { _%>
+<%_ if (reactive && searchEngineElasticsearch) { _%>
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.any;
 <%_ } _%>
-<%_ if (databaseType === 'sql' && !reactive && authenticationType !== 'oauth2') { _%>
+<%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
 import static org.mockito.Mockito.when;
 <%_ } _%>
 
@@ -132,10 +132,10 @@ import static org.mockito.Mockito.when;
  * Integration tests for {@link UserService}.
  */
 @IntegrationTest
-<%_ if (databaseType === 'sql' && !reactive) { _%>
+<%_ if (databaseTypeSql && !reactive) { _%>
 @Transactional
 <%_ } _%>
-class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCassandraTest <% } %>{
+class UserServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
 
     private static final String DEFAULT_LOGIN = "johndoe";
 
@@ -145,25 +145,25 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
 
     private static final String DEFAULT_LASTNAME = "doe";
 
-    <%_ if (databaseType !== 'cassandra') { _%>
+<%_ if (!databaseTypeCassandra) { _%>
     private static final String DEFAULT_IMAGEURL = "http://placehold.it/50x50";
 
-    <%_ } _%>
+<%_ } _%>
     private static final String DEFAULT_LANGKEY = "dummy";
 
-    <%_ if ((databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') && authenticationType === 'session' && !reactive) { _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
     @Autowired
     private PersistentTokenRepository persistentTokenRepository;
 
-    <%_ } _%>
-    <%_ if (databaseType !== 'no') { _%>
+<%_ } _%>
+<%_ if (!databaseTypeNo) { _%>
     @Autowired
     private UserRepository userRepository;
 
-    <%_ } _%>
+<%_ } _%>
     @Autowired
     private UserService userService;
-    <%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ if (searchEngineElasticsearch) { _%>
 
     /**
      * This repository is mocked in the <%= packageName %>.repository.search test package.
@@ -172,84 +172,84 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
      */
     @Autowired
     private UserSearchRepository mockUserSearchRepository;
-    <%_ } _%>
-    <%_ if (databaseType === 'sql' && !reactive && authenticationType !== 'oauth2') { _%>
+<%_ } _%>
+<%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
 
     @Autowired
     private AuditingHandler auditingHandler;
 
     @MockBean
     private DateTimeProvider dateTimeProvider;
-    <%_ } _%>
-    <%_ if (databaseType !== 'no') { _%>
+<%_ } _%>
+    <%_ if (!databaseTypeNo) { _%>
 
     private <%= asEntity('User') %> user;
     <%_ } _%>
 
-    <%_ if (authenticationType === 'oauth2' ) { _%>
+<%_ if (authenticationTypeOauth2) { _%>
     private Map<String, Object> userDetails;
 
-    <%_ } _%>
+<%_ } _%>
     @BeforeEach
     public void init() {
-        <%_ if (databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeCouchbase) { _%>
         mockAuthentication();
-        <%_ } _%>
-        <%_ if ((databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') && authenticationType === 'session' && !reactive) { _%>
+<%_ } _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
         persistentTokenRepository.deleteAll();
-        <%_ } _%>
-        <%_ if (databaseType === 'sql' && reactive) { _%>
+<%_ } _%>
+<%_ if (databaseTypeSql && reactive) { _%>
         userRepository.deleteAllUserAuthorities().block();
-        <%_ } _%>
-        <%_ if ((reactive && databaseType !== 'no') || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'cassandra' || databaseType === 'couchbase') { _%>
+<%_ } _%>
+<%_ if ((reactive && !databaseTypeNo) || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCassandra || databaseTypeCouchbase) { _%>
         userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
-        <%_ } _%>
-        <%_ if (databaseType !== 'no') { _%>
+<%_ } _%>
+<%_ if (!databaseTypeNo) { _%>
         user = new <%= asEntity('User') %>();
-            <%_ if (databaseType === 'cassandra') { _%>
+  <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
-            <%_ } _%>
+  <%_ } _%>
         user.setLogin(DEFAULT_LOGIN);
-            <%_ if (authenticationType !== 'oauth2') { _%>
+  <%_ if (!authenticationTypeOauth2) { _%>
         user.setPassword(RandomStringUtils.random(60));
-            <%_ } _%>
+  <%_ } _%>
         user.setActivated(true);
         user.setEmail(DEFAULT_EMAIL);
         user.setFirstName(DEFAULT_FIRSTNAME);
         user.setLastName(DEFAULT_LASTNAME);
-            <%_ if (databaseType !== 'cassandra') { _%>
+  <%_ if (!databaseTypeCassandra) { _%>
         user.setImageUrl(DEFAULT_IMAGEURL);
-            <%_ } _%>
+  <%_ } _%>
         user.setLangKey(DEFAULT_LANGKEY);
-            <%_ if (databaseType === 'sql' && reactive) { _%>
+  <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
-            <%_ } _%>
-        <%_ } _%>
-        <%_ if (authenticationType === 'oauth2' ) { _%>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (authenticationTypeOauth2) { _%>
 
         userDetails = new HashMap<>();
         userDetails.put("sub", DEFAULT_LOGIN);
         userDetails.put("email", DEFAULT_EMAIL);
         userDetails.put("given_name", DEFAULT_FIRSTNAME);
         userDetails.put("family_name", DEFAULT_LASTNAME);
-            <%_ if (databaseType !== 'cassandra') { _%>
+  <%_ if (!databaseTypeCassandra) { _%>
         userDetails.put("picture", DEFAULT_IMAGEURL);
-            <%_ } _%>
-        <%_ } _%>
-        <%_ if (databaseType === 'sql' && !reactive && authenticationType !== 'oauth2' ) { _%>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
 
         when(dateTimeProvider.getNow()).thenReturn(Optional.of(LocalDateTime.now()));
         auditingHandler.setDateTimeProvider(dateTimeProvider);
-        <%_ } _%>
+<%_ } _%>
     }
-    <%_ if ((databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') && authenticationType === 'session' && !reactive) { _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 
     @Test
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-        <%_ } _%>
+  <%_ } _%>
     void testRemoveOldPersistentTokens() {
-        userRepository.save<% if (databaseType === 'sql') { %>AndFlush<% } %>(user);
+        userRepository.save<% if (databaseTypeSql) { %>AndFlush<% } %>(user);
         int existingCount = persistentTokenRepository.findByUser(user).size();
         LocalDate today = LocalDate.now();
         generateUserToken(user, "1111-1111", today);
@@ -258,15 +258,15 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
         userService.removeOldPersistentTokens();
         assertThat(persistentTokenRepository.findByUser(user)).hasSize(existingCount + 1);
     }
-    <%_ } _%>
-    <%_ if (authenticationType !== 'oauth2' && (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase')) { _%>
+<%_ } _%>
+<%_ if (!authenticationTypeOauth2 && (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase)) { _%>
 
     @Test
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-        <%_ } _%>
+  <%_ } _%>
     void assertThatUserMustExistToResetPassword() {
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
         Optional<<%= asEntity('User') %>> maybeUser = userService.requestPasswordReset("invalid.login@localhost")<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(maybeUser).isNotPresent();
 
@@ -278,12 +278,12 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-        <%_ } _%>
+  <%_ } _%>
     void assertThatOnlyActivatedUserCanRequestPasswordReset() {
         user.setActivated(false);
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
         Optional<<%= asEntity('User') %>> maybeUser = userService.requestPasswordReset(user.getLogin())<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(maybeUser).isNotPresent();
@@ -291,16 +291,16 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-        <%_ } _%>
+  <%_ } _%>
     void assertThatResetKeyMustNotBeOlderThan24Hours() {
         Instant daysAgo = Instant.now().minus(25, ChronoUnit.HOURS);
         String resetKey = RandomUtil.generateResetKey();
         user.setActivated(true);
         user.setResetDate(daysAgo);
         user.setResetKey(resetKey);
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
         Optional<<%= asEntity('User') %>> maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey())<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(maybeUser).isNotPresent();
@@ -308,15 +308,15 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-        <%_ } _%>
+  <%_ } _%>
     void assertThatResetKeyMustBeValid() {
         Instant daysAgo = Instant.now().minus(25, ChronoUnit.HOURS);
         user.setActivated(true);
         user.setResetDate(daysAgo);
         user.setResetKey("1234");
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
         Optional<<%= asEntity('User') %>> maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey())<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(maybeUser).isNotPresent();
@@ -324,9 +324,9 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-        <%_ } _%>
+  <%_ } _%>
     void assertThatUserCanResetPassword() {
         String oldPassword = user.getPassword();
         Instant daysAgo = Instant.now().minus(2, ChronoUnit.HOURS);
@@ -334,7 +334,7 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
         user.setActivated(true);
         user.setResetDate(daysAgo);
         user.setResetKey(resetKey);
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
         Optional<<%= asEntity('User') %>> maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey())<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(maybeUser).isPresent();
@@ -346,30 +346,30 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-        <%_ } _%>
+  <%_ } _%>
     void assertThatNotActivatedUsersWithNotNullActivationKeyCreatedBefore3DaysAreDeleted() {
         Instant now = Instant.now();
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
         when(dateTimeProvider.getNow()).thenReturn(Optional.of(now.minus(4, ChronoUnit.DAYS)));
-        <%_ } _%>
-        <%_ if (searchEngine === 'elasticsearch' && reactive) { _%>
+  <%_ } _%>
+  <%_ if (searchEngineElasticsearch && reactive) { _%>
         // Configure the mock search repository
         when(mockUserSearchRepository.save(any()))
             .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
         when(mockUserSearchRepository.delete(any())).thenReturn(Mono.empty());
-        <%_ } _%>
+  <%_ } _%>
         user.setActivated(false);
         user.setActivationKey(RandomStringUtils.random(20));
-        <%= asEntity('User') %> dbUser = userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        <%= asEntity('User') %> dbUser = userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
         dbUser.setCreatedDate(now.minus(4, ChronoUnit.DAYS));
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
-        <%_ if (databaseType === 'sql' && reactive) { _%>
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+  <%_ if (databaseTypeSql && reactive) { _%>
         LocalDateTime threeDaysAgo = LocalDateTime.ofInstant(now.minus(3, ChronoUnit.DAYS), ZoneOffset.UTC);
-        <%_ } else { _%>
+  <%_ } else { _%>
         Instant threeDaysAgo = now.minus(3, ChronoUnit.DAYS);
-        <%_ } _%>
+  <%_ } _%>
         List<<%= asEntity('User') %>> users = userRepository.findAllByActivatedIsFalseAndActivationKeyIsNotNullAndCreatedDateBefore(threeDaysAgo)<% if (reactive) { %>
             .collectList().block()<% } %>;
         assertThat(users).isNotEmpty();
@@ -377,64 +377,64 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
         users = userRepository.findAllByActivatedIsFalseAndActivationKeyIsNotNullAndCreatedDateBefore(threeDaysAgo)<% if (reactive) { %>
             .collectList().block()<% } %>;
         assertThat(users).isEmpty();
-        <%_ if (searchEngine === 'elasticsearch') { _%>
+  <%_ if (searchEngineElasticsearch) { _%>
 
         // Verify Elasticsearch mock
         verify(mockUserSearchRepository, times(1)).delete(user);
-        <%_ } _%>
+  <%_ } _%>
     }
 
     @Test
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-        <%_ } _%>
+  <%_ } _%>
     void assertThatNotActivatedUsersWithNullActivationKeyCreatedBefore3DaysAreNotDeleted() {
         Instant now = Instant.now();
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
-        when(dateTimeProvider.getNow()).thenReturn(Optional.of(now.minus(4, ChronoUnit.DAYS)<% if (databaseType === 'sql' && reactive) { %>.atOffset(ZoneOffset.UTC)<% } %>));
-        <%_ } _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
+        when(dateTimeProvider.getNow()).thenReturn(Optional.of(now.minus(4, ChronoUnit.DAYS)<% if (databaseTypeSql && reactive) { %>.atOffset(ZoneOffset.UTC)<% } %>));
+  <%_ } _%>
         user.setActivated(false);
-        <%= asEntity('User') %> dbUser = userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        <%= asEntity('User') %> dbUser = userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
         dbUser.setCreatedDate(now.minus(4, ChronoUnit.DAYS));
-        userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
-        <%_ if (databaseType === 'sql' && reactive) { _%>
+        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+  <%_ if (databaseTypeSql && reactive) { _%>
         LocalDateTime threeDaysAgo = LocalDateTime.ofInstant(now.minus(3, ChronoUnit.DAYS), ZoneOffset.UTC);
-        <%_ } else { _%>
+  <%_ } else { _%>
         Instant threeDaysAgo = now.minus(3, ChronoUnit.DAYS);
-        <%_ } _%>
+  <%_ } _%>
         List<<%= asEntity('User') %>> users = userRepository.findAllByActivatedIsFalseAndActivationKeyIsNotNullAndCreatedDateBefore(threeDaysAgo)<% if (reactive) { %>
             .collectList().block()<% } %>;
         assertThat(users).isEmpty();
         userService.removeNotActivatedUsers();
         Optional<<%= asEntity('User') %>> maybeDbUser = userRepository.findById(dbUser.getId())<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(maybeDbUser).contains(dbUser);
-        <%_ if (searchEngine === 'elasticsearch') { _%>
+  <%_ if (searchEngineElasticsearch) { _%>
 
         // Verify Elasticsearch mock
         verify(mockUserSearchRepository, never()).delete(user);
-        <%_ } _%>
+  <%_ } _%>
     }
-    <%_ } _%>
-    <%_ if ((databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') && authenticationType === 'session' && !reactive) { _%>
+<%_ } _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 
     private void generateUserToken(<%= asEntity('User') %> user, String tokenSeries, LocalDate localDate) {
         PersistentToken token = new PersistentToken();
-        token.setSeries(tokenSeries);<% if (databaseType === 'couchbase') { %>
+        token.setSeries(tokenSeries);<% if (databaseTypeCouchbase) { %>
         token.setLogin(user.getLogin());<% } else { %>
         token.setUser(user);<% } %>
         token.setTokenValue(tokenSeries + "-data");
         token.setTokenDate(localDate);
         token.setIpAddress("127.0.0.1");
         token.setUserAgent("Test agent");
-        persistentTokenRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(token);
+        persistentTokenRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(token);
     }
-    <%_ } _%>
+<%_ } _%>
 
-    <%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
     @Test
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void testDefaultUserDetails() {
         OAuth2AuthenticationToken authentication = createMockOAuth2AuthenticationToken(userDetails);
         <%= asDto('AdminUser') %> userDTO = userService.getUserFromAuthentication(authentication)<% if (reactive) { %>.block()<% } %>;
@@ -450,9 +450,9 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void testUserDetailsWithUsername() {
         userDetails.put("preferred_username", "TEST");
 
@@ -463,9 +463,9 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void testUserDetailsWithLangKey() {
         userDetails.put("langKey", DEFAULT_LANGKEY);
         userDetails.put("locale", "en-US");
@@ -477,9 +477,9 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void testUserDetailsWithLocale() {
         userDetails.put("locale", "it-IT");
 
@@ -490,9 +490,9 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void testUserDetailsWithUSLocaleUnderscore() {
         userDetails.put("locale", "en_US");
 
@@ -503,9 +503,9 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
     }
 
     @Test
-    <%_ if (databaseType === 'sql' && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-    <%_ } _%>
+  <%_ } _%>
     void testUserDetailsWithUSLocaleDash() {
         userDetails.put("locale", "en-US");
 
@@ -523,5 +523,5 @@ class UserServiceIT <% if (databaseType === 'cassandra') { %>extends AbstractCas
 
         return new OAuth2AuthenticationToken(user, authorities, "oidc");
     }
-    <%_ } _%>
+<%_ } _%>
 }