generator-jhipster 8.6.0 → 8.7.0

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

@@ -23,26 +23,19 @@ import <%= packageName %>.security.SecurityUtils;
 import <%= packageName %>.domain.Authority;
 
 <%_ } _%>
+
+import java.security.Principal;
 <%_ if (reactive) { _%>
 import reactor.core.publisher.Mono;
-<%_ } else { _%>
-import jakarta.servlet.http.HttpServletRequest;
 <%_ } _%>
-
 <%_ if (authenticationTypeOauth2) { _%>
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
-  <%_ if (reactive) { _%>
-import org.springframework.web.server.ServerWebExchange;
-  <%_ } _%>
 <%_ } _%>
 <%_ if (authenticationTypeOauth2 || authenticationTypeJwt) { _%>
-import java.security.Principal;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 <%_ } else { _%>
   <%_ if (reactive) { _%>
-import java.security.Principal;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -55,6 +48,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -68,7 +62,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/api")
 public class AccountResource {
 
-    private static final Logger log = LoggerFactory.getLogger(AccountResource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountResource.class);
 
     private static class AccountResourceException extends RuntimeException {
 <%_ if (authenticationTypeOauth2 || authenticationTypeJwt) { _%>
@@ -112,7 +106,9 @@ public class AccountResource {
                 } else {
                     throw new AccountResourceException();
                 }
-                Set<String> authorities = authentication.getAuthorities().stream()
+                Set<String> authorities = authentication
+                    .getAuthorities()
+                    .stream()
                     .map(GrantedAuthority::getAuthority)
                     .collect(Collectors.toSet());
                 return new UserVM(login, authorities);
@@ -145,19 +141,13 @@ public class AccountResource {
     /**
      * {@code GET  /authenticate} : check if the user is authenticated, and return its login.
      *
-     * @param request the HTTP request.
+     * @param principal the authentication principal.
      * @return the login if the user is authenticated.
      */
-    @GetMapping("/authenticate")
-  <%_ if (reactive) { _%>
-    public Mono<String> isAuthenticated(ServerWebExchange request) {
-        log.debug("REST request to check if the current user is authenticated");
-        return request.getPrincipal().map(Principal::getName);
-  <%_ } else { _%>
-    public String isAuthenticated(HttpServletRequest request) {
-        log.debug("REST request to check if the current user is authenticated");
-        return request.getRemoteUser();
-  <%_ } _%>
+    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
+    public String isAuthenticated(Principal principal) {
+        LOG.debug("REST request to check if the current user is authenticated");
+        return principal == null ? null : principal.getName();
     }
 <%_ } _%>
 

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

@@ -32,16 +32,17 @@ public class AuthInfoResource {
 
     @Value("${spring.security.oauth2.client.provider.oidc.issuer-uri:}")
     private String issuer;
+
     @Value("${spring.security.oauth2.client.registration.oidc.client-id:}")
     private String clientId;
 
-
     @GetMapping("/auth-info")
     public AuthInfoVM getAuthInfo() {
         return new AuthInfoVM(issuer, clientId);
     }
 
     class AuthInfoVM {
+
         private String issuer;
         private String clientId;
 

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

@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -43,13 +44,11 @@ import org.springframework.security.oauth2.jwt.JwtClaimsSet;
 import org.springframework.security.oauth2.jwt.JwtEncoder;
 import org.springframework.security.oauth2.jwt.JwtEncoderParameters;
 import org.springframework.web.bind.annotation.*;
-<%_ if (reactive) { _%>
 import java.security.Principal;
+<%_ if (reactive) { _%>
 import reactor.core.publisher.Mono;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.security.authentication.ReactiveAuthenticationManager;
 <%_ } else { _%>
-import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.context.SecurityContextHolder;
 <%_ } _%>
@@ -61,7 +60,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 @RequestMapping("/api")
 public class AuthenticateController {
 
-    private static final Logger log = LoggerFactory.getLogger(AuthenticateController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AuthenticateController.class);
 
     private final JwtEncoder jwtEncoder;
 
@@ -82,9 +81,10 @@ public class AuthenticateController {
     @PostMapping("/authenticate")
     public Mono<ResponseEntity<JWTToken>> authorize(@Valid @RequestBody Mono<LoginVM> loginVM) {
         return loginVM
-            .flatMap(login -> authenticationManager
-                .authenticate(new UsernamePasswordAuthenticationToken(login.getUsername(), login.getPassword()))
-                .flatMap(auth -> Mono.fromCallable(() -> this.createToken(auth, login.isRememberMe())))
+            .flatMap(login ->
+                authenticationManager
+                    .authenticate(new UsernamePasswordAuthenticationToken(login.getUsername(), login.getPassword()))
+                    .flatMap(auth -> Mono.fromCallable(() -> this.createToken(auth, login.isRememberMe())))
             )
             .map(jwt -> {
                 HttpHeaders httpHeaders = new HttpHeaders();
@@ -102,9 +102,10 @@ public class AuthenticateController {
 
     @PostMapping("/authenticate")
     public ResponseEntity<JWTToken> authorize(@Valid @RequestBody LoginVM loginVM) {
-
-        UsernamePasswordAuthenticationToken authenticationToken =
-            new UsernamePasswordAuthenticationToken(loginVM.getUsername(), loginVM.getPassword());
+        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
+            loginVM.getUsername(),
+            loginVM.getPassword()
+        );
 
         Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
         SecurityContextHolder.getContext().setAuthentication(authentication);
@@ -118,19 +119,13 @@ public class AuthenticateController {
     /**
      * {@code GET /authenticate} : check if the user is authenticated, and return its login.
      *
-     * @param request the HTTP request.
+     * @param principal the authentication principal.
      * @return the login if the user is authenticated.
      */
-    @GetMapping("/authenticate")
-<%_ if (reactive) { _%>
-    public Mono<String> isAuthenticated(ServerWebExchange request) {
-        log.debug("REST request to check if the current user is authenticated");
-        return request.getPrincipal().map(Principal::getName);
-<%_ } else { _%>
-    public String isAuthenticated(HttpServletRequest request) {
-        log.debug("REST request to check if the current user is authenticated");
-        return request.getRemoteUser();
-<%_ } _%>
+    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
+    public String isAuthenticated(Principal principal) {
+        LOG.debug("REST request to check if the current user is authenticated");
+        return principal == null ? null : principal.getName();
     }
 
     public String createToken(Authentication authentication, boolean rememberMe) {

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

@@ -48,18 +48,16 @@ public class LogoutResource {
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and a body with a global logout URL.
      */
     @PostMapping("/api/logout")
-    public ResponseEntity<?> logout(HttpServletRequest request,
-                                    @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken) {
+    public ResponseEntity<?> logout(HttpServletRequest request, @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken) {
         StringBuilder logoutUrl = new StringBuilder();
 
         logoutUrl.append(this.registration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
- 
+
         String originUrl = request.getHeader(HttpHeaders.ORIGIN);
 
         logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
-   
+
         request.getSession().invalidate();
         return ResponseEntity.ok().body(Map.of("logoutUrl", logoutUrl.toString()));
     }
-
 }

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

@@ -49,12 +49,12 @@ public class LogoutResource {
      * @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) {
-        return session
-            .invalidate()
-            .then(
-                this.registration.map(oidc -> prepareLogoutUri(request, oidc, idToken))
-            );
+    public Mono<Map<String, String>> logout(
+        @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken,
+        ServerHttpRequest request,
+        WebSession session
+    ) {
+        return session.invalidate().then(this.registration.map(oidc -> prepareLogoutUri(request, oidc, idToken)));
     }
 
     private Map<String, String> prepareLogoutUri(ServerHttpRequest request, ClientRegistration clientRegistration, OidcIdToken idToken) {
@@ -65,7 +65,7 @@ public class LogoutResource {
         String originUrl = request.getHeaders().getOrigin();
 
         logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
-   
+
         return Map.of("logoutUrl", logoutUrl.toString());
     }
 }

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

@@ -39,13 +39,17 @@ public class BadRequestAlertException extends ErrorResponseException {
     }
 
     public BadRequestAlertException(URI type, String defaultMessage, String entityName, String errorKey) {
-        super(HttpStatus.BAD_REQUEST, ProblemDetailWithCauseBuilder.instance()
+        super(
+            HttpStatus.BAD_REQUEST,
+            ProblemDetailWithCauseBuilder.instance()
                 .withStatus(HttpStatus.BAD_REQUEST.value())
                 .withType(type)
                 .withTitle(defaultMessage)
                 .withProperty("message", "error." + errorKey)
                 .withProperty("params", entityName)
-                .build(), null);
+                .build(),
+            null
+        );
         this.entityName = entityName;
         this.errorKey = errorKey;
     }
@@ -59,6 +63,6 @@ public class BadRequestAlertException extends ErrorResponseException {
     }
 
     public ProblemDetailWithCause getProblemDetailWithCause() {
-    	return (ProblemDetailWithCause) this.getBody();
+        return (ProblemDetailWithCause) this.getBody();
     }
 }

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

@@ -35,6 +35,5 @@ public final class ErrorConstants {
     public static final URI LOGIN_ALREADY_USED_TYPE = URI.create(PROBLEM_BASE_URL + "/login-already-used");
 <%_ } _%>
 
-    private ErrorConstants() {
-    }
+    private ErrorConstants() {}
 }

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

@@ -180,12 +180,12 @@ _%>
         String title = extractTitle(err, problem.getStatus());
         String problemTitle = problem.getTitle();
         if (problemTitle == null || !problemTitle.equals(title)) {
-        	problem.setTitle(title);
+            problem.setTitle(title);
         }
 
         if (problem.getDetail() == null) {
             // higher precedence to cause
-        	problem.setDetail(getCustomizedErrorDetails(err));
+            problem.setDetail(getCustomizedErrorDetails(err));
         }
 
         Map<String, Object> problemProperties = problem.getProperties();
@@ -240,17 +240,13 @@ _%>
         // Let the ErrorResponse take this responsibility
         if (throwable instanceof ErrorResponse err) return HttpStatus.valueOf(err.getBody().getStatus());
 
-        return Optional
-                .ofNullable(getMappedStatus(throwable))
-                .orElse(Optional
-                        .ofNullable(resolveResponseStatus(throwable))
-                        .map(ResponseStatus::value)
-                        .orElse(HttpStatus.INTERNAL_SERVER_ERROR));
+        return Optional.ofNullable(getMappedStatus(throwable)).orElse(
+            Optional.ofNullable(resolveResponseStatus(throwable)).map(ResponseStatus::value).orElse(HttpStatus.INTERNAL_SERVER_ERROR)
+        );
     }
 
     private ResponseStatus extractResponseStatus(final Throwable throwable) {
-        return Optional.ofNullable(resolveResponseStatus(throwable))
-                .orElse(null);
+        return Optional.ofNullable(resolveResponseStatus(throwable)).orElse(null);
     }
 
     private ResponseStatus resolveResponseStatus(final Throwable type) {
@@ -259,8 +255,7 @@ _%>
     }
 
     private URI getMappedType(Throwable err) {
-        if(err instanceof MethodArgumentNotValidException)
-            return ErrorConstants.CONSTRAINT_VIOLATION_TYPE;
+        if (err instanceof MethodArgumentNotValidException) return ErrorConstants.CONSTRAINT_VIOLATION_TYPE;
         return ErrorConstants.DEFAULT_TYPE;
     }
 
@@ -281,8 +276,7 @@ _%>
     }
 
     private String getCustomizedTitle(Throwable err) {
-        if(err instanceof MethodArgumentNotValidException)
-            return "Method argument not valid";
+        if (err instanceof MethodArgumentNotValidException) return "Method argument not valid";
         return null;
     }
 
@@ -317,9 +311,15 @@ _%>
     }
 
     private HttpHeaders buildHeaders(Throwable err) {
-        return err instanceof BadRequestAlertException badRequestAlertException ?
-                HeaderUtil.createFailureAlert(applicationName, true, badRequestAlertException.getEntityName(),
-                        badRequestAlertException.getErrorKey(), badRequestAlertException.getMessage()) : null;
+        return err instanceof BadRequestAlertException badRequestAlertException
+            ? HeaderUtil.createFailureAlert(
+                applicationName,
+                true,
+                badRequestAlertException.getEntityName(),
+                badRequestAlertException.getErrorKey(),
+                badRequestAlertException.getMessage()
+            )
+            : null;
     }
 <%_ if (reactive) { _%>
     private HttpHeaders updateContentType(HttpHeaders headers) {

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

@@ -47,5 +47,4 @@ public class FieldErrorVM implements Serializable {
     public String getMessage() {
         return message;
     }
-
 }

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

@@ -28,10 +28,14 @@ public class InvalidPasswordException extends ErrorResponseException {
     private static final long serialVersionUID = 1L;
 
     public InvalidPasswordException() {
-        super(HttpStatus.BAD_REQUEST, ProblemDetailWithCauseBuilder.instance()
+        super(
+            HttpStatus.BAD_REQUEST,
+            ProblemDetailWithCauseBuilder.instance()
                 .withStatus(HttpStatus.BAD_REQUEST.value())
                 .withType(ErrorConstants.INVALID_PASSWORD_TYPE)
                 .withTitle("Incorrect password")
-                .build(), null);
+                .build(),
+            null
+        );
     }
 }

package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-dev.yml.ejs

@@ -106,7 +106,7 @@ spring:
       config:
         fail-fast: false # if not in "prod" profile, do not force to use Spring Cloud Config
         format: yaml
-        profile-separator: "-"
+        profile-separator: '-'
       discovery:
         prefer-ip-address: true
         tags:
@@ -203,6 +203,8 @@ spring:
 
 server:
   port: <%= serverPort %>
+  # make sure requests the proxy uri instead of the server one
+  forward-headers-strategy: native
 
 # ===================================================================
 # JHipster specific properties
@@ -339,7 +341,6 @@ jhipster:
       host: localhost
       port: 5000
       ring-buffer-size: 512
-
 # ===================================================================
 # Application specific properties
 # Add your own application properties here, see the ApplicationProperties class

package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-prod.yml.ejs

@@ -321,7 +321,6 @@ jhipster:
       host: localhost
       port: 5000
       ring-buffer-size: 512
-
 # ===================================================================
 # Application specific properties
 # Add your own application properties here, see the ApplicationProperties class

package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application.yml.ejs

@@ -161,6 +161,8 @@ management:
       repository:
         autotime:
           enabled: true
+    tags:
+      application: ${spring.application.name}
 
 <%_ if (databaseTypeMongodb) { _%>
 mongock:
@@ -217,10 +219,7 @@ spring:
               args:
                 pattern: "'/services/'+serviceId.toLowerCase()+'/**'"
           filters:
-            - name: RewritePath
-              args:
-                regexp: "'/services/' + serviceId.toLowerCase() + '/(?<remaining>.*)'"
-                replacement: "'/${remaining}'"
+            - StripPrefix=2
       httpclient:
         pool:
           max-connections: 1000
@@ -239,10 +238,12 @@ spring:
             predicates:
               - Path=/services/<%= ms.route %>/**
             filters:
-              - StripPrefix=2
         <%_ if (authenticationTypeOauth2) { _%>
               - TokenRelay
         <%_ } _%>
+              - StripPrefix=2
+              # X-Forwarded-Prefix not working when using MVC https://github.com/spring-cloud/spring-cloud-gateway/issues/3354, add manually
+              - AddRequestHeader=X-Forwarded-Prefix,/services/<%= ms.route %>
       <%_ } _%>
     <%_ } _%>
   <%_ } _%>
@@ -361,9 +362,6 @@ spring:
             client-secret: web_app
     <%_ } _%>
             scope: openid, profile, email, offline_access # last one for refresh tokens
-      resourceserver:
-        jwt:
-          principal-claim-name: preferred_username
   <%_ } _%>
   <%_ if (authenticationTypeJwt) { _%>
     oauth2:
@@ -402,7 +400,7 @@ springdoc:
 # Properties to be exposed on the /info management endpoint
 info:
   # Comma separated list of profiles that will trigger the ribbon to show
-  display-ribbon-on-profiles: "dev"
+  display-ribbon-on-profiles: 'dev'
 
 # ===================================================================
 # JHipster specific properties

package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/bootstrap-prod.yml.ejs

@@ -37,7 +37,7 @@ spring:
       config:
         fail-fast: true
         format: yaml # set this to "files" if using git2consul
-        profile-separator: "-"
+        profile-separator: '-'
       retry:
         initial-interval: 1000
         max-interval: 2000

package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/bootstrap.yml.ejs

@@ -37,7 +37,7 @@ spring:
       config:
         fail-fast: false # if not in "prod" profile, do not force to use Spring Cloud Config
         format: yaml
-        profile-separator: "-"
+        profile-separator: '-'
       discovery:
         tags:
           - profile=${spring.profiles.active}

package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/error.html.ejs

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html
   xmlns:th="http://www.thymeleaf.org"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -43,7 +43,9 @@
         border: 1px solid #b3b3b3;
         border-radius: 4px;
         margin: 0 auto;
-        box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff;
+        box-shadow:
+          0 1px 10px #a7a7a7,
+          inset 0 1px 0 #fff;
         background: #fcfcfc;
       }
 

package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/activationEmail.html.ejs

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
   <head>
     <title th:text="#{email.activation.title}">JHipster activation</title>

package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/creationEmail.html.ejs

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
   <head>
     <title th:text="#{email.activation.title}">JHipster creation</title>

package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
   <head>
     <title th:text="#{email.reset.title}">JHipster password reset</title>

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs

@@ -547,7 +547,11 @@ class UserServiceIT {
 
     private OAuth2AuthenticationToken createMockOAuth2AuthenticationToken(Map<String, Object> userDetails) {
         Collection<GrantedAuthority> authorities = Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS));
-        UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken("anonymous", "anonymous", authorities);
+        UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(
+            "anonymous",
+            "anonymous",
+            authorities
+        );
         usernamePasswordAuthenticationToken.setDetails(userDetails);
         OAuth2User user = new DefaultOAuth2User(authorities, userDetails, "sub");
 

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/PublicUserResourceIT.java.ejs

@@ -75,9 +75,6 @@ import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Mono;
 <%_ } _%>
 
-<%_ if (databaseTypeSql && !reactive) { _%>
-import jakarta.persistence.EntityManager;
-<%_ } _%>
 <%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%>
 import java.util.stream.Stream;
 <%_ } _%>
@@ -108,8 +105,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @IntegrationTest
 class PublicUserResourceIT {
 
-    private static final String DEFAULT_LOGIN = "johndoe";
-
 <%_ const DEFAULT_USER = {firstName: 'john', lastName: 'doe'}; _%>
 <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
     private static final String DEFAULT_<%= field.fieldName.toUpperCase() %> = "<%= DEFAULT_USER [field.fieldName] %>";
@@ -132,11 +127,6 @@ class PublicUserResourceIT {
     @Autowired
     private UserSearchRepository mockUserSearchRepository;
 <%_ } _%>
-<%_ if (databaseTypeSql) { _%>
-
-    @Autowired
-    private EntityManager em;
-<%_ } _%>
 <%_ if (cacheProviderAny) { _%>
 
     @Autowired
@@ -170,7 +160,7 @@ class PublicUserResourceIT {
 <%_ } _%>
     @BeforeEach
     public void initTest() {
-        user = UserResourceIT.initTestUser(<% if (databaseTypeSql) { %>em<% } %>);
+        user = UserResourceIT.initTestUser();
     }
 
     @AfterEach

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs

@@ -133,11 +133,6 @@ class UserResourceIT {
 <%_ } else { _%>
     private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- this.getPrimaryKeyValue(user.primaryKey.type) %>;
 <%_ } _%>
-<%_ if (!authenticationTypeOauth2) { _%>
-
-    private static final String DEFAULT_PASSWORD = "passjohndoe";
-    private static final String UPDATED_PASSWORD = "passjhipster";
-<%_ } _%>
 
     private static final String DEFAULT_EMAIL = "johndoe@localhost";
 <%_ if (!authenticationTypeOauth2) { _%>
@@ -231,7 +226,7 @@ class UserResourceIT {
      * This is a static method, as tests for other entities might also need it,
      * if they test an entity which has a required relationship to the User entity.
      */
-    public static <%= user.persistClass %> createEntity(<% if (databaseTypeSql) { %>EntityManager em<% } %>) {
+    public static <%= user.persistClass %> createEntity() {
         <%= user.persistClass %> persistUser = new <%= user.persistClass %>();
 <%_ if (databaseTypeCassandra || (authenticationTypeOauth2 && !databaseTypeCouchbase)) { _%>
         persistUser.setId(UUID.randomUUID().toString());
@@ -265,8 +260,8 @@ class UserResourceIT {
     /**
      * Setups the database with one user.
      */
-    public static <%= user.persistClass %> initTestUser(<% if (databaseTypeSql) { %>EntityManager em<% } _%>) {
-        <%= user.persistClass %> persistUser = createEntity(<% if (databaseTypeSql ) { %>em<% } _%>);
+    public static <%= user.persistClass %> initTestUser() {
+        <%= user.persistClass %> persistUser = createEntity();
 <%_ if (databaseTypeSql) { _%>
         persistUser.setLogin(DEFAULT_LOGIN);
         persistUser.setEmail(DEFAULT_EMAIL);
@@ -276,7 +271,7 @@ class UserResourceIT {
 
     @BeforeEach
     public void initTest() {
-        user = initTestUser(<% if (databaseTypeSql) { %>em<% } _%>);
+        user = initTestUser();
     }
 
     @AfterEach
@@ -465,7 +460,7 @@ class UserResourceIT {
         userDTO.setLogin("anotherlogin");
         userDTO.setFirstName(DEFAULT_FIRSTNAME);
         userDTO.setLastName(DEFAULT_LASTNAME);
-        userDTO.setEmail(DEFAULT_EMAIL);// this email should already be used
+        userDTO.setEmail(DEFAULT_EMAIL); // this email should already be used
         userDTO.setActivated(true);
   <%_ if (!databaseTypeCassandra) { _%>
         userDTO.setImageUrl(DEFAULT_IMAGEURL);
@@ -764,7 +759,7 @@ class UserResourceIT {
         userDTO.setLogin(updatedUser.getLogin());
         userDTO.setFirstName(updatedUser.getFirstName());
         userDTO.setLastName(updatedUser.getLastName());
-        userDTO.setEmail("jhipster@localhost");// this email should already be used by anotherUser
+        userDTO.setEmail("jhipster@localhost"); // this email should already be used by anotherUser
         userDTO.setActivated(updatedUser.isActivated());
   <%_ if (!databaseTypeCassandra) { _%>
         userDTO.setImageUrl(updatedUser.getImageUrl());
@@ -831,7 +826,7 @@ class UserResourceIT {
 
         <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
         userDTO.setId(updatedUser.getId());
-        userDTO.setLogin("jhipster");// this login should already be used by anotherUser
+        userDTO.setLogin("jhipster"); // this login should already be used by anotherUser
         userDTO.setFirstName(updatedUser.getFirstName());
         userDTO.setLastName(updatedUser.getLastName());
         userDTO.setEmail(updatedUser.getEmail());