generator-jhipster 7.4.1 → 7.5.0

package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs

@@ -321,7 +321,7 @@
       "security-admin-console": [],
       "web_app": [],
       "admin-cli": [],
-      "account-console": [],<% if (serviceDiscoveryType === 'eureka') { %>
+      "account-console": [],<% if (serviceDiscoveryEureka) { %>
       "jhipster-registry": [],<% } %>
       "broker": [
         {
@@ -2491,7 +2491,7 @@
     "clientOfflineSessionIdleTimeout": "0",
     "cibaInterval": "5"
   },
-  "keycloakVersion": "15.0.2",
+  "keycloakVersion": "16.1.0",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

package/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs

@@ -198,8 +198,9 @@ public class LocaleConfiguration {
                             "'" + (timeZone != null ? " and time zone '" + timeZone.getID() + "'" : ""));
                     }
                 }
-                exchange.getAttributes().put(LOCALE_REQUEST_ATTRIBUTE_NAME,
-                    locale != null ? locale : exchange.getLocaleContext().getLocale());
+                if (locale != null) {
+                    exchange.getAttributes().put(LOCALE_REQUEST_ATTRIBUTE_NAME, locale);
+                }
                 if (timeZone != null) {
                     exchange.getAttributes().put(TIME_ZONE_REQUEST_ATTRIBUTE_NAME, timeZone);
                 } else {

package/generators/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs

@@ -18,72 +18,35 @@
 -%>
 package <%= packageName %>.config;
 
-import tech.jhipster.config.JHipsterConstants;
-import tech.jhipster.config.JHipsterProperties;
-import tech.jhipster.config.apidoc.customizer.SpringfoxCustomizer;
+import org.springdoc.core.GroupedOpenApi;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.ResponseEntity;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-
-import static springfox.documentation.builders.PathSelectors.regex;
+import tech.jhipster.config.JHipsterConstants;
+import tech.jhipster.config.JHipsterProperties;
+import tech.jhipster.config.apidoc.customizer.JHipsterOpenApiCustomizer;
 
 @Configuration
 @Profile(JHipsterConstants.SPRING_PROFILE_API_DOCS)
 public class OpenApiConfiguration {
 
-    @Bean
-    public SpringfoxCustomizer noApiFirstCustomizer() {
-        return docket -> docket.select()
-            .apis(RequestHandlerSelectors.basePackage("<%= packageName %>.web.api").negate());
-    }
+    public static final String API_FIRST_PACKAGE = "<%= packageName %>.web.api";
 
     @Bean
-    public Docket apiFirstDocket(JHipsterProperties jHipsterProperties) {
+    @ConditionalOnMissingBean(name = "apiFirstGroupedOpenAPI")
+    public GroupedOpenApi apiFirstGroupedOpenAPI(
+        JHipsterOpenApiCustomizer jhipsterOpenApiCustomizer,
+        JHipsterProperties jHipsterProperties
+    ) {
         JHipsterProperties.ApiDocs properties = jHipsterProperties.getApiDocs();
-        Contact contact = new Contact(
-            properties.getContactName(),
-            properties.getContactUrl(),
-            properties.getContactEmail()
-        );
-
-        ApiInfo apiInfo = new ApiInfo(
-            "API First " + properties.getTitle(),
-            properties.getDescription(),
-            properties.getVersion(),
-            properties.getTermsOfServiceUrl(),
-            contact,
-            properties.getLicense(),
-            properties.getLicenseUrl(),
-            new ArrayList<>()
-        );
-
-        return new Docket(DocumentationType.OAS_30)
-            .groupName("openapi")
-            .host(properties.getHost())
-            .protocols(new HashSet<>(Arrays.asList(properties.getProtocols())))
-            .apiInfo(apiInfo)
-            .useDefaultResponseMessages(properties.isUseDefaultResponseMessages())
-            .forCodeGeneration(true)
-            .directModelSubstitute(ByteBuffer.class, String.class)
-            .genericModelSubstitutes(ResponseEntity.class)
-            .ignoredParameterTypes(Pageable.class)
-            .select()
-            .apis(RequestHandlerSelectors.basePackage("<%= packageName %>.web.api"))
-            .paths(regex(properties.getDefaultIncludePattern()))
+        return GroupedOpenApi.builder()
+            .group("openapi")
+            .addOpenApiCustomiser(jhipsterOpenApiCustomizer)
+            .packagesToScan(API_FIRST_PACKAGE)
+            .pathsToMatch(properties.getDefaultIncludePattern())
             .build();
     }
-
-
 }

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs

@@ -268,14 +268,14 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
   <%_ if (applicationTypeMonolith) { _%>
         .and()
             .httpBasic()
-        <%_ } _%>
+  <%_ } _%>
         .and()
             .apply(securityConfigurerAdapter());
-  <%_ } else if (authenticationTypeOauth2) { _%>
-    <%_ if (applicationTypeMonolith) { _%>
+<%_ } else if (authenticationTypeOauth2) { _%>
+  <%_ if (applicationTypeMonolith) { _%>
         .and()
             .oauth2Login()
-    <%_ } _%>
+  <%_ } _%>
         .and()
             .oauth2ResourceServer()
                 .jwt()
@@ -283,7 +283,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .and()
             .and()
                 .oauth2Client();
-  <%_ } _%>
+<%_ } _%>
         // @formatter:on
     }
 <%_ if (authenticationTypeJwt) { _%>

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

@@ -211,7 +211,7 @@ public class SecurityConfiguration {
         // @formatter:off
         http
             .securityMatcher(new NegatedServerWebExchangeMatcher(new OrServerWebExchangeMatcher(
-                pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**", "/swagger-resources/**", "/v2/api-docs", "/v3/api-docs", "/test/**"),
+                pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**", "/v3/api-docs/**", "/test/**"),
                 pathMatchers(HttpMethod.OPTIONS, "/**")
             )))
             .csrf()
@@ -278,11 +278,9 @@ public class SecurityConfiguration {
             .pathMatchers("/api/admin/**").hasAuthority(AuthoritiesConstants.ADMIN)
             .pathMatchers("/api/**").authenticated()
 <%_ if (applicationTypeGateway) { _%>
-  <%_ if (microfrontend && (authenticationTypeJwt || clientFrameworkVue)) { _%>
             // microfrontend resources are loaded by webpack without authentication, they need to be public
             .pathMatchers("/services/*/*.js").permitAll()
             .pathMatchers("/services/*/*.js.map").permitAll()
-  <%_ } _%>
             .pathMatchers("/services/*/v3/api-docs").hasAuthority(AuthoritiesConstants.ADMIN)
 <%_ } _%>
 <%_ if (applicationTypeMonolith || applicationTypeGateway) { _%>
@@ -308,7 +306,7 @@ public class SecurityConfiguration {
     }
 <%_ if (authenticationTypeOauth2) { _%>
 
-    <%_ if (applicationType === 'gateway') { _%>
+  <%_ if (applicationTypeGateway) { _%>
     private ServerOAuth2AuthorizationRequestResolver authorizationRequestResolver(
         ReactiveClientRegistrationRepository clientRegistrationRepository) {
         DefaultServerOAuth2AuthorizationRequestResolver authorizationRequestResolver =
@@ -325,7 +323,7 @@ public class SecurityConfiguration {
                 uriBuilder.queryParam("audience", jHipsterProperties.getSecurity().getOauth2().getAudience())
                     .build());
     }
-    <%_ } _%>
+  <%_ } _%>
 
     Converter<Jwt, Mono<AbstractAuthenticationToken>> jwtAuthenticationConverter() {
         JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();

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

@@ -183,9 +183,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia
             log.debug("Registering CORS filter");
             source.registerCorsConfiguration("/api/**", config);
             source.registerCorsConfiguration("/management/**", config);
-            source.registerCorsConfiguration("/v2/api-docs", config);
             source.registerCorsConfiguration("/v3/api-docs", config);
-            source.registerCorsConfiguration("/swagger-resources", config);
             source.registerCorsConfiguration("/swagger-ui/**", config);
 <%_ if (applicationTypeGateway) { _%>
             source.registerCorsConfiguration("/*/api/**", config);

package/generators/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs

@@ -20,6 +20,7 @@ package <%= packageName %>.config.neo4j;
 
 import ac.simons.neo4j.migrations.core.JavaBasedMigration;
 import ac.simons.neo4j.migrations.core.MigrationContext;
+import ac.simons.neo4j.migrations.core.MigrationsException;
 
 import java.io.IOException;
 import java.util.List;
@@ -46,11 +47,16 @@ final class Neo4jMigrations {
     static class V0001__CreateUsers implements JavaBasedMigration {
 
         @Override
-        public void apply(MigrationContext context) throws IOException {
+        public void apply(MigrationContext context) {
 
             ObjectMapper om = new ObjectMapper();
             ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
-            Resource[] resources = resourcePatternResolver.getResources("classpath:config/neo4j/migrations/user__*.json");
+            Resource[] resources;
+            try {
+              resources = resourcePatternResolver.getResources("classpath:config/neo4j/migrations/user__*.json");
+            } catch (IOException e) {
+              throw new MigrationsException("Could not load user definition resources.", e);
+            }
 
             JavaType type = om.getTypeFactory().
                 constructMapType(Map.class, String.class, Object.class);
@@ -69,13 +75,17 @@ final class Neo4jMigrations {
             try (Session session = context.getSession()) {
 
                 for (Resource resource : resources) {
-                    Map<String, Object> user = om.readValue(resource.getInputStream(), type);
-                    user.put("user_id", UUID.randomUUID().toString());
-                    List<String> authorities = (List<String>) user.remove("authorities");
-                    user.remove("_class");
-
-                    session.writeTransaction(
-                        t -> t.run(query, Values.parameters("user", user, "authorities", authorities)).consume());
+                    try {
+                        Map<String, Object> user = om.readValue(resource.getInputStream(), type);
+                        user.put("user_id", UUID.randomUUID().toString());
+                        List<String> authorities = (List<String>) user.remove("authorities");
+                        user.remove("_class");
+
+                        session.writeTransaction(
+                            t -> t.run(query, Values.parameters("user", user, "authorities", authorities)).consume());
+                    } catch (IOException e) {
+                        throw new MigrationsException("Could not load resource " + resource.getDescription() + ".", e);
+                    }
                 }
             }
         }

package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs

@@ -77,12 +77,12 @@ _%>
 public interface AuthorityRepository extends <% if (databaseTypeSql) { %><% if (reactive) { %>R2dbc<% } else { %>Jpa<% } %>Repository<% } else { %><% if (reactive && !databaseTypeCouchbase) { %>Reactive<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCouchbase) { %>JHipsterCouchbaseRepository<% } %><% } %><Authority, String> {
 <%_ if (databaseTypeNeo4j) { _%>
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<%_ } _%>
-    <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= asEntity('Authority') %>> findAll();
+    <% if (reactive) { %>Flux<% } else { %>List<% } %><Authority> findAll();
 <%_ } _%>
 <%_ if (databaseTypeCouchbase) { _%>
     @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter}")
     @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><<%= asEntity('Authority') %>> findAll();
+    <%= listOrFlux %><Authority> findAll();
 <%_ } _%>
 
 }

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

@@ -224,9 +224,7 @@ public interface UserRepository extends <% if (databaseTypeSql) { %>JpaRepositor
     <%_ if (cacheManagerIsAvailable) { _%>
     @Cacheable(cacheNames = USERS_BY_LOGIN_CACHE)
     <%_ } _%>
-    <%_ if (databaseTypeCouchbase) { _%>
     @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%_ } _%>
     default <%= optionalOrMono %><<%= asEntity('User') %>> findOneByLogin(String login) {
         return findById(<%= asEntity('User') %>.PREFIX + ID_DELIMITER + login);
     }

package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs

@@ -52,6 +52,8 @@ public class TokenProvider {
 
     private static final String AUTHORITIES_KEY = "auth";
 
+    private static final String INVALID_JWT_TOKEN = "Invalid JWT token.";
+
     private final Key key;
 
     private final JwtParser jwtParser;
@@ -131,19 +133,19 @@ public class TokenProvider {
         } catch (ExpiredJwtException e) {
             this.securityMetersService.trackTokenExpired();
 
-            log.trace("Invalid JWT token.", e);
+            log.trace(INVALID_JWT_TOKEN, e);
         } catch (UnsupportedJwtException e) {
             this.securityMetersService.trackTokenUnsupported();
 
-            log.trace("Invalid JWT token.", e);
+            log.trace(INVALID_JWT_TOKEN, e);
         } catch (MalformedJwtException e) {
             this.securityMetersService.trackTokenMalformed();
 
-            log.trace("Invalid JWT token.", e);
+            log.trace(INVALID_JWT_TOKEN, e);
         } catch (SignatureException e) {
             this.securityMetersService.trackTokenInvalidSignature();
 
-            log.trace("Invalid JWT token.", e);
+            log.trace(INVALID_JWT_TOKEN, e);
         } catch (IllegalArgumentException e) { // TODO: should we let it bubble (no catch), to avoid defensive programming and follow the fail-fast principle?
             log.error("Token validation error {}", e.getMessage());
         }

package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs

@@ -36,9 +36,9 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -54,7 +54,7 @@ public class CustomClaimConverter implements Converter<Map<String, Object>, Map<
 
     private final ClientRegistration registration;
 
-    private final Map<String, ObjectNode> users = new HashMap<>();
+    private final Map<String, ObjectNode> users = new ConcurrentHashMap<>();
 
     public CustomClaimConverter(ClientRegistration registration, RestTemplate restTemplate) {
         this.registration = registration;

package/generators/server/templates/src/main/java/package/service/UserService.java.ejs

@@ -84,7 +84,7 @@ import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 <%_ } _%>
 
-<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession  && !reactive) { _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
 import java.time.LocalDate;
 <%_ } _%>
 <%_ if (!databaseTypeNo) { _%>
@@ -659,7 +659,7 @@ public class UserService {
   <%_ if (reactive) { _%>
     <%_ if (databaseTypeSql && authenticationTypeOauth2) { _%>
     @Transactional
-    public Mono<User> saveUser(User user) {
+    public Mono<<%= asEntity('User') %>> saveUser(<%= asEntity('User') %> user) {
         return saveUser(user, false);
     }
 
@@ -682,7 +682,7 @@ public class UserService {
                 // Saving the relationship can be done in an entity callback
                 // once https://github.com/spring-projects/spring-data-r2dbc/issues/215 is done
         <%_ if (authenticationTypeOauth2) { _%>
-                Mono<User> persistedUser;
+                Mono<<%= asEntity('User') %>> persistedUser;
                 if (forceCreate) {
                     persistedUser = userRepository.create(user);
                 } else {

package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs

@@ -71,12 +71,12 @@ public class <%= asDto('User') %> {
     }
 
 <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
-        public String get<%= javaBeanCase(field.fieldName) %>() {
-            return <%= field.fieldName %>;
-        }
-        public void set<%= javaBeanCase(field.fieldName) %>(String <%= field.fieldName %>) {
-            this.<%= field.fieldName %> = <%= field.fieldName %>;
-        }
+    public String get<%= javaBeanCase(field.fieldName) %>() {
+        return <%= field.fieldName %>;
+    }
+    public void set<%= javaBeanCase(field.fieldName) %>(String <%= field.fieldName %>) {
+        this.<%= field.fieldName %> = <%= field.fieldName %>;
+    }
 <%_ } _%>
 
     // prettier-ignore

package/generators/server/templates/src/main/java/package/web/filter/ModifyServersOpenApiFilter.java.ejs

@@ -34,12 +34,13 @@ import reactor.core.publisher.Mono;
 @Component
 public class ModifyServersOpenApiFilter implements GlobalFilter, Ordered {
 
+    private static final String OPEN_API_PATH = "/v3/api-docs";
     private static final Logger log = LoggerFactory.getLogger(ModifyServersOpenApiFilter.class);
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         String path = exchange.getRequest().getURI().getPath();
-        if (path.startsWith("/services") && path.contains("/v3/api-docs")) {
+        if (path.startsWith("/services") && path.contains(OPEN_API_PATH)) {
             ServerHttpResponse originalResponse = exchange.getResponse();
             DataBufferFactory bufferFactory = originalResponse.bufferFactory();
             ServerHttpResponseDecorator decoratedResponse = createModifyServersOpenApiInterceptor(path, originalResponse, bufferFactory);
@@ -109,7 +110,7 @@ public class ModifyServersOpenApiFilter implements GlobalFilter, Ordered {
                 ObjectMapper mapper = new ObjectMapper();
                 JsonNode jsonBody = mapper.readTree(strBody);
                 ObjectNode serversToJson = mapper.createObjectNode();
-                serversToJson.set("url", mapper.valueToTree(path.replace("/v3/api-docs", "")));
+                serversToJson.set("url", mapper.valueToTree(path.replaceFirst(OPEN_API_PATH + "(/.*)?$", "")));
                 serversToJson.set("description", mapper.valueToTree("added by global filter"));
 
                 // add custom server

package/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs

@@ -35,7 +35,7 @@ public class SpaWebFilter implements WebFilter {
         String path = exchange.getRequest().getURI().getPath();
         if (!path.startsWith("/api") && !path.startsWith("/management")<% if (authenticationTypeOauth2) { %> && !path.startsWith("/login")<% } %>
 <%_ if (applicationTypeGateway || applicationTypeMonolith) { _%>
-            && !path.startsWith("/services") && !path.startsWith("/swagger") && !path.startsWith("/v2/api-docs") && !path.startsWith("/v3/api-docs")
+            && !path.startsWith("/services") && !path.startsWith("/v3/api-docs")
 <%_ } _%>
             && path.matches("[^\\\\.]*")) {
             return chain.filter(

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

@@ -126,7 +126,7 @@ public class PublicUserResource {
     @GetMapping("/users")
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
   <%_ if (!reactive) { _%>
-    public ResponseEntity<List<<%= asDto('User') %>>> getAllPublicUsers(Pageable pageable) {
+    public ResponseEntity<List<<%= asDto('User') %>>> getAllPublicUsers(@org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all public User names");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
@@ -139,7 +139,7 @@ public class PublicUserResource {
         return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK);
     }
   <%_ } else { _%>
-    public Mono<ResponseEntity<Flux<<%= asDto('User') %>>>> getAllPublicUsers(ServerHttpRequest request, Pageable pageable) {
+    public Mono<ResponseEntity<Flux<<%= asDto('User') %>>>> getAllPublicUsers(ServerHttpRequest request, @org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all public User names");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {

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

@@ -284,7 +284,7 @@ public class UserResource {
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
   <%_ if (!reactive) { _%>
-    public ResponseEntity<List<<%= asDto('AdminUser') %>>> getAllUsers(Pageable pageable) {
+    public ResponseEntity<List<<%= asDto('AdminUser') %>>> getAllUsers(@org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all User for an admin");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
@@ -296,7 +296,7 @@ public class UserResource {
         HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
         return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK);
   <%_ } else { _%>
-    public Mono<ResponseEntity<Flux<<%= asDto('AdminUser') %>>>> getAllUsers(ServerHttpRequest request, Pageable pageable) {
+    public Mono<ResponseEntity<Flux<<%= asDto('AdminUser') %>>>> getAllUsers(@org.springdoc.api.annotations.ParameterObject ServerHttpRequest request, @org.springdoc.api.annotations.ParameterObject Pageable pageable) {
         log.debug("REST request to get all User for an admin");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {

package/generators/server/templates/src/main/resources/config/application.yml.ejs

@@ -32,6 +32,17 @@
 # http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
 # ===================================================================
 
+---
+# Conditionally disable springdoc on missing api-docs profile
+spring:
+  config:
+    activate:
+      on-profile: '!api-docs'
+springdoc:
+  api-docs:
+    enabled: false
+---
+
 <%_ if (serviceDiscoveryEureka) { _%>
 eureka:
   client:
@@ -85,7 +96,7 @@ management:
     web:
       base-path: /management
       exposure:
-        include: ["configprops", "env", <% if (applicationTypeGateway && reactive) { %>"gateway", <% } %>"health", "info", "jhimetrics", "logfile", "loggers", "prometheus", "threaddump"<% if (cacheManagerIsAvailable) { %>, "caches"<% } %><% if (databaseTypeSql) { %>, "liquibase"<% } %>]
+        include: ["configprops", "env", <% if (applicationTypeGateway && reactive) { %>"gateway", <% } %>"health", "info", "jhimetrics", 'jhiopenapigroups', "logfile", "loggers", "prometheus", "threaddump"<% if (cacheManagerIsAvailable) { %>, "caches"<% } %><% if (databaseTypeSql) { %>, "liquibase"<% } %>]
   endpoint:
     health:
       show-details: when_authorized
@@ -289,6 +300,9 @@ server:
       cookie:
         http-only: true
 
+springdoc:
+  show-actuator: true
+
 # Properties to be exposed on the /info management endpoint
 info:
   # Comma separated list of profiles that will trigger the ribbon to show
@@ -318,8 +332,8 @@ jhipster:
   mail:
     from: <%= baseName %>@localhost
   api-docs:
-    default-include-pattern: ${server.servlet.context-path:}/api/.*
-    management-include-pattern: ${server.servlet.context-path:}/management/.*
+    default-include-pattern: ${server.servlet.context-path:}/api/**
+    management-include-pattern: ${server.servlet.context-path:}/management/**
     title: <%= humanizedBaseName %> API
     description: <%= humanizedBaseName %> API documentation
     version: 0.0.1

package/generators/server/templates/src/main/resources/logback-spring.xml.ejs

@@ -138,13 +138,12 @@
 <%_ if (reactive) { _%>
     <logger name="reactor" level="WARN"/>
 <%_ } _%>
-    <logger name="springfox" level="WARN"/>
+    <logger name="io.swagger.v3" level="INFO"/>
     <logger name="sun.rmi" level="WARN"/>
 <%_ if (databaseTypeSql) { _%>
     <logger name="liquibase" level="WARN"/>
     <logger name="LiquibaseSchemaResolver" level="INFO"/>
 <%_ } _%>
-    <logger name="springfox.documentation.schema.property" level="ERROR"/>
 <%_ if (applicationTypeMicroservice || applicationTypeGateway || cacheProviderHazelcast) { _%>
     <logger name="sun.net.www" level="INFO"/>
 <%_ } _%>

package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs

@@ -18,19 +18,15 @@
 -%>
 package <%= packageName %>.cucumber;
 
-import org.junit.runner.RunWith;
-
 <%_ if (databaseTypeCassandra) { _%>
 import <%= packageName %>.AbstractCassandraTest;
 <%_ } _%>
 <%_ if (databaseTypeNeo4j) { _%>
 import <%= packageName %>.AbstractNeo4jIT;
 <%_ } _%>
-import io.cucumber.junit.CucumberOptions;
-import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.platform.engine.Cucumber;
 
-@RunWith(Cucumber.class)
-@CucumberOptions(plugin = "pretty", features = "<%= TEST_DIR %>features")
+@Cucumber
 <%_ if (databaseTypeNeo4j) { _%>
 @ExtendWith(AbstractNeo4jIT)
 <%_ } _%>

package/generators/server/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs

@@ -18,13 +18,12 @@
 -%>
 package <%= packageName %>.cucumber;
 
-import <%= packageName %>.<%= mainClass %>;
+import <%= packageName %>.IntegrationTest;
 import io.cucumber.spring.CucumberContextConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 @CucumberContextConfiguration
-@SpringBootTest(classes = <%= mainClass %>.class)
+@IntegrationTest
 @WebAppConfiguration
 public class CucumberTestContextConfiguration {
 

package/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs

@@ -18,36 +18,71 @@
 -%>
 package <%= packageName %>.cucumber.stepdefs;
 
+import java.util.List;
+import java.util.ArrayList;
+
 import io.cucumber.java.Before;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.User;
 
 import <%= packageName %>.web.rest.UserResource;
+import <%= packageName %>.security.AuthoritiesConstants;
+
+<%_ if (reactive) { _%>
+import org.springframework.test.web.reactive.server.WebTestClient;
+<%_ } else { _%>
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+<%_ } _%>
 
 public class UserStepDefs extends StepDefs {
 
     @Autowired
     private UserResource userResource;
 
-    private MockMvc restUserMockMvc;
+<%_ if (reactive) { _%>
+    private WebTestClient userResourceMock;
+<%_ } else { _%>
+    private MockMvc userResourceMock;
+<%_ } _%>
 
     @Before
     public void setup() {
-        this.restUserMockMvc = MockMvcBuilders.standaloneSetup(userResource).build();
+        List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
+        grantedAuthorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN));
+        User principal = new User("username", "", true, true, true, true, grantedAuthorities);
+        Authentication authentication = new UsernamePasswordAuthenticationToken(
+            principal,
+            principal.getPassword(),
+            principal.getAuthorities()
+        );
+        SecurityContext context = SecurityContextHolder.createEmptyContext();
+        context.setAuthentication(authentication);
+        SecurityContextHolder.setContext(context);
+        this.userResourceMock = MockMvcBuilders.standaloneSetup(userResource).build();
     }
 
     @When("I search user {string}")
     public void i_search_user(String userId) throws Throwable {
-        actions = restUserMockMvc.perform(get("/api/users/" + userId)
-                .accept(MediaType.APPLICATION_JSON));
+<%_ if (reactive) { _%>
+        actions = userResourceMock.get().uri("/api/admin/users/" + userId)
+<%_ } else { _%>
+        actions = userResourceMock.perform(get("/api/admin/users/" + userId)
+<%_ } _%>
+                    .accept(MediaType.APPLICATION_JSON)<% if (!reactive) { %>)<%_ } _%>;
     }
 
     @Then("the user is found")