generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.3

package/dist/generators/server/templates/pom.xml.ejs

@@ -60,6 +60,7 @@
         <spring-boot.version><%- javaDependencies['spring-boot'] %></spring-boot.version>
 <%_ if (reactive) { _%>
         <blockhound-junit-platform.version><%- javaDependencies['blockhound-junit-platform'] %></blockhound-junit-platform.version>
+        <micrometer-context-propagation.version><%- javaDependencies['micrometer-context-propagation'] %></micrometer-context-propagation.version>
 <%_ } _%>
         <archunit-junit5.version><%- javaDependencies['archunit-junit5'] %></archunit-junit5.version>
         <mapstruct.version><%- javaDependencies.mapstruct %></mapstruct.version>
@@ -71,7 +72,7 @@
         <checksum-maven-plugin.version><%- javaDependencies['checksum-maven-plugin'] %></checksum-maven-plugin.version>
         <frontend-maven-plugin.version><%- javaDependencies['frontend-maven-plugin'] %></frontend-maven-plugin.version>
 <%_ } _%>
-        <git-commit-id-plugin.version><%- javaDependencies['git-commit-id-plugin'] %></git-commit-id-plugin.version>
+        <git-commit-id-maven-plugin.version><%- javaDependencies['git-commit-id-maven-plugin'] %></git-commit-id-maven-plugin.version>
         <jacoco-maven-plugin.version><%- javaDependencies['jacoco-maven-plugin'] %></jacoco-maven-plugin.version>
         <jib-maven-plugin.version><%- javaDependencies['jib-maven-plugin'] %></jib-maven-plugin.version>
         <jib-maven-plugin.image><%- dockerContainers.javaJre %></jib-maven-plugin.image>
@@ -100,6 +101,7 @@
 <%_ } _%>
         <properties-maven-plugin.version><%- javaDependencies['properties-maven-plugin'] %></properties-maven-plugin.version>
         <sonar-maven-plugin.version><%- javaDependencies['sonar-maven-plugin'] %></sonar-maven-plugin.version>
