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

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

@@ -240,7 +240,7 @@ public class PersistentTokenRememberMeServices extends
             // No series match, so we can't authenticate using this cookie
             throw new RememberMeAuthenticationException("No persistent token found for series id: " + presentedSeries);
         }
-        PersistentToken token = optionalToken.get();
+        PersistentToken token = optionalToken.orElseThrow();
         // We have a match for this user/series combination
         log.info("presentedToken={} / tokenValue={}", presentedToken, token.getTokenValue());
         if (!presentedToken.equals(token.getTokenValue())) {

package/dist/generators/server/templates/src/main/java/package/service/MailService.java.ejs

@@ -18,7 +18,7 @@
 -%>
 package <%= packageName %>.service;
 
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 
 import tech.jhipster.config.JHipsterProperties;
 

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

@@ -23,7 +23,7 @@ import <%= packageName %>.config.Constants;
 import <%= packageName %>.domain.Authority;
 <%_ } _%>
 <%_ if (!databaseTypeNo) { _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
   <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
 import <%= packageName %>.repository.AuthorityRepository;
     <%_ if (authenticationTypeSession && !reactive) { _%>
@@ -950,7 +950,7 @@ public class UserService {
         if (existingUser.isPresent()) {
             // if IdP sends last updated information, use it to determine if an update should happen
             if (details.get("updated_at") != null) {
-                Instant dbModifiedDate = existingUser.get().getLastModifiedDate();
+                Instant dbModifiedDate = existingUser.orElseThrow().getLastModifiedDate();
                 Instant idpModifiedDate;
                 if (details.get("updated_at") instanceof Instant) {
                     idpModifiedDate = (Instant) details.get("updated_at");

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

@@ -22,7 +22,7 @@ import <%= packageName %>.config.Constants;
 <% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>
 import <%= packageName %>.domain.Authority;<% } %>
 <%_ if (!databaseTypeNo) { _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ } _%>
 
 import java.io.Serializable;

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

@@ -19,7 +19,7 @@
 package <%= packageName %>.service.dto;
 
 <%_ if (!databaseTypeNo) { _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 <%_ } _%>
 
 import java.io.Serializable;

package/dist/generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs

@@ -21,7 +21,7 @@ package <%= packageName %>.service.mapper;
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
 import <%= packageName %>.domain.Authority;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.service.dto.<%= user.adminUserDto %>;
 import <%= packageName %>.service.dto.<%= user.dtoClass %>;
 

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

@@ -22,9 +22,8 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.filter.OncePerRequestFilter;
-
 import java.io.IOException;
+import org.springframework.web.filter.OncePerRequestFilter;
 
 public class SpaWebFilter extends OncePerRequestFilter {
 
@@ -34,11 +33,15 @@ public class SpaWebFilter extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
         throws ServletException, IOException {
-        String path = request.getRequestURI();
+        // Request URI includes the contextPath if any, removed it.
+        String path = request.getRequestURI().substring(request.getContextPath().length());
         if (
             !path.startsWith("/api") &&
             !path.startsWith("/management") &&
             !path.startsWith("/v3/api-docs") &&
+<%_ if (devDatabaseTypeH2Any) { _%>            
+            !path.startsWith("/h2-console") &&
+<%_ } _%>
 <%_ if (authenticationTypeOauth2 && applicationTypeMonolith) { _%>
             !path.startsWith("/login") &&
             !path.startsWith("/oauth2") &&

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

@@ -23,7 +23,7 @@ import <%= packageName %>.domain.PersistentToken;
 import <%= packageName %>.repository.PersistentTokenRepository;
   <%_ } _%>
   <%_ if (!reactive) { _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
   <%_ } _%>
 import <%= packageName %>.repository.UserRepository;
 import <%= packageName %>.security.SecurityUtils;
@@ -45,7 +45,7 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
   <%_ } _%>
 
-  <%_ if (!reactive) { _%>
+  <%_ if (!reactive && !authenticationTypeJwt) { _%>
 import jakarta.servlet.http.HttpServletRequest;
   <%_ } _%>
 import jakarta.validation.Valid;
@@ -205,7 +205,7 @@ public class AccountResource {
     public void saveAccount(@Valid @RequestBody <%= user.adminUserDto %> userDTO) {
         String userLogin = SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new AccountResourceException("Current user login not found"));
         Optional<<%= user.persistClass %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
-        if (existingUser.isPresent() && (!existingUser.get().getLogin().equalsIgnoreCase(userLogin))) {
+        if (existingUser.isPresent() && (!existingUser.orElseThrow().getLogin().equalsIgnoreCase(userLogin))) {
             throw new EmailAlreadyUsedException();
         }
         Optional<<%= user.persistClass %>> user = userRepository.findOneByLogin(userLogin);
@@ -304,7 +304,7 @@ public class AccountResource {
     public void requestPasswordReset(@RequestBody String mail) {
         Optional<<%= user.persistClass %>> user = userService.requestPasswordReset(mail);
         if (user.isPresent()) {
-            mailService.sendPasswordResetMail(user.get());
+            mailService.sendPasswordResetMail(user.orElseThrow());
         } else {
             // Pretend the request has been successful to prevent checking which emails really exist
             // but log that an invalid attempt has been made

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

@@ -18,7 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
@@ -47,7 +46,7 @@ public class LogoutResource {
      * @param idToken the ID token.
      * @param request a {@link ServerHttpRequest} request.
      * @param session the current {@link WebSession}.
-     * @return the {@link ResponseEntity} with status {@code 200 (OK)} and a body with a global logout URL.
+     * @return status {@code 200 (OK)} and a body with a global logout URL.
      */
     @PostMapping("/api/logout")
     public Mono<Map<String, String>> logout(@AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken, ServerHttpRequest request, WebSession session) {

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

@@ -112,12 +112,14 @@ public class PublicUserResource {
 
     /**
      * {@code GET /users} : get all users with only the public informations - calling this are allowed for anyone.
-     *<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { %>
-        <%_ if (reactive) { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
+     *
+  <%_ if (reactive) { _%>
      * @param request a {@link ServerHttpRequest} request.
-        <%_ } _%>
-     * @param pageable the pagination information.<% } %>
+  <%_ } _%>
+     * @param pageable the pagination information.
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body all users.
+<%_ } _%>
      */
     @GetMapping("/users")
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>

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

@@ -19,7 +19,7 @@
 package <%= packageName %>.web.rest;
 
 import <%= packageName %>.config.Constants;
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
 import <%= packageName %>.security.AuthoritiesConstants;
 import <%= packageName %>.service.MailService;
@@ -90,7 +90,7 @@ import static org.springframework.data.elasticsearch.client.elc.QueryBuilders.*;
 /**
  * REST controller for managing users.
  * <p>
- * This class accesses the {@link <%= packageName %>.domain.<%= user.persistClass %>} entity, and needs to fetch its collection of authorities.
+ * This class accesses the {@link <%= user.entityAbsoluteClass %>} entity, and needs to fetch its collection of authorities.
  * <p>
  * For a normal use-case, it would be better to have an eager relationship between User and Authority,
  * and send everything to the client side: there would be no View Model and DTO, a lot less code, and an outer-join
@@ -237,11 +237,11 @@ public class UserResource {
     public ResponseEntity<<%= user.adminUserDto %>> updateUser(@Valid @RequestBody <%= user.adminUserDto %> userDTO) {
         log.debug("REST request to update User : {}", userDTO);
         Optional<<%= user.persistClass %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
-        if (existingUser.isPresent() && (!existingUser.get().getId().equals(userDTO.getId()))) {
+        if (existingUser.isPresent() && (!existingUser.orElseThrow().getId().equals(userDTO.getId()))) {
             throw new EmailAlreadyUsedException();
         }
         existingUser = userRepository.findOneByLogin(userDTO.getLogin().toLowerCase());
-        if (existingUser.isPresent() && (!existingUser.get().getId().equals(userDTO.getId()))) {
+        if (existingUser.isPresent() && (!existingUser.orElseThrow().getId().equals(userDTO.getId()))) {
             throw new LoginAlreadyUsedException();
         }
         Optional<<%= user.adminUserDto %>> updatedUser = userService.updateUser(userDTO);

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

@@ -24,8 +24,6 @@ import tech.jhipster.web.rest.errors.ProblemDetailWithCause;
 import tech.jhipster.web.rest.errors.ProblemDetailWithCause.ProblemDetailWithCauseBuilder;
 
 import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
 
 @SuppressWarnings("java:S110") // Inheritance tree of classes should not be too deep
 public class BadRequestAlertException extends ErrorResponseException {
@@ -63,11 +61,4 @@ public class BadRequestAlertException extends ErrorResponseException {
     public ProblemDetailWithCause getProblemDetailWithCause() {
     	return (ProblemDetailWithCause) this.getBody();
     }
-
-    private static Map<String, Object> getAlertParameters(String entityName, String errorKey) {
-        Map<String, Object> parameters = new HashMap<>();
-        parameters.put("message", "error." + errorKey);
-        parameters.put("params", entityName);
-        return parameters;
-    }
 }

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

@@ -36,7 +36,6 @@ import org.springframework.http.converter.HttpMessageConversionException;
 <%_ if (reactive && databaseTypeSql) { _%>
 import org.springframework.stereotype.Component;
 <%_ } _%>
-import org.springframework.validation.BindingResult;
 import org.springframework.web.ErrorResponseException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -110,6 +109,7 @@ _%>
     private static final String FIELD_ERRORS_KEY = "fieldErrors";
     private static final String MESSAGE_KEY = "message";
     private static final String PATH_KEY = "path";
+    private static final boolean CASUAL_CHAIN_ENABLED = false;
 
     @Value("${jhipster.clientApp.name}")
     private String applicationName;
@@ -125,7 +125,7 @@ _%>
     public <%- returnType %> handleAnyException(Throwable ex, <%= requestClass %> request
     ) {
         ProblemDetailWithCause pdCause = wrapAndCustomizeProblem(ex, request);
-        return handleExceptionInternal((Exception) ex, pdCause, buildHeaders(ex, request), HttpStatusCode.valueOf(pdCause.getStatus()), request);
+        return handleExceptionInternal((Exception) ex, pdCause, buildHeaders(ex), HttpStatusCode.valueOf(pdCause.getStatus()), request);
     }
 
     @Nullable
@@ -169,8 +169,8 @@ _%>
         }
         <%_ } _%>
 <%_ } _%>
-        if(ex instanceof ErrorResponseException exp && exp.getBody() instanceof ProblemDetailWithCause)
-            return (ProblemDetailWithCause) exp.getBody();
+        if(ex instanceof ErrorResponseException exp && exp.getBody() instanceof ProblemDetailWithCause problemDetailWithCause)
+            return problemDetailWithCause;
         return ProblemDetailWithCauseBuilder.instance().withStatus(toStatus(ex).value()).build();
     }
 
@@ -201,9 +201,9 @@ _%>
         if (problemProperties == null || !problemProperties.containsKey(PATH_KEY))
             problem.setProperty(PATH_KEY, getPathValue(request));
 
-        if((err instanceof <% if (reactive) { %> WebExchangeBindException <% } else { %> MethodArgumentNotValidException <% } %>) &&
+        if((err instanceof <% if (reactive) { %> WebExchangeBindException <% } else { %> MethodArgumentNotValidException <% } %> fieldException) &&
                 (problemProperties == null || !problemProperties.containsKey(FIELD_ERRORS_KEY)))
-            problem.setProperty(FIELD_ERRORS_KEY, getFieldErrors((<% if (reactive) { %>WebExchangeBindException<% } else { %>MethodArgumentNotValidException<% } %>) err));
+            problem.setProperty(FIELD_ERRORS_KEY, getFieldErrors(fieldException));
 
         problem.setCause(buildCause(err.getCause(), request).orElse(null));
 
@@ -262,27 +262,29 @@ _%>
     }
 
     private URI getMappedType(Throwable err) {
-        if(err instanceof MethodArgumentNotValidException exp)
+        if(err instanceof MethodArgumentNotValidException)
             return ErrorConstants.CONSTRAINT_VIOLATION_TYPE;
         return ErrorConstants.DEFAULT_TYPE;
     }
 
     private String getMappedMessageKey(Throwable err) {
-        if(err instanceof MethodArgumentNotValidException)
+        if(err instanceof MethodArgumentNotValidException) {
             return ErrorConstants.ERR_VALIDATION;
     <%_ if (!databaseTypeNo && !databaseTypeCassandra) { _%>
-        else if(err instanceof ConcurrencyFailureException
-                || err.getCause() != null && err.getCause() instanceof ConcurrencyFailureException)
+        } else if(err instanceof ConcurrencyFailureException
+                || err.getCause() instanceof ConcurrencyFailureException) {
             return ErrorConstants.ERR_CONCURRENCY_FAILURE;
     <%_ } _%>
     <%_ if (reactive) { _%>
-        else if (err instanceof WebExchangeBindException) return ErrorConstants.ERR_VALIDATION;
+        } else if (err instanceof WebExchangeBindException) {
+            return ErrorConstants.ERR_VALIDATION;
     <%_ } _%>
+        }
         return null;
     }
 
     private String getCustomizedTitle(Throwable err) {
-        if(err instanceof MethodArgumentNotValidException exp)
+        if(err instanceof MethodArgumentNotValidException)
             return "Method argument not valid";
         return null;
     }
@@ -317,10 +319,10 @@ _%>
         return <% if (reactive) { %> request.getRequest().getURI()<% } else { %> URI.create(extractURI(request))<% } %>;
     }
 
-    private HttpHeaders buildHeaders(Throwable err, <%= requestClass %> request) {
-        return err instanceof BadRequestAlertException ?
-                HeaderUtil.createFailureAlert(applicationName, true, ((BadRequestAlertException) err).getEntityName(),
-                        ((BadRequestAlertException) err).getErrorKey(), ((BadRequestAlertException) err).getMessage()) : null;
+    private HttpHeaders buildHeaders(Throwable err) {
+        return err instanceof BadRequestAlertException badRequestAlertException ?
+                HeaderUtil.createFailureAlert(applicationName, true, badRequestAlertException.getEntityName(),
+                        badRequestAlertException.getErrorKey(), badRequestAlertException.getMessage()) : null;
     }
 <%_ if (reactive) { _%>
     private HttpHeaders updateContentType(HttpHeaders headers) {
@@ -341,7 +343,7 @@ _%>
 
     private boolean isCasualChainEnabled() {
         // Customize as per the needs
-        return false;
+        return CASUAL_CHAIN_ENABLED;
     }
 
     private boolean containsPackageName(String message) {

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

@@ -154,8 +154,7 @@ spring:
 <%_ if (databaseTypeMongodb) { _%>
   data:
     mongodb:
-      uri: mongodb://localhost:27017<% if (reactive) { %>/?waitQueueMultiple=1000<% } %>
-      database: <%= baseName %>
+      uri: mongodb://localhost:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
   cassandra:

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

@@ -136,8 +136,7 @@ spring:
 <%_ if (databaseTypeMongodb) { _%>
   data:
     mongodb:
-      uri: mongodb://localhost:27017<% if (reactive) { %>/?waitQueueMultiple=1000<% } %>
-      database: <%= baseName %>
+      uri: mongodb://localhost:27017/<%= baseName %><% if (reactive) { %>?waitQueueMultiple=1000<% } %>
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
   cassandra:

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

@@ -126,7 +126,7 @@ management:
         liveness:
           include: livenessState
         readiness:
-          include: readinessState<% if (databaseTypeSql) { %>,db<% } %>
+          include: readinessState<% if (databaseTypeSql && !reactive) { %>,db<% } %>
     jhimetrics:
       enabled: true
   info:
@@ -251,6 +251,7 @@ spring:
     open-in-view: false
     properties:
       hibernate.jdbc.time_zone: UTC
+      hibernate.timezone.default_storage: NORMALIZE
       hibernate.type.preferred_instant_jdbc_type: TIMESTAMP
       hibernate.id.new_generator_mappings: true
       hibernate.connection.provider_disables_autocommit: true
@@ -377,8 +378,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: /api/**
+    management-include-pattern: /management/**
     title: <%= humanizedBaseName %> API
     description: <%= humanizedBaseName %> API documentation
     version: 0.0.1

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

@@ -45,6 +45,7 @@
     </root>
     -->
 
+    <logger name="angus.activation" level="WARN"/>
     <logger name="jakarta.activation" level="WARN"/>
     <logger name="jakarta.mail" level="WARN"/>
     <logger name="jakarta.management.remote" level="WARN"/>
@@ -84,6 +85,9 @@
     <logger name="io.searchbox" level="WARN"/>
 <%_ } _%>
 <%_ if (databaseTypeSql && reactive) { _%>
+    <%_ if (prodDatabaseTypeMysql) { _%>
+    <logger name="io.asyncer.r2dbc.mysql" level="WARN"/>
+    <%_ } _%>
     <logger name="io.r2dbc" level="WARN"/>
 <%_ } _%>
 <%_ if (!reactive) { _%>

package/dist/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs

@@ -47,7 +47,7 @@ class TechnicalStructureTest {
         .optionalLayer("Service").definedBy("..service..")
         .layer("Security").definedBy("..security..")
 <%_ if (hasDomainLayer) { _%>
-        .layer("Persistence").definedBy("..repository..")
+        .optionalLayer("Persistence").definedBy("..repository..")
         .layer("Domain").definedBy("..domain..")
 <%_ } _%>
 

package/dist/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs

@@ -32,11 +32,12 @@ public class JHipsterBlockHoundIntegration implements BlockHoundIntegration {
         builder.allowBlockingCallsInside("com.github.couchmove.repository.CouchbaseRepositoryImpl", "lambda$query$2");
         builder.allowBlockingCallsInside("com.github.couchmove.repository.CouchbaseRepositoryImpl", "lambda$importFtsIndex$1");
 <%_ } _%>
-<%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
+<%_ if (prodDatabaseTypeMariadb) { _%>
         builder.allowBlockingCallsInside("org.mariadb.r2dbc.message.client.HandshakeResponse", "writeConnectAttributes");
         builder.allowBlockingCallsInside("org.mariadb.r2dbc.client.MariadbPacketDecoder", "decode");
+        builder.allowBlockingCallsInside("org.mariadb.r2dbc.client.SimpleClient", "lambda$receive$18");
 <%_ } _%>
-<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
+<%_ if (prodDatabaseTypeMssql) { _%>
         builder.allowBlockingCallsInside("io.r2dbc.mssql.client.ssl.TdsSslHandler", "createSslHandler");
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>

package/dist/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs

@@ -22,7 +22,7 @@ import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
 <%_ } _%>
-import <%= packageName %>.domain.<%= user.persistClass %>;
+import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
 
 import org.apache.commons.lang3.RandomStringUtils;