generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs

@@ -78,10 +78,9 @@ import java.util.*;
  * couldn't be cleanly extended.
  */
 @Service
-public class PersistentTokenRememberMeServices extends
-    AbstractRememberMeServices {
+public class PersistentTokenRememberMeServices extends AbstractRememberMeServices {
 
-    private final Logger log = LoggerFactory.getLogger(PersistentTokenRememberMeServices.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PersistentTokenRememberMeServices.class);
 
     // Token is valid for one month
     private static final int TOKEN_VALIDITY_DAYS = 31;
@@ -96,10 +95,12 @@ public class PersistentTokenRememberMeServices extends
 
     private final UserRepository userRepository;
 
-    public PersistentTokenRememberMeServices(JHipsterProperties jHipsterProperties,
-            org.springframework.security.core.userdetails.UserDetailsService userDetailsService,
-            PersistentTokenRepository persistentTokenRepository, UserRepository userRepository) {
-
+    public PersistentTokenRememberMeServices(
+        JHipsterProperties jHipsterProperties,
+        org.springframework.security.core.userdetails.UserDetailsService userDetailsService,
+        PersistentTokenRepository persistentTokenRepository,
+        UserRepository userRepository
+    ) {
         super(jHipsterProperties.getSecurity().getRememberMe().getKey(), userDetailsService);
         this.persistentTokenRepository = persistentTokenRepository;
         this.userRepository = userRepository;
@@ -107,15 +108,13 @@ public class PersistentTokenRememberMeServices extends
     }
 
     @Override
-    protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request,
-        HttpServletResponse response) {
-
+    protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, HttpServletResponse response) {
         synchronized (this) { // prevent 2 authentication requests from the same user in parallel
             String login = null;
             UpgradedRememberMeToken upgradedToken = upgradedTokenCache.get(cookieTokens[0]);
             if (upgradedToken != null) {
                 login = upgradedToken.getUserLoginIfValid(cookieTokens);
-                log.debug("Detected previously upgraded login token for user '{}'", login);
+                LOG.debug("Detected previously upgraded login token for user '{}'", login);
             }
 
             if (login == null) {
@@ -127,7 +126,7 @@ public class PersistentTokenRememberMeServices extends
 <%_ } _%>
 
                 // Token also matches, so login is valid. Update the token value, keeping the *same* series number.
-                log.debug("Refreshing persistent login token for user '{}', series '{}'", login, token.getSeries());
+                LOG.debug("Refreshing persistent login token for user '{}', series '{}'", login, token.getSeries());
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
                 token.setTokenDate(LocalDate.now());
 <%_ } else if (databaseTypeCassandra) { _%>
@@ -143,7 +142,7 @@ public class PersistentTokenRememberMeServices extends
 <%_ } else if (databaseTypeCassandra) { _%>
                 } catch (DriverException e) {
 <%_ } _%>
-                    log.error("Failed to update token: ", e);
+                    LOG.error("Failed to update token: ", e);
                     throw new RememberMeAuthenticationException("Autologin failed due to data access problem", e);
                 }
                 addCookie(token, request, response);
@@ -154,12 +153,10 @@ public class PersistentTokenRememberMeServices extends
     }
 
     @Override
-    protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication
-        successfulAuthentication) {
-
+    protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
         String login = successfulAuthentication.getName();
 
-        log.debug("Creating new persistent login for user {}", login);
+        LOG.debug("Creating new persistent login for user {}", login);
         PersistentToken token = userRepository.findOneByLogin(login).map(u -> {
             PersistentToken t = new PersistentToken();
             t.setSeries(RandomUtil.generateRandomAlphanumericString());
@@ -185,7 +182,7 @@ public class PersistentTokenRememberMeServices extends
 <%_ } else if (databaseTypeCassandra) { _%>
         } catch (DriverException e) {
 <%_ } _%>
-            log.error("Failed to save persistent token ", e);
+            LOG.error("Failed to save persistent token ", e);
         }
     }
 
@@ -213,9 +210,9 @@ public class PersistentTokenRememberMeServices extends
                 persistentTokenRepository.delete(token);
 <%_ } _%>
             } catch (InvalidCookieException ice) {
-                log.info("Invalid cookie, no persistent token could be deleted", ice);
+                LOG.info("Invalid cookie, no persistent token could be deleted", ice);
             } catch (RememberMeAuthenticationException rmae) {
-                log.debug("No persistent token found, so no token could be deleted", rmae);
+                LOG.debug("No persistent token found, so no token could be deleted", rmae);
             }
         }
         super.logout(request, response, authentication);
