generator-jhipster 7.1.0 → 7.4.0

package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs

@@ -18,32 +18,39 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ if (searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
+<%_ } else if (searchEngineCouchbase) { _%>
+import <%= packageName %>.repository.UserRepository;
+import <%= packageName %>.domain.User;
+  <%_ if (!reactive) { _%>
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+  <%_ } _%>
 <%_ } _%>
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 import org.springframework.data.domain.Sort;
 import java.util.Collections;
 <%_ } _%>
 import <%= packageName %>.service.UserService;
 import <%= packageName %>.service.dto.<%= asDto('User') %>;
 
-<%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
 import tech.jhipster.web.util.PaginationUtil;
 <%_ } _%>
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-<%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
-    <%_ if (!reactive) { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
+  <%_ if (!reactive) { _%>
 import org.springframework.data.domain.Page;
-    <%_ } else { _%>
+  <%_ } else { _%>
 import org.springframework.data.domain.PageImpl;
-    <%_ } _%>
+  <%_ } _%>
 import org.springframework.data.domain.Pageable;
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
 import org.springframework.http.HttpHeaders;
-    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -69,38 +76,47 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
 <%_ } _%>
-<%_ if (searchEngine === 'elasticsearch' && !reactive) { _%>
+<%_ if (searchEngineElasticsearch && !reactive) { _%>
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-
 import static org.elasticsearch.index.query.QueryBuilders.*;
 <%_ } _%>
 
 @RestController
 @RequestMapping("/api")
 public class PublicUserResource {
-    <%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
     private static final List<String> ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(Arrays.asList("id", "login", "firstName", "lastName", "email", "activated", "langKey"));
-    <%_ } _%>
+<%_ } _%>
 
     private final Logger log = LoggerFactory.getLogger(PublicUserResource.class);
 
     private final UserService userService;
-<%_ if (searchEngine === 'elasticsearch') { _%>
-
+<%_ if (searchEngineElasticsearch) { _%>
     private final UserSearchRepository userSearchRepository;
+<%_ } else if (searchEngineCouchbase) { _%>
+    private final UserRepository userRepository;
 <%_ } _%>
 
-    public PublicUserResource(UserService userService<% if (searchEngine === 'elasticsearch') { %>, UserSearchRepository userSearchRepository<% } %>) {
+    public PublicUserResource(
+<%_ if (searchEngineElasticsearch) { -%>
+        UserSearchRepository userSearchRepository,
+<%_ } else if (searchEngineCouchbase) { -%>
+        UserRepository userRepository,
+<%_ } -%>
+        UserService userService
+    ) {
         this.userService = userService;
-        <%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ if (searchEngineElasticsearch) { _%>
         this.userSearchRepository = userSearchRepository;
-        <%_ } _%>
+<%_ } else if (searchEngine != false) { _%>
+        this.userRepository = userRepository;
+<%_ } _%>
     }
 
     /**
      * {@code GET /users} : get all users with only the public informations - calling this are allowed for anyone.
-     *<% if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType == 'neo4j' || databaseType === 'couchbase') { %>
+     *<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %>
         <%_ if (reactive) { _%>
      * @param request a {@link ServerHttpRequest} request.
         <%_ } _%>
@@ -108,40 +124,40 @@ public class PublicUserResource {
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body all users.
      */
     @GetMapping("/users")
-    <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
-        <%_ if (!reactive) { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
+  <%_ if (!reactive) { _%>
     public ResponseEntity<List<<%= asDto('User') %>>> getAllPublicUsers(Pageable pageable) {
         log.debug("REST request to get all public User names");
-        <%_ if (authenticationType !== 'oauth2') { _%>
+    <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
             return ResponseEntity.badRequest().build();
         }
-        <%_ } _%>
+    <%_ } _%>
 
         final Page<<%= asDto('User') %>> page = userService.getAllPublicUsers(pageable);
         HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
         return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK);
     }
