generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs

@@ -50,9 +50,11 @@ public class LoggingAspect {
     /**
      * Pointcut that matches all repositories, services and Web REST endpoints.
      */
-    @Pointcut("within(@org.springframework.stereotype.Repository *)" +
+    @Pointcut(
+        "within(@org.springframework.stereotype.Repository *)" +
         " || within(@org.springframework.stereotype.Service *)" +
-        " || within(@org.springframework.web.bind.annotation.RestController *)")
+        " || within(@org.springframework.web.bind.annotation.RestController *)"
+    )
     public void springBeanPointcut() {
         // Method is empty as this is just a Pointcut, the implementations are in the advices.
     }
@@ -86,21 +88,19 @@ public class LoggingAspect {
     @AfterThrowing(pointcut = "applicationPackagePointcut() && springBeanPointcut()", throwing = "e")
     public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
         if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
-            logger(joinPoint)
-                .error(
-                    "Exception in {}() with cause = '{}' and exception = '{}'",
-                    joinPoint.getSignature().getName(),
-                    e.getCause() != null ? e.getCause() : "NULL",
-                    e.getMessage(),
-                    e
-                );
+            logger(joinPoint).error(
+                "Exception in {}() with cause = '{}' and exception = '{}'",
+                joinPoint.getSignature().getName(),
+                e.getCause() != null ? e.getCause() : "NULL",
+                e.getMessage(),
+                e
+            );
         } else {
-            logger(joinPoint)
-                .error(
-                    "Exception in {}() with cause = {}",
-                    joinPoint.getSignature().getName(),
-                    e.getCause() != null ? String.valueOf(e.getCause()) : "NULL"
-                );
+            logger(joinPoint).error(
+                "Exception in {}() with cause = {}",
+                joinPoint.getSignature().getName(),
+                e.getCause() != null ? String.valueOf(e.getCause()) : "NULL"
+            );
         }
     }
 

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