+        <spotless-maven-plugin.version><%- javaDependencies['spotless-maven-plugin'] %></spotless-maven-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -199,6 +201,12 @@
             <version>${blockhound-junit-platform.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <!-- fix https://github.com/jhipster/generator-jhipster/issues/21359 -->
+            <groupId>io.micrometer</groupId>
+            <artifactId>context-propagation</artifactId>
+            <version>${micrometer-context-propagation.version}</version>
+        </dependency>
 <%_ } else { _%>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -346,12 +354,6 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
-        <dependency>
-            <!-- fix https://github.com/reactor/BlockHound/issues/311 -->
-            <groupId>io.micrometer</groupId>
-            <artifactId>context-propagation</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
@@ -405,6 +407,10 @@
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -555,7 +561,7 @@
                 <plugin>
                     <groupId>io.github.git-commit-id</groupId>
                     <artifactId>git-commit-id-maven-plugin</artifactId>
-                    <version>${git-commit-id-plugin.version}</version>
+                    <version>${git-commit-id-maven-plugin.version}</version>
                     <executions>
                         <execution>
                             <goals>
@@ -589,6 +595,12 @@
                     </executions>
                     <configuration>
                       <javaVersion>${java.version}</javaVersion>
+                      <%_ if (databaseTypeCassandra) { _%>
+                      <ignoreClassNamePatterns>
+                        <ignoreClassNamePattern><%= packageName %>.domain.PersistentTokenHelper__MapperGenerated</ignoreClassNamePattern>
+                        <ignoreClassNamePattern><%= packageName %>.domain.UserHelper__MapperGenerated</ignoreClassNamePattern>
+                      </ignoreClassNamePatterns>
+                      <%_ } _%>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -838,6 +850,25 @@
                     <artifactId>sonar-maven-plugin</artifactId>
                     <version>${sonar-maven-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.diffplug.spotless</groupId>
+                    <artifactId>spotless-maven-plugin</artifactId>
+                    <version>${spotless-maven-plugin.version}</version>
+                    <configuration>
+                        <java>
+                            <!-- <removeUnusedImports/> -->
+                        </java>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>spotless</id>
+                            <phase>process-sources</phase>
+                            <goals>
+                                <goal>apply</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
@@ -854,7 +885,6 @@
 <%_ if (embeddableLaunchScript) { _%>
                         <executable>true</executable>
 <%_ } _%>
-                        <fork>true</fork>
                         <!--
                         Enable the line below to have remote debugging of your application on port 5005
                         <jvmArguments>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</jvmArguments>

package/dist/generators/server/templates/settings.gradle.ejs

@@ -37,6 +37,7 @@ pluginManagement {
         id 'com.github.node-gradle.node' version "${gradleNodePluginVersion}"
 <%_ } _%>
         id 'org.sonarqube' version "${sonarqubePluginVersion}"
+        id 'com.diffplug.spotless' version "${spotlessPluginVersion}"
         id "io.spring.nohttp" version "${noHttpCheckstyleVersion}"
         id 'com.github.andygoossens.gradle-modernizer-plugin' version "${modernizerPluginVersion}"
 <%_ if (enableGradleEnterprise) { _%>

package/dist/generators/server/templates/src/main/java/package/Application.java.ejs

@@ -88,6 +88,7 @@ public class <%= mainClass %> {
 
     private static void logApplicationStartup(Environment env) {
         String protocol = Optional.ofNullable(env.getProperty("server.ssl.key-store")).map(key -> "https").orElse("http");
+        String applicationName = env.getProperty("spring.application.name");
         String serverPort = env.getProperty("server.port");
         String contextPath = Optional.ofNullable(env.getProperty("server.servlet.context-path")).filter(StringUtils::isNotBlank).orElse("/");
         String hostAddress = "localhost";
@@ -106,7 +107,7 @@ public class <%= mainClass %> {
                 \tExternal: \t{}://{}:{}{}
                 \tProfile(s): \t{}
                 ----------------------------------------------------------""",
-            env.getProperty("spring.application.name"),
+            applicationName,
             protocol,
             serverPort,
             contextPath,

package/dist/generators/server/templates/src/main/java/package/client/AuthorizedFeignClient.java.ejs

@@ -19,7 +19,6 @@
 package <%= packageName %>.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.core.annotation.AliasFor;
 
 import java.lang.annotation.*;
@@ -41,7 +40,7 @@ public @interface AuthorizedFeignClient {
      * {@link feign.codec.Encoder}, {@link feign.Contract}.
      *
      * @return the custom {@code @Configuration} for the feign client.
-     * @see FeignClientsConfiguration for the defaults.
+     * @see org.springframework.cloud.openfeign.FeignClientsConfiguration for the defaults.
      */
     @AliasFor(annotation = FeignClient.class, attribute = "configuration")
     Class<?>[] configuration() default OAuth2InterceptedFeignConfiguration.class;

package/dist/generators/server/templates/src/main/java/package/config/CRLFLogConverter.java.ejs

@@ -5,6 +5,7 @@ import ch.qos.logback.core.pattern.CompositeConverter;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Marker;
@@ -46,7 +47,8 @@ public class CRLFLogConverter extends CompositeConverter<ILoggingEvent> {
     @Override
     protected String transform(ILoggingEvent event, String in) {
         AnsiElement element = ELEMENTS.get(getFirstOption());
-        if ((event.getMarker() != null && event.getMarker().contains(CRLF_SAFE_MARKER)) || isLoggerSafe(event)) {
+        List<Marker> markers = event.getMarkerList();
+        if ((markers != null && !markers.isEmpty() && markers.get(0).contains(CRLF_SAFE_MARKER)) || isLoggerSafe(event)) {
             return in;
         }
         String replacement = element == null ? "_" : toAnsiString("_", element);

package/dist/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs

@@ -19,7 +19,7 @@
 package <%= packageName %>.config;
 
 <%_ if (databaseTypeSql && !reactive) { _%>
-import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;
+import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
 <%_ } _%>
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -49,8 +49,8 @@ public class JacksonConfiguration {
      * Support for Hibernate types in Jackson.
      */
     @Bean
-    public Hibernate5JakartaModule hibernate5Module() {
-        return new Hibernate5JakartaModule();
+    public Hibernate6Module hibernate6Module() {
+        return new Hibernate6Module();
     }
 <%_ } _%>
 }

package/dist/generators/server/templates/src/main/java/package/config/OAuth2Configuration.java.ejs

@@ -29,7 +29,6 @@ public class OAuth2Configuration {
                 .authorizationCode()
                 .refreshToken(builder -> builder.clockSkew(Duration.ofMinutes(1)))
                 .clientCredentials()
-                .password()
                 .build()
         );
 

package/dist/generators/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs

@@ -21,17 +21,29 @@ package <%= packageName %>.config;
 import <%= packageName %>.security.*;
 import tech.jhipster.config.JHipsterProperties;
 
+<%_ if (authenticationTypeSession || devDatabaseTypeH2Any) { _%>
+import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
+
+<%_ } _%>
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 <%_ if (authenticationTypeOauth2) { _%>
 import org.springframework.core.convert.converter.Converter;
 <%_ } _%>
+<%_ if (devDatabaseTypeH2Any) { _%>
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.Profiles;
+import tech.jhipster.config.JHipsterConstants;
+<%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
 import org.springframework.http.HttpMethod;
+import org.springframework.security.config.Customizer;
 <%_ } _%>
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+<%_ if (!skipClient) { _%>
+import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig;
+<%_ } _%>
 import org.springframework.security.web.SecurityFilterChain;
 <%_ if (!skipClient || authenticationUsesCsrf) { _%>
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
@@ -69,7 +81,6 @@ import java.util.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.web.authentication.HttpStatusEntryPoint;
 import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.OrRequestMatcher;
   <%_ if (generateUserManagement) { _%>
 import org.springframework.security.web.authentication.RememberMeServices;
@@ -81,7 +92,6 @@ import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
 import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter;
-import static org.springframework.security.config.Customizer.withDefaults;
 <%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
 import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationEntryPoint;
@@ -95,12 +105,21 @@ import <%= packageName %>.security.oauth2.CustomClaimConverter;
 <%_ if(!skipClient) { _%>
 import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
 <%_ } _%>
+import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
+import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
+
+<%_ if (authenticationTypeOauth2 || !applicationTypeMicroservice) { _%>
+import static org.springframework.security.config.Customizer.withDefaults;
+<%_ } _%>
 
 @Configuration
-@EnableWebSecurity
 @EnableMethodSecurity(securedEnabled = true)
 public class SecurityConfiguration {
+<%_ if (devDatabaseTypeH2Any) { _%>
 
+    private final Environment env;
+<%_ } _%>
+    
     private final JHipsterProperties jHipsterProperties;
 <%_ if (authenticationTypeSession && generateUserManagement) { _%>
 
@@ -112,7 +131,10 @@ public class SecurityConfiguration {
     private String issuerUri;
     <%_ } _%>
 
-    public SecurityConfiguration(<% if (authenticationTypeSession && generateUserManagement) { %>RememberMeServices rememberMeServices, <% } %> JHipsterProperties jHipsterProperties) {
+    public SecurityConfiguration(<% if (devDatabaseTypeH2Any) { %>Environment env, <% } %><% if (authenticationTypeSession && generateUserManagement) { %>RememberMeServices rememberMeServices, <% } %> JHipsterProperties jHipsterProperties) {
+<%_ if (devDatabaseTypeH2Any) { _%>
+        this.env = env;
+<%_ } _%>       
 <%_ if (authenticationTypeSession && generateUserManagement) { _%>
         this.rememberMeServices = rememberMeServices;
 <%_ } _%>
@@ -127,12 +149,12 @@ public class SecurityConfiguration {
 <%_ } _%>
 
     @Bean
-    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+    public SecurityFilterChain filterChain(HttpSecurity http, MvcRequestMatcher.Builder mvc) throws Exception {
         http
-            .csrf(csrf -> csrf
-<%_ if (devDatabaseTypeH2Any) { _%>
-                .ignoringRequestMatchers("/h2-console/**")
+<%_ if (!applicationTypeMicroservice) { _%>
+            .cors(withDefaults())
 <%_ } _%>
+            .csrf(csrf -> csrf
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
                 .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
                 // See https://stackoverflow.com/q/74447118/65681
@@ -151,7 +173,7 @@ public class SecurityConfiguration {
 <%_ if (!skipClient) { _%>
             .headers(headers -> headers
                 .contentSecurityPolicy(csp -> csp.policyDirectives(jHipsterProperties.getSecurity().getContentSecurityPolicy()))
-                .frameOptions(frameOptions -> frameOptions.sameOrigin())
+                .frameOptions(FrameOptionsConfig::sameOrigin)
                 .referrerPolicy(referrer -> referrer.policy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN))
                 .permissionsPolicy(permissions ->
                     permissions.policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")))
@@ -160,42 +182,39 @@ public class SecurityConfiguration {
                 // prettier-ignore
                 authz
 <%_ if (!skipClient) { _%>
-                    .requestMatchers("/", "/index.html", "/*.js", "/*.map", "/*.css").permitAll()
-                    .requestMatchers("/*.ico", "/*.png", "/*.svg", "/*.webapp").permitAll()
-                    .requestMatchers("/app/**").permitAll()
-                    .requestMatchers("/i18n/**").permitAll()
-                    .requestMatchers("/content/**").permitAll()
-                    .requestMatchers("/swagger-ui/**").permitAll()
-<%_ } _%>
-<%_ if (devDatabaseTypeH2Any) { _%>
-                    .requestMatchers("/h2-console/**").permitAll()
+                    .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll()
+                    .requestMatchers(mvc.pattern("/*.ico"), mvc.pattern("/*.png"), mvc.pattern("/*.svg"), mvc.pattern("/*.webapp")).permitAll()
+                    .requestMatchers(mvc.pattern("/app/**")).permitAll()
+                    .requestMatchers(mvc.pattern("/i18n/**")).permitAll()
+                    .requestMatchers(mvc.pattern("/content/**")).permitAll()
+                    .requestMatchers(mvc.pattern("/swagger-ui/**")).permitAll()
 <%_ } _%>
 <%_ if (authenticationTypeJwt) { _%>
-                    .requestMatchers(HttpMethod.POST, "/api/authenticate").permitAll()
-                    .requestMatchers(HttpMethod.GET, "/api/authenticate").permitAll()
+                    .requestMatchers(mvc.pattern(HttpMethod.POST, "/api/authenticate")).permitAll()
+                    .requestMatchers(mvc.pattern(HttpMethod.GET, "/api/authenticate")).permitAll()
 <%_ } else { _%>
-                    .requestMatchers("/api/authenticate").permitAll()
+                    .requestMatchers(mvc.pattern("/api/authenticate")).permitAll()
 <%_ } _%>
 <%_ if (generateUserManagement) { _%>
-                    .requestMatchers("/api/register").permitAll()
-                    .requestMatchers("/api/activate").permitAll()
-                    .requestMatchers("/api/account/reset-password/init").permitAll()
-                    .requestMatchers("/api/account/reset-password/finish").permitAll()
+                    .requestMatchers(mvc.pattern("/api/register")).permitAll()
+                    .requestMatchers(mvc.pattern("/api/activate")).permitAll()
+                    .requestMatchers(mvc.pattern("/api/account/reset-password/init")).permitAll()
+                    .requestMatchers(mvc.pattern("/api/account/reset-password/finish")).permitAll()
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
-                    .requestMatchers("/api/auth-info").permitAll()
+                    .requestMatchers(mvc.pattern("/api/auth-info")).permitAll()
 <%_ } _%>
-                    .requestMatchers("/api/admin/**").hasAuthority(AuthoritiesConstants.ADMIN)
-                    .requestMatchers("/api/**").authenticated()
+                    .requestMatchers(mvc.pattern("/api/admin/**")).hasAuthority(AuthoritiesConstants.ADMIN)
+                    .requestMatchers(mvc.pattern("/api/**")).authenticated()
 <%_ if (communicationSpringWebsocket) { _%>
-                    .requestMatchers("/websocket/**").authenticated()
-<%_ } _%>
-                    .requestMatchers("/v3/api-docs/**").hasAuthority(AuthoritiesConstants.ADMIN)
-                    .requestMatchers("/management/health").permitAll()
-                    .requestMatchers("/management/health/**").permitAll()
-                    .requestMatchers("/management/info").permitAll()
-                    .requestMatchers("/management/prometheus").permitAll()
-                    .requestMatchers("/management/**").hasAuthority(AuthoritiesConstants.ADMIN))
+                    .requestMatchers(mvc.pattern("/websocket/**")).authenticated()
+<%_ } _%>
+                    .requestMatchers(mvc.pattern("/v3/api-docs/**")).hasAuthority(AuthoritiesConstants.ADMIN)
+                    .requestMatchers(mvc.pattern("/management/health")).permitAll()
+                    .requestMatchers(mvc.pattern("/management/health/**")).permitAll()
+                    .requestMatchers(mvc.pattern("/management/info")).permitAll()
+                    .requestMatchers(mvc.pattern("/management/prometheus")).permitAll()
+                    .requestMatchers(mvc.pattern("/management/**")).hasAuthority(AuthoritiesConstants.ADMIN))
 <%_ if (authenticationTypeSession) { _%>
   <%_ if (generateUserManagement) { _%>
             .rememberMe(rememberMe ->
@@ -210,9 +229,9 @@ public class SecurityConfiguration {
                     new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED),
                     new OrRequestMatcher(
   <%_ if (communicationSpringWebsocket) { _%>
-                        new AntPathRequestMatcher("/websocket/**"),
+                        antMatcher("/websocket/**"),
   <%_ } _%>
-                        new AntPathRequestMatcher("/api/**")
+                        antMatcher("/api/**")
                     )
                 )
             )
@@ -230,7 +249,7 @@ public class SecurityConfiguration {
             .exceptionHandling((exceptions) -> exceptions
 				.authenticationEntryPoint(new BearerTokenAuthenticationEntryPoint())
 				.accessDeniedHandler(new BearerTokenAccessDeniedHandler()))
-            .oauth2ResourceServer(oauth2 -> oauth2.jwt());
+            .oauth2ResourceServer(oauth2 -> oauth2.jwt(Customizer.withDefaults()));
 <%_ } else if (authenticationTypeOauth2) { _%>
   <%_ if (applicationTypeMonolith) { _%>
             .oauth2Login(withDefaults())
@@ -241,9 +260,23 @@ public class SecurityConfiguration {
                 .jwt(jwt -> jwt
                     .jwtAuthenticationConverter(authenticationConverter())))
             .oauth2Client();
+<%_ } _%>
+<%_ if (devDatabaseTypeH2Any) { _%>
+        if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
+            http
+  <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
+                .csrf(csrf -> csrf.ignoringRequestMatchers(antMatcher("/h2-console/**")))
+  <%_ } _%>
+                .authorizeHttpRequests(authz -> authz.requestMatchers(antMatcher("/h2-console/**")).permitAll());
+        }
 <%_ } _%>
         return http.build();
     }
+
+    @Bean
+    MvcRequestMatcher.Builder mvc(HandlerMappingIntrospector introspector) {
+        return new MvcRequestMatcher.Builder(introspector);
+    }
 <%_ if (authenticationTypeOauth2) { _%>
 
     Converter<Jwt, AbstractAuthenticationToken> authenticationConverter() {

package/dist/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs

@@ -45,8 +45,10 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.ParameterizedTypeReference;
   <%_ } _%>
 <%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
+import org.springframework.security.config.Customizer;
+<%_ } _%>
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 <%_ if (authenticationTypeSession) { _%>
@@ -124,6 +126,7 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Optional;
   <%_ } _%>
 
 import java.util.HashSet;
@@ -131,14 +134,14 @@ import java.util.Set;
   <%_ if (!applicationTypeMicroservice) { _%>
 import java.util.function.Consumer;
   <%_ } _%>
+<%_ } _%>
 
+<%_ if (authenticationTypeOauth2 || !applicationTypeMicroservice) { _%>
 import static org.springframework.security.config.Customizer.withDefaults;
 <%_ } _%>
-
 import static org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers.pathMatchers;
 
 @Configuration
-@EnableWebFluxSecurity
 @EnableReactiveMethodSecurity
 public class SecurityConfiguration {
 
@@ -211,6 +214,9 @@ public class SecurityConfiguration {
             .securityMatcher(new NegatedServerWebExchangeMatcher(new OrServerWebExchangeMatcher(
                 pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**")
             )))
+<%_ if (!applicationTypeMicroservice) { _%>
+            .cors(withDefaults())
+<%_ } _%>
             .csrf(csrf -> csrf
 <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
                 .csrfTokenRepository(CookieServerCsrfTokenRepository.withHttpOnlyFalse())
@@ -290,7 +296,7 @@ public class SecurityConfiguration {
                     .jwtAuthenticationConverter(jwtAuthenticationConverter())));
 <%_ } else if (authenticationTypeJwt) { _%>
             .httpBasic(basic -> basic.disable())
-            .oauth2ResourceServer(oauth2 -> oauth2.jwt());
+            .oauth2ResourceServer(oauth2 -> oauth2.jwt(Customizer.withDefaults()));
 <%_ } else { _%>;<%_ } _%>
         return http.build();
     }
@@ -392,11 +398,10 @@ public class SecurityConfiguration {
                 if (jwt.hasClaim("given_name") && jwt.hasClaim("family_name")) {
                     return Mono.just(jwt);
                 }
-                // Retrieve user info from OAuth provider if not already loaded
-                return users.get(jwt.getSubject(), s -> {
-                    WebClient webClient = WebClient.create();
-
-                    return webClient
+                // 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()
                         .get()
                         .uri(userInfoUri)
                         .headers(headers -> headers.setBearerAuth(token))
@@ -426,8 +431,10 @@ public class SecurityConfiguration {
                                 })
                                 .claims(claims -> claims.putAll(jwt.getClaims()))
                                 .build()
-                        );
-                });
+                        )
+                        // Put user info into the `users` cache
+                        .doOnNext(newJwt -> users.put(jwt.getSubject(), Mono.just(newJwt)))
+                    );
             }
         };
     }

package/dist/generators/server/templates/src/main/java/package/config/SecurityJwtConfiguration.java.ejs

@@ -60,6 +60,8 @@ public class SecurityJwtConfiguration {
                     .doOnError(e -> {
                         if (e.getMessage().contains("Jwt expired at")) {
                             metersService.trackTokenExpired();
+                        } else if (e.getMessage().contains("Failed to validate the token")) {
+                            metersService.trackTokenInvalidSignature();        
                         }
                     });
             } catch (Exception e) {

package/dist/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs

@@ -64,7 +64,7 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 <%_ } _%>
 <%_ if (reactive) { _%>
-import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.CorsConfigurationSource;;
 import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
 import org.springframework.web.reactive.config.WebFluxConfigurer;
 import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver;
@@ -175,7 +175,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
 <%_ } _%>
 
     @Bean
-    public Cors<% if (reactive) { %>Web<% } %>Filter corsFilter() {
+    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())) {
@@ -190,7 +190,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
             source.registerCorsConfiguration("/*/management/**", config);
 <%_ } _%>
         }
-        return new Cors<% if (reactive) { %>Web<% } %>Filter(source);
+        return <% if (reactive) { %>source<% } else { %>new CorsFilter(source)<% } %>;
     }
 <%_ if (reactive) { _%>
 

package/dist/generators/server/templates/src/main/java/package/domain/User.java.ejs

@@ -134,7 +134,7 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
 <%_ if (searchEngineElasticsearch) { _%>
 @org.springframework.data.elasticsearch.annotations.Document(indexName = "user")
 <%_ } _%>
-public class <%= user.persistClass %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %> extends AbstractAuditingEntity<<%= user.primaryKey.type %>><% } %> implements Serializable<% if (databaseTypeSql && reactive && requiresPersistableImplementation) { %>, Persistable<String><% } %> {
+public class <%= user.persistClass %><% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %> extends AbstractAuditingEntity<<%= user.primaryKey.type %>><% } %> implements Serializable<% if (databaseTypeSql && reactive && requiresPersistableImplementation) { %>, Persistable<<% if (user.primaryKey.hasUUID) { %>UUID<% } else { %>String<% } %>><% } %> {
 
     private static final long serialVersionUID = 1L;
 

package/dist/generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.ejs

@@ -35,7 +35,7 @@ import com.datastax.oss.driver.api.mapper.annotations.Mapper;
 import com.datastax.oss.driver.api.mapper.annotations.Select;
 <%_ } _%>
 import <%= packageName %>.domain.PersistentToken;
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ if (!databaseTypeCassandra) { _%>
 import java.time.LocalDate;
 <%_ } _%>

package/dist/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs

@@ -21,7 +21,7 @@ package <%= packageName %>.repository;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.domain.Authority;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 
 <%_ if (databaseTypeCassandra) { _%>
 import com.datastax.oss.driver.api.core.CqlIdentifier;
@@ -288,7 +288,7 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
 }
 <%_ } else if (databaseTypeSql && reactive) { _%>
 @Repository
-public interface UserRepository extends R2dbcRepository<<%= user.persistClass %>, <% if (authenticationTypeOauth2) { %>String<% } else { %>Long<% } %>>, UserRepositoryInternal {
+public interface UserRepository extends R2dbcRepository<<%= user.persistClass %>, <% if (authenticationTypeOauth2) { %>String<% } else { %><%= user.primaryKey.type %><% } %>>, UserRepositoryInternal {
 
   <%_ if (!authenticationTypeOauth2) { _%>
     Mono<<%= user.persistClass %>> findOneByActivationKey(String activationKey);
@@ -427,7 +427,7 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal {
                 .map(
                     t -> {
                         Authority authority = new Authority();
-                        authority.setName(t.getT2().get());
+                        authority.setName(t.getT2().orElseThrow());
                         return authority;
                     }
                 )

package/dist/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs

@@ -18,7 +18,7 @@
 -%>
 package <%= packageName %>.security;
 
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
 import <%= packageName %>.domain.Authority;
 <%_ } _%>
@@ -26,7 +26,6 @@ import <%= packageName %>.repository.UserRepository;
 import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 <%_ if (reactive) { _%>
 import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
@@ -45,7 +44,6 @@ import reactor.core.publisher.Mono;
 <%_ } _%>
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Authenticate a user from the database.
@@ -91,10 +89,10 @@ public class DomainUserDetailsService implements <% if (reactive) { %>Reactive<%
         if (!user.isActivated()) {
             throw new UserNotActivatedException("User " + lowercaseLogin + " was not activated");
         }
-        List<GrantedAuthority> grantedAuthorities = user.getAuthorities().stream()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>
+        List<SimpleGrantedAuthority> grantedAuthorities = user.getAuthorities().stream()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>
             .map(Authority::getName)<% } %>
             .map(SimpleGrantedAuthority::new)
-            .collect(Collectors.toList());
+            .toList();
         return new org.springframework.security.core.userdetails.User(user.getLogin(),
             user.getPassword(),
             grantedAuthorities);