-        <%_ } else { _%>
+  <%_ } else { _%>
     public Mono<ResponseEntity<Flux<<%= asDto('User') %>>>> getAllPublicUsers(ServerHttpRequest request, Pageable pageable) {
         log.debug("REST request to get all public User names");
-        <%_ if (authenticationType !== 'oauth2') { _%>
+    <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
             return Mono.just(ResponseEntity.badRequest().build());
         }
-        <%_ } _%>
+    <%_ } _%>
 
         return userService.countManagedUsers()
             .map(total -> new PageImpl<>(new ArrayList<>(), pageable, total))
             .map(page -> PaginationUtil.generatePaginationHttpHeaders(UriComponentsBuilder.fromHttpRequest(request), page))
             .map(headers -> ResponseEntity.ok().headers(headers).body(userService.getAllPublicUsers(pageable)));
     }
-        <%_ } _%>
-        <%_ if (authenticationType !== 'oauth2') { _%>
+  <%_ } _%>
+  <%_ if (!authenticationTypeOauth2) { _%>
     private boolean onlyContainsAllowedProperties(Pageable pageable) {
         return pageable.getSort().stream().map(Sort.Order::getProperty).allMatch(ALLOWED_ORDERED_PROPERTIES::contains);
     }
-        <%_ } _%>
+  <%_ } _%>
 
     /**
      * Gets a list of all roles.
@@ -152,14 +168,14 @@ public class PublicUserResource {
         return userService.getAuthorities()<% if (reactive) { %>.collectList()<% } %>;
     }
 
-    <%_ } else { // Cassandra _%>
+<%_ } else { /* Cassandra */ _%>
     public <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= asDto('User') %>> getAllPublicUsers() {
         return userService.getAllPublicUsers();
     }
 
-    <%_ } _%>
+<%_ } _%>
 
-    <%_ if (searchEngine !== false) { _%>
+<%_ if (!!searchEngine) { _%>
 
     /**
      * {@code SEARCH /_search/users/:query} : search for the User corresponding to the query.
@@ -169,18 +185,25 @@ public class PublicUserResource {
      */
     @GetMapping("/_search/users/{query}")
     public <% if(reactive) { %>Mono<<% } %>List<<%= asDto('User') %>><% if(reactive) { %>><% } %> search(@PathVariable String query) {
-    <%_ if (searchEngine === 'elasticsearch') { _%>
-        <%_ if (!reactive) { _%>
+  <%_ if (searchEngineElasticsearch) { _%>
+    <%_ if (!reactive) { _%>
         return StreamSupport
-            .stream(userSearchRepository.search(queryStringQuery(query)).spliterator(), false)
+            .stream(userSearchRepository.search(query).spliterator(), false)
             .map(<%= asDto('User') %>::new)
             .collect(Collectors.toList());
-        <%_ } else { _%>
-        return userSearchRepository.search(query).map(<%= asDto('User') %>::new).collectList();
-        <%_ } _%>
     <%_ } else { _%>
-        return userRepository.search(User.PREFIX, query)<% if (reactive) { %>.collectList()<% } %>;
+        return userSearchRepository.search(query).map(<%= asDto('User') %>::new).collectList();
     <%_ } _%>
+  <%_ } else { _%>
+     <%_ if (!reactive) { _%>
+        return StreamSupport
+            .stream(userRepository.search(User.PREFIX, query).spliterator(), false)
+            .map(<%= asDto('User') %>::new)
+            .collect(Collectors.toList());
+     <%_ } else { _%>
+        return userRepository.search(User.PREFIX, query).map(<%= asDto('User') %>::new).collectList();
+     <%_ } _%>
+  <%_ } _%>
     }
 <%_ } _%>
 

package/generators/server/templates/src/main/java/package/web/rest/UserJWTController.java.ejs

@@ -51,7 +51,7 @@ import javax.validation.Valid;
 @RequestMapping("/api")
 public class UserJWTController {
 
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     private final TokenProvider tokenProvider;
 
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
@@ -74,7 +74,7 @@ public class UserJWTController {
         httpHeaders.add(JWTFilter.AUTHORIZATION_HEADER, "Bearer " + jwt);
         return new ResponseEntity<>(new JWTToken(jwt), httpHeaders, HttpStatus.OK);
     }
-    <%_ } else { _%>
+<%_ } else { _%>
     private final TokenProvider tokenProvider;
 
     private final ReactiveAuthenticationManager authenticationManager;
@@ -98,7 +98,7 @@ public class UserJWTController {
             });
     }
 
-    <%_ } _%>
+<%_ } _%>
     /**
      * Object to return as body in JWT Authentication.
      */

package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs

@@ -19,28 +19,28 @@
 package <%= packageName %>.web.rest;
 
 import <%= packageName %>.config.Constants;
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 import <%= packageName %>.domain.<%= asEntity('User') %>;
 <%_ } _%>
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 import <%= packageName %>.repository.UserRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 import <%= packageName %>.service.MailService;
 import org.springframework.data.domain.Sort;
 import java.util.Collections;
 <%_ } _%>
 import <%= packageName %>.service.UserService;
 import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 import <%= packageName %>.web.rest.errors.BadRequestAlertException;
 import <%= packageName %>.web.rest.errors.EmailAlreadyUsedException;
 import <%= packageName %>.web.rest.errors.LoginAlreadyUsedException;
 <%_ } _%>
 
 import tech.jhipster.web.util.HeaderUtil;
-<%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
 import tech.jhipster.web.util.PaginationUtil;
 <%_ } _%>
 <%_ if (!reactive) { _%>
@@ -50,16 +50,16 @@ import tech.jhipster.web.util.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-<%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
-    <%_ if (!reactive) { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
+  <%_ if (!reactive) { _%>
 import org.springframework.data.domain.Page;
-    <%_ } else { _%>
+  <%_ } else { _%>
 import org.springframework.data.domain.PageImpl;
-    <%_ } _%>
+  <%_ } _%>
 import org.springframework.data.domain.Pageable;
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
 import org.springframework.http.HttpHeaders;
-    <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -79,7 +79,7 @@ import reactor.core.publisher.Mono;
 <%_ } _%>
 
 import javax.validation.constraints.Pattern;
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 import javax.validation.Valid;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -92,7 +92,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
 <%_ } _%>
-<%_ if (searchEngine === 'elasticsearch' && !reactive) { _%>
+<%_ if (searchEngineElasticsearch && !reactive) { _%>
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -102,7 +102,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 /**
  * REST controller for managing users.
  * <p>
- * This class accesses the {@link <% if (!(authenticationType !== 'oauth2' || searchEngine === 'elasticsearch')) { %><%= packageName %>.domain.<% } %><%= asEntity('User') %>} entity, and needs to fetch its collection of authorities.
+ * This class accesses the {@link <% if (!(!authenticationTypeOauth2 || searchEngineElasticsearch)) { %><%= packageName %>.domain.<% } %><%= asEntity('User') %>} entity, and needs to fetch its collection of authorities.
  * <p>
  * For a normal use-case, it would be better to have an eager relationship between User and Authority,
  * and send everything to the client side: there would be no View Model and DTO, a lot less code, and an outer-join
@@ -126,10 +126,10 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 @RestController
 @RequestMapping("/api/admin")
 public class UserResource {
-    <%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
     private static final List<String> ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(Arrays.asList(
     "id", "login", "firstName", "lastName", "email", "activated", "langKey", "createdBy", "createdDate", "lastModifiedBy", "lastModifiedDate"));
-    <%_ } _%>
+<%_ } _%>
 
     private final Logger log = LoggerFactory.getLogger(UserResource.class);
 
@@ -137,22 +137,22 @@ public class UserResource {
     private String applicationName;
 
     private final UserService userService;
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 
     private final UserRepository userRepository;
 
     private final MailService mailService;
 <%_ } _%>
 
-    public UserResource(UserService userService<% if (authenticationType !== 'oauth2') { %>, UserRepository userRepository, MailService mailService<% } %>) {
+    public UserResource(UserService userService<% if (!authenticationTypeOauth2) { %>, UserRepository userRepository, MailService mailService<% } %>) {
         this.userService = userService;
-        <%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
         this.userRepository = userRepository;
         this.mailService = mailService;
-        <%_ } _%>
+<%_ } _%>
     }
 
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
     /**
      * {@code POST  /admin/users}  : Creates a new user.
      * <p>
@@ -162,9 +162,9 @@ public class UserResource {
      *
      * @param userDTO the user to create.
      * @return the {@link ResponseEntity} with status {@code 201 (Created)} and with body the new user, or with status {@code 400 (Bad Request)} if the login or email is already in use.
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
      * @throws URISyntaxException if the Location URI syntax is incorrect.
-    <%_ } _%>
+  <%_ } _%>
      * @throws BadRequestAlertException {@code 400 (Bad Request)} if the login or email is already in use.
      */
     @PostMapping("/users")
@@ -175,7 +175,7 @@ public class UserResource {
         if (userDTO.getId() != null) {
             throw new BadRequestAlertException("A new user cannot already have an ID", "userManagement", "idexists");
             // Lowercase the user login before comparing with database
-        <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
         } else if (userRepository.findOneByLogin(userDTO.getLogin().toLowerCase()).isPresent()) {
             throw new LoginAlreadyUsedException();
         } else if (userRepository.findOneByEmailIgnoreCase(userDTO.getEmail()).isPresent()) {
@@ -187,7 +187,7 @@ public class UserResource {
                 .headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %> "userManagement.created"<% } else { %> "A user is created with identifier " + newUser.getLogin()<% } %>, newUser.getLogin()))
                 .body(newUser);
         }
-        <%_ } else { _%>
+  <%_ } else { _%>
         }
         return userRepository.findOneByLogin(userDTO.getLogin().toLowerCase())
             .hasElement()