@@ -28,7 +28,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  */
 @ConfigurationProperties(prefix = "application", ignoreUnknownFields = false)
 public class ApplicationProperties {
-
     // jhipster-needle-application-properties-property
 
     // jhipster-needle-application-properties-property-getter

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

@@ -40,7 +40,7 @@ import java.util.concurrent.Executor;
 @Profile("!testdev & !testprod")
 public class AsyncConfiguration implements AsyncConfigurer {
 
-    private final Logger log = LoggerFactory.getLogger(AsyncConfiguration.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AsyncConfiguration.class);
 
     private final TaskExecutionProperties taskExecutionProperties;
 
@@ -51,7 +51,7 @@ public class AsyncConfiguration implements AsyncConfigurer {
     @Override
     @Bean(name = "taskExecutor")
     public Executor getAsyncExecutor() {
-        log.debug("Creating Async Task Executor");
+        LOG.debug("Creating Async Task Executor");
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(taskExecutionProperties.getPool().getCoreSize());
         executor.setMaxPoolSize(taskExecutionProperties.getPool().getMaxSize());

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

@@ -23,26 +23,27 @@ import org.springframework.boot.ansi.AnsiStyle;
  * @see <a href="https://github.com/jhipster/generator-jhipster/issues/14949">JHipster issue</a>
  */
 public class CRLFLogConverter extends CompositeConverter<ILoggingEvent> {
+
     public static final Marker CRLF_SAFE_MARKER = MarkerFactory.getMarker("CRLF_SAFE");
 
-    private static final String[] SAFE_LOGGERS = {
+    private static final String[] SAFE_LOGS = {
         "org.hibernate",
         "org.springframework.boot.autoconfigure",
         "org.springframework.boot.diagnostics",
     };
     private static final Map<String, AnsiElement> ELEMENTS;
 
-	static {
-		Map<String, AnsiElement> ansiElements = new HashMap<>();
-		ansiElements.put("faint", AnsiStyle.FAINT);
-		ansiElements.put("red", AnsiColor.RED);
-		ansiElements.put("green", AnsiColor.GREEN);
-		ansiElements.put("yellow", AnsiColor.YELLOW);
-		ansiElements.put("blue", AnsiColor.BLUE);
-		ansiElements.put("magenta", AnsiColor.MAGENTA);
-		ansiElements.put("cyan", AnsiColor.CYAN);
-		ELEMENTS = Collections.unmodifiableMap(ansiElements);
-	}
+    static {
+        Map<String, AnsiElement> ansiElements = new HashMap<>();
+        ansiElements.put("faint", AnsiStyle.FAINT);
+        ansiElements.put("red", AnsiColor.RED);
+        ansiElements.put("green", AnsiColor.GREEN);
+        ansiElements.put("yellow", AnsiColor.YELLOW);
+        ansiElements.put("blue", AnsiColor.BLUE);
+        ansiElements.put("magenta", AnsiColor.MAGENTA);
+        ansiElements.put("cyan", AnsiColor.CYAN);
+        ELEMENTS = Collections.unmodifiableMap(ansiElements);
+    }
 
     @Override
     protected String transform(ILoggingEvent event, String in) {
@@ -56,7 +57,7 @@ public class CRLFLogConverter extends CompositeConverter<ILoggingEvent> {
     }
 
     protected boolean isLoggerSafe(ILoggingEvent event) {
-        for (String safeLogger : SAFE_LOGGERS) {
+        for (String safeLogger : SAFE_LOGS) {
             if (event.getLoggerName().startsWith(safeLogger)) {
                 return true;
             }
@@ -64,7 +65,7 @@ public class CRLFLogConverter extends CompositeConverter<ILoggingEvent> {
         return false;
     }
 
-	protected String toAnsiString(String in, AnsiElement element) {
-		return AnsiOutput.toString(element, in);
-	}
+    protected String toAnsiString(String in, AnsiElement element) {
+        return AnsiOutput.toString(element, in);
+    }
 }

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

@@ -36,6 +36,5 @@ public final class Constants {
     public static final String ID_DELIMITER = "__";
 <%_ } _%>
 
-    private Constants() {
-    }
+    private Constants() {}
 }

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

@@ -67,6 +67,8 @@ import static org.springframework.security.oauth2.core.oidc.StandardClaimNames.P
 
 import <%= packageName %>.security.oauth2.AudienceValidator;
 import <%= packageName %>.security.SecurityUtils;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
@@ -75,6 +77,7 @@ import org.springframework.security.oauth2.core.OAuth2TokenValidator;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.jwt.*;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.GrantedAuthority;
   <%_ if (!applicationTypeMicroservice) { _%>
@@ -284,7 +287,9 @@ public class SecurityConfiguration {
   <%_ } else { _%>
             .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
   <%_ } _%>
-            .oauth2ResourceServer(oauth2 -> oauth2.jwt(withDefaults()))
+            .oauth2ResourceServer(oauth2 -> oauth2
+                .jwt(jwt -> jwt
+                    .jwtAuthenticationConverter(authenticationConverter())))
             .oauth2Client(withDefaults());
 <%_ } _%>
 <%_ if (devDatabaseTypeH2Any) { _%>
@@ -305,6 +310,21 @@ public class SecurityConfiguration {
     }
 <%_ if (authenticationTypeOauth2) { _%>
 
+    Converter<Jwt, AbstractAuthenticationToken> authenticationConverter() {
+        JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
+        jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(
+            new Converter<Jwt, Collection<GrantedAuthority>>() {
+                @Override
+                public Collection<GrantedAuthority> convert(Jwt jwt) {
+                    return SecurityUtils.extractAuthorityFromClaims(jwt.getClaims());
+                }
+            }
+        );
+        jwtAuthenticationConverter.setPrincipalClaimName(PREFERRED_USERNAME);
+        return jwtAuthenticationConverter;
+    }
+    <%_ if (!applicationTypeMicroservice) { _%>
+
     OAuth2UserService<OidcUserRequest, OidcUser> oidcUserService() {
         final OidcUserService delegate = new OidcUserService();
 
@@ -313,7 +333,6 @@ public class SecurityConfiguration {
             return new DefaultOidcUser(oidcUser.getAuthorities(), oidcUser.getIdToken(), oidcUser.getUserInfo(), PREFERRED_USERNAME);
         };
     }
-  <%_ if (!applicationTypeMicroservice) { _%>
 
     /**
      * Map authorities from "groups" or "roles" claim in ID Token.
@@ -323,7 +342,7 @@ public class SecurityConfiguration {
      */
     @Bean
     public GrantedAuthoritiesMapper userAuthoritiesMapper() {
-        return (authorities) -> {
+        return authorities -> {
             Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
 
             authorities.forEach(authority -> {
@@ -365,6 +384,7 @@ public class SecurityConfiguration {
      * @see <a href="https://stackoverflow.com/q/74447118/65681">CSRF protection not working with Spring Security 6</a>
      */
     static final class SpaCsrfTokenRequestHandler extends CsrfTokenRequestAttributeHandler {
+
         private final CsrfTokenRequestHandler delegate = new XorCsrfTokenRequestAttributeHandler();
 
         @Override

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

@@ -24,7 +24,10 @@ import static org.springframework.security.oauth2.core.oidc.StandardClaimNames.P
 
 import <%= packageName %>.security.SecurityUtils;
 import <%= packageName %>.security.oauth2.AudienceValidator;
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.oauth2.server.resource.authentication.ReactiveJwtAuthenticationConverter;
 import org.springframework.beans.factory.annotation.Value;
+import reactor.core.publisher.Flux;
 <%_ } _%>
 <%_ if (authenticationUsesCsrf) { _%>
 import tech.jhipster.web.filter.reactive.CookieCsrfFilter;
@@ -39,6 +42,7 @@ import <%= packageName %>.web.filter.SpaWebFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 <%_ if (authenticationTypeOauth2) { _%>
+import org.springframework.core.convert.converter.Converter;
   <%_ if (!applicationTypeMicroservice) { _%>
 import org.springframework.core.ParameterizedTypeReference;
   <%_ } _%>
@@ -182,7 +186,9 @@ public class SecurityConfiguration {
 
     @Bean
     public ReactiveAuthenticationManager reactiveAuthenticationManager(ReactiveUserDetailsService userDetailsService) {
-        UserDetailsRepositoryReactiveAuthenticationManager authenticationManager = new UserDetailsRepositoryReactiveAuthenticationManager(userDetailsService);
+        UserDetailsRepositoryReactiveAuthenticationManager authenticationManager = new UserDetailsRepositoryReactiveAuthenticationManager(
+            userDetailsService
+        );
         authenticationManager.setPasswordEncoder(passwordEncoder());
         return authenticationManager;
     }
@@ -191,8 +197,7 @@ public class SecurityConfiguration {
     @Bean
     public MapReactiveUserDetailsService userDetailsService(SecurityProperties properties) {
         SecurityProperties.User user = properties.getUser();
-        UserDetails userDetails = User
-            .withUsername(user.getName())
+        UserDetails userDetails = User.withUsername(user.getName())
             .password("{noop}" + user.getPassword())
             .roles(StringUtils.toStringArray(user.getRoles()))
             .build();
@@ -303,7 +308,9 @@ public class SecurityConfiguration {
             .oauth2Login(oauth2 -> oauth2.authorizationRequestResolver(authorizationRequestResolver(this.clientRegistrationRepository)))
   <%_ } _%>
             .oauth2Client(withDefaults())
-            .oauth2ResourceServer(oauth2 -> oauth2.jwt(withDefaults()));
+            .oauth2ResourceServer(oauth2 -> oauth2
+                .jwt(jwt -> jwt
+                    .jwtAuthenticationConverter(jwtAuthenticationConverter())));
 <%_ } else if (authenticationTypeJwt) { _%>
             .httpBasic(basic -> basic.disable())
             .oauth2ResourceServer(oauth2 -> oauth2.jwt(withDefaults()));
@@ -314,23 +321,39 @@ public class SecurityConfiguration {
 <%_ if (authenticationTypeOauth2) { _%>
   <%_ if (!applicationTypeMicroservice) { _%>
     private ServerOAuth2AuthorizationRequestResolver authorizationRequestResolver(
-        ReactiveClientRegistrationRepository clientRegistrationRepository) {
-        DefaultServerOAuth2AuthorizationRequestResolver authorizationRequestResolver =
-            new DefaultServerOAuth2AuthorizationRequestResolver(clientRegistrationRepository);
+        ReactiveClientRegistrationRepository clientRegistrationRepository
+    ) {
+        DefaultServerOAuth2AuthorizationRequestResolver authorizationRequestResolver = new DefaultServerOAuth2AuthorizationRequestResolver(
+            clientRegistrationRepository
+        );
         if (this.issuerUri.contains("auth0.com")) {
             authorizationRequestResolver.setAuthorizationRequestCustomizer(authorizationRequestCustomizer());
         }
-        return  authorizationRequestResolver;
+        return authorizationRequestResolver;
     }
 
     private Consumer<OAuth2AuthorizationRequest.Builder> authorizationRequestCustomizer() {
-        return customizer -> customizer
-            .authorizationRequestUri(uriBuilder ->
-                uriBuilder.queryParam("audience", jHipsterProperties.getSecurity().getOauth2().getAudience())
-                    .build());
+        return customizer ->
+            customizer.authorizationRequestUri(uriBuilder ->
+                uriBuilder.queryParam("audience", jHipsterProperties.getSecurity().getOauth2().getAudience()).build()
+            );
     }
   <%_ } _%>
 
+    Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() {
+        ReactiveJwtAuthenticationConverter jwtAuthenticationConverter = new ReactiveJwtAuthenticationConverter();
+        jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(
+            new Converter<Jwt, Flux<GrantedAuthority>>() {
+                @Override
+                public Flux<GrantedAuthority> convert(Jwt jwt) {
+                    return Flux.fromIterable(SecurityUtils.extractAuthorityFromClaims(jwt.getClaims()));
+                }
+            }
+        );
+        jwtAuthenticationConverter.setPrincipalClaimName(PREFERRED_USERNAME);
+        return jwtAuthenticationConverter;
+    }
+
     /**
      * Map authorities from "groups" or "roles" claim in ID Token.
      *
@@ -340,20 +363,26 @@ public class SecurityConfiguration {
     public ReactiveOAuth2UserService<OidcUserRequest, OidcUser> oidcUserService() {
         final OidcReactiveOAuth2UserService delegate = new OidcReactiveOAuth2UserService();
 
-        return (userRequest) -> {
+        return userRequest -> {
             // Delegate to the default implementation for loading a user
-            return delegate.loadUser(userRequest).map(user -> {
-                Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
-
-                user.getAuthorities().forEach(authority -> {
-                    if (authority instanceof OidcUserAuthority) {
-                        OidcUserAuthority oidcUserAuthority = (OidcUserAuthority) authority;
-                        mappedAuthorities.addAll(SecurityUtils.extractAuthorityFromClaims(oidcUserAuthority.getUserInfo().getClaims()));
-                    }
+            return delegate
+                .loadUser(userRequest)
+                .map(user -> {
+                    Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
+
+                    user
+                        .getAuthorities()
+                        .forEach(authority -> {
+                            if (authority instanceof OidcUserAuthority) {
+                                OidcUserAuthority oidcUserAuthority = (OidcUserAuthority) authority;
+                                mappedAuthorities.addAll(
+                                    SecurityUtils.extractAuthorityFromClaims(oidcUserAuthority.getUserInfo().getClaims())
+                                );
+                            }
+                        });
+
+                    return new DefaultOidcUser(mappedAuthorities, user.getIdToken(), user.getUserInfo(), PREFERRED_USERNAME);
                 });
-
-                return new DefaultOidcUser(mappedAuthorities, user.getIdToken(), user.getUserInfo(), PREFERRED_USERNAME);
-            });
         };
     }
 
@@ -383,8 +412,7 @@ public class SecurityConfiguration {
 
     private ReactiveJwtDecoder createJwtDecoder(String issuerUri, String jwkSetUri, String userInfoUri) {
         NimbusReactiveJwtDecoder jwtDecoder = new NimbusReactiveJwtDecoder(jwkSetUri);
-        OAuth2TokenValidator<Jwt> audienceValidator = new AudienceValidator(
-            jHipsterProperties.getSecurity().getOauth2().getAudience());
+        OAuth2TokenValidator<Jwt> audienceValidator = new AudienceValidator(jHipsterProperties.getSecurity().getOauth2().getAudience());
         OAuth2TokenValidator<Jwt> withIssuer = JwtValidators.createDefaultWithIssuer(issuerUri);
         OAuth2TokenValidator<Jwt> withAudience = new DelegatingOAuth2TokenValidator<>(withIssuer, audienceValidator);
 
@@ -393,8 +421,7 @@ public class SecurityConfiguration {
         return new ReactiveJwtDecoder() {
             @Override
             public Mono<Jwt> decode(String token) throws JwtException {
-                return jwtDecoder.decode(token)
-                    .flatMap(jwt -> enrich(token, jwt));
+                return jwtDecoder.decode(token).flatMap(jwt -> enrich(token, jwt));
             }
 
             private Mono<Jwt> enrich(String token, Jwt jwt) {
@@ -403,17 +430,15 @@ public class SecurityConfiguration {
                     return Mono.just(jwt);
                 }
                 // Get user info from `users` cache if present
-                return Optional.ofNullable(users.getIfPresent(jwt.getSubject()))
-                    // Retrieve user info from OAuth provider if not already loaded
-                    .orElseGet(() -> WebClient.create()
+                return Optional.ofNullable(users.getIfPresent(jwt.getSubject())).orElseGet(() -> // Retrieve user info from OAuth provider if not already loaded
+                    WebClient.create()
                         .get()
                         .uri(userInfoUri)
                         .headers(headers -> headers.setBearerAuth(token))
                         .retrieve()
                         .bodyToMono(new ParameterizedTypeReference<Map<String, Object>>() {})
                         .map(userInfo ->
-                            Jwt
-                                .withTokenValue(jwt.getTokenValue())
+                            Jwt.withTokenValue(jwt.getTokenValue())
                                 .subject(jwt.getSubject())
                                 .audience(jwt.getAudience())
                                 .headers(headers -> headers.putAll(jwt.getHeaders()))
@@ -438,7 +463,7 @@ public class SecurityConfiguration {
                         )
                         // Put user info into the `users` cache
                         .doOnNext(newJwt -> users.put(jwt.getSubject(), Mono.just(newJwt)))
-                    );
+                );
             }
         };
     }

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

@@ -43,7 +43,7 @@ import org.springframework.security.oauth2.server.resource.web.DefaultBearerToke
 @Configuration
 public class SecurityJwtConfiguration {
 
-    private final Logger log = LoggerFactory.getLogger(SecurityJwtConfiguration.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SecurityJwtConfiguration.class);
 
     @Value("${jhipster.security.authentication.jwt.base64-secret}")
     private String jwtKey;
@@ -60,14 +60,14 @@ public class SecurityJwtConfiguration {
                         if (e.getMessage().contains("Jwt expired at")) {
                             metersService.trackTokenExpired();
                         } else if (e.getMessage().contains("Failed to validate the token")) {
-                            metersService.trackTokenInvalidSignature();        
+                            metersService.trackTokenInvalidSignature();
                         } else if (
                             e.getMessage().contains("Invalid JWT serialization:") ||
                             e.getMessage().contains("Invalid unsecured/JWS/JWE header:")
                         ) {
                             metersService.trackTokenMalformed();
                         } else {
-                            log.error("Unknown JWT reactive error {}", e.getMessage());
+                            LOG.error("Unknown JWT reactive error {}", e.getMessage());
                         }
                     });
             } catch (Exception e) {
@@ -76,7 +76,7 @@ public class SecurityJwtConfiguration {
                 } else if (e.getMessage().contains("Failed to validate the token")) {
                     metersService.trackTokenInvalidSignature();
                 } else {
-                    log.error("Unknown JWT error {}", e.getMessage());
+                    LOG.error("Unknown JWT error {}", e.getMessage());
                 }
                 throw e;
             }
@@ -95,7 +95,7 @@ public class SecurityJwtConfiguration {
                 ) {
                     metersService.trackTokenMalformed();
                 } else {
-                    log.error("Unknown JWT error {}", e.getMessage());
+                    LOG.error("Unknown JWT error {}", e.getMessage());
                 }
                 throw e;
             }

package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SpringDocConfiguration.java.ejs

@@ -0,0 +1,40 @@
+<%#
+ Copyright 2013-2024 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%- packageName %>.config;
+
+import java.util.List;
+
+import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SpringDocConfiguration {
+
+    @Bean
+    public ServerBaseUrlCustomizer serverBaseUrlRequestCustomizer() {
+        return (serverBaseUrl, request) -> {
+            List<String> forwardedPrefix = request.getHeaders().get("X-Forwarded-Prefix");
+            if (forwardedPrefix != null && forwardedPrefix.size() > 0) {
+                return forwardedPrefix.get(0);
+            }
+            return serverBaseUrl;
+        };
+    }
+}

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

@@ -63,5 +63,4 @@ public class StaticResourcesWebConfiguration implements WebMvcConfigurer {
     private int getJHipsterHttpCacheProperty() {
         return jhipsterProperties.getHttp().getCache().getTimeToLiveInDays();
     }
-
 }

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

@@ -94,7 +94,7 @@ import java.util.concurrent.TimeUnit;
 @Configuration
 public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitializer<% if (!skipClient) { %>, WebServerFactoryCustomizer<WebServerFactory><% } %><% } %><% if (reactive) { %>WebFluxConfigurer<% } %> {
 
-    private final Logger log = LoggerFactory.getLogger(WebConfigurer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebConfigurer.class);
 
 <%_ if (!reactive) { _%>
     private final Environment env;
@@ -125,7 +125,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
     @Override
     public void onStartup(ServletContext servletContext) {
         if (env.getActiveProfiles().length != 0) {
-            log.info("Web application configuration, using profiles: {}", (Object[]) env.getActiveProfiles());
+            LOG.info("Web application configuration, using profiles: {}", (Object[]) env.getActiveProfiles());
         }
 
   <%_ if (devDatabaseTypeH2Any) { _%>
@@ -133,7 +133,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
             initH2Console(servletContext);
         }
   <%_ } _%>
-        log.info("Web application fully configured");
+        LOG.info("Web application fully configured");
     }
   <%_ if (!skipClient) { _%>
 
@@ -178,8 +178,8 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
     public <% if (reactive) { %>CorsConfigurationSource corsConfigurationSource()<% } else { %>CorsFilter corsFilter()<% } %> {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = jHipsterProperties.getCors();
-        if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || ! CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) {
-            log.debug("Registering CORS filter");
+        if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || !CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) {
+            LOG.debug("Registering CORS filter");
             source.registerCorsConfiguration("/api/**", config);
             source.registerCorsConfiguration("/management/**", config);
             source.registerCorsConfiguration("/v3/api-docs", config);
@@ -236,7 +236,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
      * Initializes H2 console.
      */
     private void initH2Console(ServletContext servletContext) {
-        log.debug("Initialize H2 console");
+        LOG.debug("Initialize H2 console");
         H2ConfigurationHelper.initH2Console(servletContext);
     }
 <%_ } _%>

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

@@ -27,7 +27,8 @@ import io.micrometer.core.instrument.MeterRegistry;
 public class SecurityMetersService {
 
     public static final String INVALID_TOKENS_METER_NAME = "security.authentication.invalid-tokens";
-    public static final String INVALID_TOKENS_METER_DESCRIPTION = "Indicates validation error count of the tokens presented by the clients.";
+    public static final String INVALID_TOKENS_METER_DESCRIPTION =
+        "Indicates validation error count of the tokens presented by the clients.";
     public static final String INVALID_TOKENS_METER_BASE_UNIT = "errors";
     public static final String INVALID_TOKENS_METER_CAUSE_DIMENSION = "cause";
 

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

@@ -29,6 +29,5 @@ public final class AuthoritiesConstants {
 
     public static final String ANONYMOUS = "ROLE_ANONYMOUS";
 
-    private AuthoritiesConstants() {
-    }
+    private AuthoritiesConstants() {}
 }

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

@@ -51,7 +51,7 @@ import java.util.*;
 @Component("userDetailsService")
 public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<% } %>UserDetailsService {
 
-    private final Logger log = LoggerFactory.getLogger(DomainUserDetailsService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DomainUserDetailsService.class);
 
     private final UserRepository userRepository;
 
@@ -64,7 +64,7 @@ public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<%
     @Transactional(readOnly = true)
 <%_ } _%>
     public <% if (reactive) { %>Mono<UserDetails> findByUsername<% } else { %>UserDetails loadUserByUsername<% } %>(final String login) {
-        log.debug("Authenticating {}", login);
+        LOG.debug("Authenticating {}", login);
 
         if (new EmailValidator().isValid(login, null)) {
             return userRepository.<% if (databaseTypeSql) { %>findOneWithAuthoritiesByEmailIgnoreCase<% } else { %>findOneByEmailIgnoreCase<% } %>(login)
@@ -93,8 +93,6 @@ public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<%
             .map(Authority::getName)<% } %>
             .map(SimpleGrantedAuthority::new)
             .toList();
-        return new org.springframework.security.core.userdetails.User(user.getLogin(),
-            user.getPassword(),
-            grantedAuthorities);
+        return new org.springframework.security.core.userdetails.User(user.getLogin(), user.getPassword(), grantedAuthorities);
     }
 }