@@ -226,8 +223,9 @@ public class PersistentTokenRememberMeServices extends
      */
     private PersistentToken getPersistentToken(String[] cookieTokens) {
         if (cookieTokens.length != 2) {
-            throw new InvalidCookieException("Cookie token did not contain " + 2 +
-                " tokens, but contained '" + Arrays.asList(cookieTokens) + "'");
+            throw new InvalidCookieException(
+                "Cookie token did not contain " + 2 + " tokens, but contained '" + Arrays.asList(cookieTokens) + "'"
+            );
         }
         String presentedSeries = cookieTokens[0];
         String presentedToken = cookieTokens[1];
@@ -242,7 +240,7 @@ public class PersistentTokenRememberMeServices extends
         }
         PersistentToken token = optionalToken.orElseThrow();
         // We have a match for this user/series combination
-        log.info("presentedToken={} / tokenValue={}", presentedToken, token.getTokenValue());
+        LOG.info("presentedToken={} / tokenValue={}", presentedToken, token.getTokenValue());
         if (!presentedToken.equals(token.getTokenValue())) {
             // Token doesn't match series value. Delete this session and throw an exception.
 <%_ if (databaseTypeSql) { _%>
@@ -272,9 +270,7 @@ public class PersistentTokenRememberMeServices extends
     }
 
     private void addCookie(PersistentToken token, HttpServletRequest request, HttpServletResponse response) {
-        setCookie(
-            new String[]{token.getSeries(), token.getTokenValue()},
-            TOKEN_VALIDITY_SECONDS, request, response);
+        setCookie(new String[] { token.getSeries(), token.getTokenValue() }, TOKEN_VALIDITY_SECONDS, request, response);
     }
 
     private static class UpgradedRememberMeToken implements Serializable {
@@ -291,8 +287,7 @@ public class PersistentTokenRememberMeServices extends
         }
 
         String getUserLoginIfValid(String[] currentToken) {
-            if (currentToken[0].equals(this.upgradedToken[0]) &&
-                    currentToken[1].equals(this.upgradedToken[1])) {
+            if (currentToken[0].equals(this.upgradedToken[0]) && currentToken[1].equals(this.upgradedToken[1])) {
                 return this.userLogin;
             }
             return null;

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/SecurityUtils.java.ejs

@@ -79,8 +79,7 @@ public final class SecurityUtils {
     public static final String AUTHORITIES_KEY = "auth";
 <%_ } _%>
 
-    private SecurityUtils() {
-    }
+    private SecurityUtils() {}
 
     /**
      * Get the login of the current user.
@@ -109,7 +108,7 @@ public final class SecurityUtils {
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
         } else if (authentication instanceof JwtAuthenticationToken) {
-            return (String) ((JwtAuthenticationToken)authentication).getToken().getClaims().get("preferred_username");
+            return (String) ((JwtAuthenticationToken) authentication).getToken().getClaims().get("preferred_username");
         } else if (authentication.getPrincipal() instanceof DefaultOidcUser) {
             Map<String, Object> attributes = ((DefaultOidcUser) authentication.getPrincipal()).getAttributes();
             if (attributes.containsKey("preferred_username")) {
@@ -174,9 +173,11 @@ public final class SecurityUtils {
         return ReactiveSecurityContextHolder.getContext()
             .map(SecurityContext::getAuthentication)
             .map(Authentication::getAuthorities)
-            .map(authorityList -> authorityList.stream()
-                .map(GrantedAuthority::getAuthority)
-                .anyMatch(authority -> Arrays.asList(authorities).contains(authority))
+            .map(authorityList ->
+                authorityList
+                    .stream()
+                    .map(GrantedAuthority::getAuthority)
+                    .anyMatch(authority -> Arrays.asList(authorities).contains(authority))
             );
 <%_ } else { _%>
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
@@ -231,16 +232,14 @@ public final class SecurityUtils {
 
     @SuppressWarnings("unchecked")
     private static Collection<String> getRolesFromClaims(Map<String, Object> claims) {
-        return (Collection<String>) claims.getOrDefault("groups",
-            claims.getOrDefault("roles",
-            claims.getOrDefault(CLAIMS_NAMESPACE + "roles", new ArrayList<>())));
+        return (Collection<String>) claims.getOrDefault(
+            "groups",
+            claims.getOrDefault("roles", claims.getOrDefault(CLAIMS_NAMESPACE + "roles", new ArrayList<>()))
+        );
     }
 
     private static List<GrantedAuthority> mapRolesToGrantedAuthorities(Collection<String> roles) {
-        return roles.stream()
-            .filter(role -> role.startsWith("ROLE_"))
-            .map(SimpleGrantedAuthority::new)
-            .collect(Collectors.toList());
+        return roles.stream().filter(role -> role.startsWith("ROLE_")).map(SimpleGrantedAuthority::new).collect(Collectors.toList());
     }
 <%_ } _%>
 <%_ if (generateAuthenticationApi && ((authenticationTypeOauth2 && !syncUserWithIdp) || (authenticationTypeJwt && skipUserManagement))) { _%>

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs

@@ -27,9 +27,9 @@ import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.util.Assert;
 
 import java.util.List;
-
 public class AudienceValidator implements OAuth2TokenValidator<Jwt> {
-    private final Logger log = LoggerFactory.getLogger(AudienceValidator.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(AudienceValidator.class);
     private final OAuth2Error error = new OAuth2Error("invalid_token", "The required audience is missing", null);
 
     private final List<String> allowedAudience;
@@ -44,7 +44,7 @@ public class AudienceValidator implements OAuth2TokenValidator<Jwt> {
         if (audience.stream().anyMatch(allowedAudience::contains)) {
             return OAuth2TokenValidatorResult.success();
         } else {
-            log.warn("Invalid audience: {}", audience);
+            LOG.warn("Invalid audience: {}", audience);
             return OAuth2TokenValidatorResult.failure(error);
         }
     }

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs

@@ -84,7 +84,12 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
 
             // Retrieve user info from OAuth provider if not already loaded
             ObjectNode user = users.get(claims.get("sub").toString(), s -> {
-                ResponseEntity<ObjectNode> userInfo = restTemplate.exchange(registration.getProviderDetails().getUserInfoEndpoint().getUri(), HttpMethod.GET, new HttpEntity<String>(headers), ObjectNode.class);
+                ResponseEntity<ObjectNode> userInfo = restTemplate.exchange(
+                    registration.getProviderDetails().getUserInfoEndpoint().getUri(),
+                    HttpMethod.GET,
+                    new HttpEntity<String>(headers),
+                    ObjectNode.class
+                );
                 return userInfo.getBody();
             });
 
@@ -105,19 +110,15 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
                     String[] name = user.get("name").asText().split("\\s+");
                     if (name.length > 0) {
                         convertedClaims.put("given_name", name[0]);
-                        convertedClaims.put("family_name",
-                            String.join(" ", Arrays.copyOfRange(name, 1, name.length)));
+                        convertedClaims.put("family_name", String.join(" ", Arrays.copyOfRange(name, 1, name.length)));
                     }
                 }
                 if (user.has("groups")) {
-                    List<String> groups = StreamSupport.stream(user.get("groups").spliterator(), false)
-                        .map(JsonNode::asText)
-                        .toList();
+                    List<String> groups = StreamSupport.stream(user.get("groups").spliterator(), false).map(JsonNode::asText).toList();
                     convertedClaims.put("groups", groups);
                 }
                 if (user.has(SecurityUtils.CLAIMS_NAMESPACE + "roles")) {
-                    List<String> roles = StreamSupport
-                        .stream(user.get(SecurityUtils.CLAIMS_NAMESPACE + "roles").spliterator(), false)
+                    List<String> roles = StreamSupport.stream(user.get(SecurityUtils.CLAIMS_NAMESPACE + "roles").spliterator(), false)
                         .map(JsonNode::asText)
                         .toList();
                     convertedClaims.put("roles", roles);

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs

@@ -25,5 +25,4 @@ public class EmailAlreadyUsedException extends RuntimeException {
     public EmailAlreadyUsedException() {
         super("Email is already in use!");
     }
-
 }

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs

@@ -25,5 +25,4 @@ public class InvalidPasswordException extends RuntimeException {
     public InvalidPasswordException() {
         super("Incorrect password");
     }
-
 }

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/MailService.java.ejs

@@ -56,7 +56,7 @@ _%>
 @Service
 public class MailService {
 
-    private final Logger log = LoggerFactory.getLogger(MailService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MailService.class);
 
     private static final String USER = "user";
 
@@ -70,9 +70,12 @@ public class MailService {
 
     private final SpringTemplateEngine templateEngine;
 
-    public MailService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender,
-            MessageSource messageSource, SpringTemplateEngine templateEngine) {
-
+    public MailService(
+        JHipsterProperties jHipsterProperties,
+        JavaMailSender javaMailSender,
+        MessageSource messageSource,
+        SpringTemplateEngine templateEngine
+    ) {
         this.jHipsterProperties = jHipsterProperties;
         this.javaMailSender = javaMailSender;
         this.messageSource = messageSource;
@@ -94,8 +97,14 @@ public class MailService {
     }
 
     private void sendEmailSync(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
-        log.debug("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}",
-            isMultipart, isHtml, to, subject, content);
+        LOG.debug(
+            "Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}",
+            isMultipart,
+            isHtml,
+            to,
+            subject,
+            content
+        );
 
         // Prepare message using a Spring helper
         MimeMessage mimeMessage = javaMailSender.createMimeMessage();
@@ -106,9 +115,9 @@ public class MailService {
             message.setSubject(subject);
             message.setText(content, isHtml);
             javaMailSender.send(mimeMessage);
-            log.debug("Sent email to User '{}'", to);
-        }  catch (MailException | MessagingException e) {
-            log.warn("Email could not be sent to user '{}'", to, e);
+            LOG.debug("Sent email to User '{}'", to);
+        } catch (MailException | MessagingException e) {
+            LOG.warn("Email could not be sent to user '{}'", to, e);
         }
     }
 
@@ -128,7 +137,7 @@ public class MailService {
 
     private void sendEmailFromTemplateSync(<%= user.persistClass %> user, String templateName, String titleKey) {
         if (user.getEmail() == null) {
-            log.debug("Email doesn't exist for user '{}'", user.getLogin());
+            LOG.debug("Email doesn't exist for user '{}'", user.getLogin());
             return;
         }
         Locale locale = Locale.forLanguageTag(user.getLangKey());
@@ -145,7 +154,7 @@ public class MailService {
     @Async
 <%_ } _%>
     public void sendActivationEmail(<%= user.persistClass %> user) {
-        log.debug("Sending activation email to '{}'", user.getEmail());
+        LOG.debug("Sending activation email to '{}'", user.getEmail());
         this.<%- localSendEmailFromTemplateApi %>(user, "mail/activationEmail", "email.activation.title");
     }
 
@@ -153,7 +162,7 @@ public class MailService {
     @Async
 <%_ } _%>
     public void sendCreationEmail(<%= user.persistClass %> user) {
-        log.debug("Sending creation email to '{}'", user.getEmail());
+        LOG.debug("Sending creation email to '{}'", user.getEmail());
         this.<%- localSendEmailFromTemplateApi %>(user, "mail/creationEmail", "email.activation.title");
     }
 
@@ -161,7 +170,7 @@ public class MailService {
     @Async
 <%_ } _%>
     public void sendPasswordResetMail(<%= user.persistClass %> user) {
-        log.debug("Sending password reset email to '{}'", user.getEmail());
+        LOG.debug("Sending password reset email to '{}'", user.getEmail());
         this.<%- localSendEmailFromTemplateApi %>(user, "mail/passwordResetEmail", "email.reset.title");
     }
 <%_ } _%>

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs

@@ -25,5 +25,4 @@ public class UsernameAlreadyUsedException extends RuntimeException {
     public UsernameAlreadyUsedException() {
         super("Login name already used!");
     }
-
 }

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs

@@ -104,6 +104,17 @@ public class <%= user.dtoClass %> implements Serializable {
             Objects.equals(getLogin(), userDTO.getLogin());
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+            getId(),
+<%_ for (const { propertyJavaBeanName } of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
+          get<%= field.propertyJavaBeanName %>(),
+<%_ } _%>
+            getLogin()
+        );
+    }
+
     // prettier-ignore
     @Override
     public String toString() {

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs

@@ -110,11 +110,14 @@ public class UserMapper {
         Set<Authority> authorities = new HashSet<>();
 
         if (authoritiesAsString != null) {
-            authorities = authoritiesAsString.stream().map(string -> {
-                Authority auth = new Authority();
-                auth.setName(string);
-                return auth;
-            }).collect(Collectors.toSet());
+            authorities = authoritiesAsString
+                .stream()
+                .map(string -> {
+                    Authority auth = new Authority();
+                    auth.setName(string);
+                    return auth;
+                })
+                .collect(Collectors.toSet());
         }
 
         return authorities;

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs

@@ -52,8 +52,7 @@ public class OAuth2ReactiveRefreshTokensWebFilter implements WebFilter {
 
     private Mono<OAuth2AuthorizedClient> authorizedClient(ServerWebExchange exchange, OAuth2AuthenticationToken oauth2Authentication) {
         String clientRegistrationId = oauth2Authentication.getAuthorizedClientRegistrationId();
-        OAuth2AuthorizeRequest request = OAuth2AuthorizeRequest
-            .withClientRegistrationId(clientRegistrationId)
+        OAuth2AuthorizeRequest request = OAuth2AuthorizeRequest.withClientRegistrationId(clientRegistrationId)
             .principal(oauth2Authentication)
             .attribute(ServerWebExchange.class.getName(), exchange)
             .build();

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs

@@ -59,11 +59,10 @@ public class OAuth2RefreshTokensWebFilter extends OncePerRequestFilter {
     ) {
         this.clientManager = clientManager;
         this.authorizedClientRepository = authorizedClientRepository;
-        this.authorizationRequestResolver =
-            new DefaultOAuth2AuthorizationRequestResolver(
-                clientRegistrationRepository,
-                OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI
-            );
+        this.authorizationRequestResolver = new DefaultOAuth2AuthorizationRequestResolver(
+            clientRegistrationRepository,
+            OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI
+        );
     }
 
     @Override
@@ -88,8 +87,7 @@ public class OAuth2RefreshTokensWebFilter extends OncePerRequestFilter {
 
     private OAuth2AuthorizedClient authorizedClient(OAuth2AuthenticationToken oauth2Authentication) {
         String clientRegistrationId = oauth2Authentication.getAuthorizedClientRegistrationId();
-        OAuth2AuthorizeRequest request = OAuth2AuthorizeRequest
-            .withClientRegistrationId(clientRegistrationId)
+        OAuth2AuthorizeRequest request = OAuth2AuthorizeRequest.withClientRegistrationId(clientRegistrationId)
             .principal(oauth2Authentication)
             .build();
         if (clientManager == null) {

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs

@@ -18,13 +18,13 @@
 -%>
 package <%= packageName %>.web.rest;
 
-  <%_ if (authenticationTypeSession && !reactive) { _%>
+<%_ if (authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.domain.PersistentToken;
 import <%= packageName %>.repository.PersistentTokenRepository;
-  <%_ } _%>
-  <%_ if (!reactive) { _%>
+<%_ } _%>
+<%_ if (!reactive) { _%>
 import <%= user.entityAbsoluteClass %>;
-  <%_ } _%>
+<%_ } _%>
 import <%= packageName %>.repository.UserRepository;
 import <%= packageName %>.security.SecurityUtils;
 import <%= packageName %>.service.MailService;
@@ -35,31 +35,24 @@ import <%= packageName %>.web.rest.errors.*;
 import <%= packageName %>.web.rest.vm.KeyAndPasswordVM;
 import <%= packageName %>.web.rest.vm.ManagedUserVM;
 
+import java.security.Principal;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
-  <%_ if (reactive) { _%>
-import org.springframework.web.server.ServerWebExchange;
+<%_ if (reactive) { _%>
+import java.util.Objects;
 import reactor.core.publisher.Mono;
-  <%_ } _%>
-
-  <%_ if (!reactive && !authenticationTypeJwt) { _%>
-import jakarta.servlet.http.HttpServletRequest;
-  <%_ } _%>
+<%_ } else { _%>
+import java.util.*;
+<%_ } _%>
 import jakarta.validation.Valid;
-  <%_ if (authenticationTypeSession && !reactive) { _%>
+<%_ if (authenticationTypeSession && !reactive) { _%>
 import java.nio.charset.StandardCharsets;
 import java.net.URLDecoder;
-  <%_ } _%>
-  <%_ if (reactive) { _%>
-import java.security.Principal;
-import java.util.Objects;
-  <%_ } _%>
-  <%_ if (!reactive) { _%>
-import java.util.*;
-  <%_ } _%>
+<%_ } _%>
 
 /**
  * REST controller for managing the current user's account.
@@ -74,7 +67,7 @@ public class AccountResource {
         }
     }
 
-    private final Logger log = LoggerFactory.getLogger(AccountResource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountResource.class);
 
     private final UserRepository userRepository;
 
@@ -144,19 +137,13 @@ public class AccountResource {
     /**
      * {@code GET  /authenticate} : check if the user is authenticated, and return its login.
      *
-     * @param request the HTTP request.
+     * @param principal the authentication principal.
      * @return the login if the user is authenticated.
      */
-    @GetMapping("/authenticate")
-    <%_ if (reactive) { _%>
-    public Mono<String> isAuthenticated(ServerWebExchange request) {
-        log.debug("REST request to check if the current user is authenticated");
-        return request.getPrincipal().map(Principal::getName);
-    <%_ } else { _%>
-    public String isAuthenticated(HttpServletRequest request) {
-        log.debug("REST request to check if the current user is authenticated");
-        return request.getRemoteUser();
-    <%_ } _%>
+    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
+    public String isAuthenticated(Principal principal) {
+        LOG.debug("REST request to check if the current user is authenticated");
+        return principal == null ? null : principal.getName();
     }
 
   <%_ } _%>
@@ -167,7 +154,7 @@ public class AccountResource {
      * @throws RuntimeException {@code 500 (Internal Server Error)} if the user couldn't be returned.
      */
     @GetMapping("/account")
-    public <% if (reactive) { %>Mono<<%= user.adminUserDto %>><% } else { %><%= user.adminUserDto %><% } %> getAccount() {
+    public <%- wrapMono(user.adminUserDto) %> getAccount() {
         return userService.getUserWithAuthorities()
             .map(<%= user.adminUserDto %>::new)
   <%_ if (reactive) { _%>
@@ -241,9 +228,11 @@ public class AccountResource {
     @GetMapping("/account/sessions")
     public List<PersistentToken> getCurrentSessions() {
         return persistentTokenRepository.findByUser(
-            userRepository.findOneByLogin(SecurityUtils.getCurrentUserLogin()
-                .orElseThrow(() -> new AccountResourceException("Current user login not found")))
-                    .orElseThrow(() -> new AccountResourceException("User could not be found"))
+            userRepository
+                .findOneByLogin(
+                    SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new AccountResourceException("Current user login not found"))
+                )
+                .orElseThrow(() -> new AccountResourceException("User could not be found"))
         );
     }
 
@@ -289,14 +278,15 @@ public class AccountResource {
     @PostMapping(path = "/account/reset-password/init")
   <%_ if (reactive) { _%>
     public Mono<Void> requestPasswordReset(@RequestBody String mail) {
-        return userService.requestPasswordReset(mail)
+        return userService
+            .requestPasswordReset(mail)
             .doOnSuccess(user -> {
                 if (Objects.nonNull(user)) {
                     mailService.sendPasswordResetMail(user);
                 } else {
                     // Pretend the request has been successful to prevent checking which emails really exist
                     // but log that an invalid attempt has been made
-                    log.warn("Password reset requested for non existing mail");
+                    LOG.warn("Password reset requested for non existing mail");
                 }
             })
             .then();
@@ -308,7 +298,7 @@ public class AccountResource {
         } else {
             // Pretend the request has been successful to prevent checking which emails really exist
             // but log that an invalid attempt has been made
-            log.warn("Password reset requested for non existing mail");
+            LOG.warn("Password reset requested for non existing mail");
         }
   <%_ } _%>
     }
@@ -340,8 +330,10 @@ public class AccountResource {
     }
 
     private static boolean isPasswordLengthInvalid(String password) {
-        return StringUtils.isEmpty(password) ||
+        return (
+            StringUtils.isEmpty(password) ||
             password.length() < ManagedUserVM.PASSWORD_MIN_LENGTH ||
-            password.length() > ManagedUserVM.PASSWORD_MAX_LENGTH;
+            password.length() > ManagedUserVM.PASSWORD_MAX_LENGTH
+        );
     }
 }