@@ -214,7 +214,7 @@ public class UserResource {
                     throw new RuntimeException(e);
                 }
             });
-        <%_ } _%>
+  <%_ } _%>
     }
 
     /**
@@ -227,7 +227,7 @@ public class UserResource {
      */
     @PutMapping("/users")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
     public ResponseEntity<<%= asDto('AdminUser') %>> updateUser(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
         log.debug("REST request to update User : {}", userDTO);
         Optional<<%= asEntity('User') %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
@@ -242,7 +242,7 @@ public class UserResource {
 
         return ResponseUtil.wrapOrNotFound(updatedUser,
             HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %>"userManagement.updated"<% } else { %>"A user is updated with identifier " + userDTO.getLogin()<% } %>, userDTO.getLogin()));
-    <%_ } else { _%>
+  <%_ } else { _%>
     public Mono<ResponseEntity<<%= asDto('AdminUser') %>>> updateUser(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
         log.debug("REST request to update User : {}", userDTO);
         return userRepository.findOneByEmailIgnoreCase(userDTO.getEmail())
@@ -267,63 +267,63 @@ public class UserResource {
                 .headers(HeaderUtil.createAlert(applicationName, "userManagement.updated", userDTO.getLogin()))
                 .body(user)
             );
-    <%_ } _%>
+  <%_ } _%>
     }
 
 <%_ } _%>
     /**
      * {@code GET /admin/users} : get all users with all the details - calling this are only allowed for the administrators.
-     *<% if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType == 'neo4j' || databaseType === 'couchbase') { %>
-        <%_ if (reactive) { _%>
+     *<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %>
+<%_ if (reactive) { _%>
      * @param request a {@link ServerHttpRequest} request.
-        <%_ } _%>
+<%_ } _%>
      * @param pageable the pagination information.<% } %>
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body all users.
      */
     @GetMapping("/users")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
-    <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
-        <%_ if (!reactive) { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
+  <%_ if (!reactive) { _%>
     public ResponseEntity<List<<%= asDto('AdminUser') %>>> getAllUsers(Pageable pageable) {
         log.debug("REST request to get all User for an admin");
-        <%_ if (authenticationType !== 'oauth2') { _%>
+    <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
             return ResponseEntity.badRequest().build();
         }
-        <%_ } _%>
+    <%_ } _%>
 
         final Page<<%= asDto('AdminUser') %>> page = userService.getAllManagedUsers(pageable);
         HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
         return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK);
-        <%_ } else { _%>
+  <%_ } else { _%>
     public Mono<ResponseEntity<Flux<<%= asDto('AdminUser') %>>>> getAllUsers(ServerHttpRequest request, Pageable pageable) {
         log.debug("REST request to get all User for an admin");
-        <%_ if (authenticationType !== 'oauth2') { _%>
+    <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
             return Mono.just(ResponseEntity.badRequest().build());
         }
-        <%_ } _%>
+    <%_ } _%>
 
         return userService.countManagedUsers()
             .map(total -> new PageImpl<>(new ArrayList<>(), pageable, total))
             .map(page -> PaginationUtil.generatePaginationHttpHeaders(UriComponentsBuilder.fromHttpRequest(request), page))
             .map(headers -> ResponseEntity.ok().headers(headers).body(userService.getAllManagedUsers(pageable)));
-        <%_ } _%>
+  <%_ } _%>
     }
 
-    <%_ if (authenticationType !== 'oauth2') { _%>
+  <%_ if (!authenticationTypeOauth2) { _%>
     private boolean onlyContainsAllowedProperties(Pageable pageable) {
         return pageable.getSort().stream().map(Sort.Order::getProperty).allMatch(ALLOWED_ORDERED_PROPERTIES::contains);
     }
-    <%_ } _%>
+  <%_ } _%>
 
-    <%_ } else { // Cassandra _%>
+<%_ } else { /* Cassandra */ _%>
     public <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= asDto('AdminUser') %>> getAllUsers() {
         log.debug("REST request to get all User for an admin");
         return userService.getAllManagedUsers();
     }
 
-    <%_ } _%>
+<%_ } _%>
 
     /**
      * {@code GET /admin/users/:login} : get the "login" user.
@@ -333,21 +333,21 @@ public class UserResource {
      */
     @GetMapping("/users/{login}")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
-    <%_ if (!reactive) { _%>
+<%_ if (!reactive) { _%>
     public ResponseEntity<<%= asDto('AdminUser') %>> getUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to get User : {}", login);
         return ResponseUtil.wrapOrNotFound(
             userService.getUserWithAuthoritiesByLogin(login)
                 .map(<%= asDto('AdminUser') %>::new));
-    <%_ } else { _%>
+<%_ } else { _%>
     public Mono<<%= asDto('AdminUser') %>> getUser(@PathVariable String login) {
         log.debug("REST request to get User : {}", login);
         return userService.getUserWithAuthoritiesByLogin(login)
             .map(<%= asDto('AdminUser') %>::new)
             .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND)));
-    <%_ } _%>
+<%_ } _%>
     }
-<%_ if (authenticationType !== 'oauth2') { _%>
+<%_ if (!authenticationTypeOauth2) { _%>
 
     /**
      * {@code DELETE /admin/users/:login} : delete the "login" User.
@@ -357,18 +357,18 @@ public class UserResource {
      */
     @DeleteMapping("/users/{login}")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
     public ResponseEntity<Void> deleteUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to delete User: {}", login);
         userService.deleteUser(login);
         return ResponseEntity.noContent().headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %> "userManagement.deleted"<% } else { %> "A user is deleted with identifier " + login<% } %>, login)).build();
-    <%_ } else { _%>
+  <%_ } else { _%>
     @ResponseStatus(code = HttpStatus.NO_CONTENT)
     public Mono<ResponseEntity<Void>> deleteUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to delete User: {}", login);
         return userService.deleteUser(login)
             .map(it -> ResponseEntity.noContent().headers(HeaderUtil.createAlert( applicationName, "userManagement.deleted", login)).build());
-    <%_ } _%>
+  <%_ } _%>
     }
 <%_ } _%>
 }

package/generators/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.ejs

@@ -22,18 +22,18 @@ import java.net.URI;
 
 public final class ErrorConstants {
 
-    <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%>
+<%_ if (!databaseTypeNo && !databaseTypeCassandra) { _%>
     public static final String ERR_CONCURRENCY_FAILURE = "error.concurrencyFailure";
-    <%_ } _%>
+<%_ } _%>
     public static final String ERR_VALIDATION = "error.validation";
     public static final String PROBLEM_BASE_URL = "https://www.jhipster.tech/problem";
     public static final URI DEFAULT_TYPE = URI.create(PROBLEM_BASE_URL + "/problem-with-message");
     public static final URI CONSTRAINT_VIOLATION_TYPE = URI.create(PROBLEM_BASE_URL + "/constraint-violation");
-    <%_ if (!skipUserManagement) { _%>
+<%_ if (!skipUserManagement) { _%>
     public static final URI INVALID_PASSWORD_TYPE = URI.create(PROBLEM_BASE_URL + "/invalid-password");
     public static final URI EMAIL_ALREADY_USED_TYPE = URI.create(PROBLEM_BASE_URL + "/email-already-used");
     public static final URI LOGIN_ALREADY_USED_TYPE = URI.create(PROBLEM_BASE_URL + "/login-already-used");
-    <%_ } _%>
+<%_ } _%>
 
     private ErrorConstants() {
     }