generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs

@@ -114,7 +114,7 @@ import java.util.stream.Collectors;
 public class UserService {
 <%_ if (!databaseTypeNo) { _%>
 
-    private final Logger log = LoggerFactory.getLogger(UserService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UserService.class);
 
     private final UserRepository userRepository;
   <%_ if (!authenticationTypeOauth2) { _%>
@@ -162,7 +162,7 @@ public class UserService {
     @Transactional
     <%_ } _%>
     public <% if (reactive) { %>Mono<% } else { %>Optional<% } %><<%= user.persistClass %>> activateRegistration(String key) {
-        log.debug("Activating user for activation key {}", key);
+        LOG.debug("Activating user for activation key {}", key);
         return userRepository.findOneByActivationKey(key)
             .<% if (reactive) { %>flatMap<% } else { %>map<% } %>(user -> {
                 // activate given user for the registration key.
@@ -177,7 +177,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
             .doOnNext(this::clearUserCaches)
       <%_ } _%>
-            .doOnNext(user -> log.debug("Activated user: {}", user));
+            .doOnNext(user -> LOG.debug("Activated user: {}", user));
     <%_ } else { _%>
       <%_ if (databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase || databaseTypeCassandra) { _%>
                 userRepository.save(user);
@@ -188,7 +188,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
                 this.clearUserCaches(user);
       <%_ } _%>
-                log.debug("Activated user: {}", user);
+                LOG.debug("Activated user: {}", user);
                 return user;
             });
     <%_ } _%>
@@ -198,8 +198,9 @@ public class UserService {
     @Transactional
     <%_ } _%>
     public <% if (reactive) { %>Mono<% } else { %>Optional<% } %><<%= user.persistClass %>> completePasswordReset(String newPassword, String key) {
-        log.debug("Reset user password for reset key {}", key);
-        return userRepository.findOneByResetKey(key)
+        LOG.debug("Reset user password for reset key {}", key);
+        return userRepository
+            .findOneByResetKey(key)
             .filter(user -> user.getResetDate().isAfter(Instant.now().minus(1, ChronoUnit.DAYS)))
     <%_ if (reactive) { _%>
             .publishOn(Schedulers.boundedElastic())
@@ -328,7 +329,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
                     .doOnNext(this::clearUserCaches)
       <%_ } _%>
-                    .doOnNext(user -> log.debug("Created Information for User: {}", user));
+                    .doOnNext(user -> LOG.debug("Created Information for User: {}", user));
             });
     <%_ } else { /* !reactive */ _%>
         userRepository.findOneByLogin(userDTO.getLogin().toLowerCase()).ifPresent(existingUser -> {
@@ -379,7 +380,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
         this.clearUserCaches(newUser);
       <%_ } _%>
-        log.debug("Created Information for User: {}", newUser);
+        LOG.debug("Created Information for User: {}", newUser);
         return newUser;
     <%_ } _%>
     }
@@ -387,7 +388,7 @@ public class UserService {
     <%_ if (!reactive) { _%>
     private boolean removeNonActivatedUser(<%= user.persistClass %> existingUser) {
         if (existingUser.isActivated()) {
-             return false;
+            return false;
         }
         userRepository.delete(existingUser);
       <%_ if (databaseTypeSql) { _%>
@@ -448,7 +449,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
             .doOnNext(this::clearUserCaches)
       <%_ } _%>
-            .doOnNext(user1 -> log.debug("Created Information for User: {}", user1));
+            .doOnNext(user1 -> LOG.debug("Created Information for User: {}", user1));
     <%_ } else { _%>
         String encryptedPassword = passwordEncoder.encode(RandomUtil.generatePassword());
         user.setPassword(encryptedPassword);
@@ -457,7 +458,9 @@ public class UserService {
         user.setActivated(true);
       <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
         if (userDTO.getAuthorities() != null) {
-            Set<Authority> authorities = userDTO.getAuthorities().stream()
+            Set<Authority> authorities = userDTO
+                .getAuthorities()
+                .stream()
                 .map(authorityRepository::findById)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
@@ -474,7 +477,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
         this.clearUserCaches(user);
       <%_ } _%>
-        log.debug("Created Information for User: {}", user);
+        LOG.debug("Created Information for User: {}", user);
         return user;
     <%_ } _%>
     }
@@ -547,7 +550,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
             .doOnNext(this::clearUserCaches)
       <%_ } _%>
-            .doOnNext(user -> log.debug("Changed Information for User: {}", user))
+            .doOnNext(user -> LOG.debug("Changed Information for User: {}", user))
     <%_ } else { /* reactive */ _%>
       <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
                 userDTO.getAuthorities().stream()
@@ -563,7 +566,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
                 this.clearUserCaches(user);
       <%_ } _%>
-                log.debug("Changed Information for User: {}", user);
+                LOG.debug("Changed Information for User: {}", user);
                 return user;
             })
     <%_ } _%>
@@ -575,7 +578,8 @@ public class UserService {
     @Transactional
       <%_ } _%>
     public Mono<Void> deleteUser(String login) {
-        return userRepository.findOneByLogin(login)
+        return userRepository
+            .findOneByLogin(login)
             .flatMap(user -> userRepository.delete(user).thenReturn(user))
       <%_ if (searchEngineElasticsearch) { _%>
             .flatMap(user -> userSearchRepository.delete(user).thenReturn(user))
@@ -583,7 +587,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
             .doOnNext(this::clearUserCaches)
       <%_ } _%>
-            .doOnNext(user -> log.debug("Deleted User: {}", user))
+            .doOnNext(user -> LOG.debug("Deleted User: {}", user))
             .then();
     }
     <%_ } else { _%>
@@ -596,7 +600,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
             this.clearUserCaches(user);
       <%_ } _%>
-            log.debug("Deleted User: {}", user);
+            LOG.debug("Deleted User: {}", user);
         });
     }
     <%_ } _%>
@@ -641,7 +645,7 @@ public class UserService {
     <%_ if (cacheProviderAny) { _%>
             .doOnNext(this::clearUserCaches)
     <%_ } _%>
-            .doOnNext(user -> log.debug("Changed Information for User: {}", user))
+            .doOnNext(user -> LOG.debug("Changed Information for User: {}", user))
             .then();
   <%_ } else { _%>
                 userRepository.save(user);
@@ -651,7 +655,7 @@ public class UserService {
     <%_ if (cacheProviderAny) { _%>
                 this.clearUserCaches(user);
     <%_ } _%>
-                log.debug("Changed Information for User: {}", user);
+                LOG.debug("Changed Information for User: {}", user);
             });
   <%_ } _%>
     }
@@ -731,7 +735,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
             .doOnNext(this::clearUserCaches)
       <%_ } _%>
-            .doOnNext(user -> log.debug("Changed password for User: {}", user))
+            .doOnNext(user -> LOG.debug("Changed password for User: {}", user))
             .then();
     <%_ } else { _%>
       <%_ if (databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase || databaseTypeCassandra) { _%>
@@ -740,7 +744,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
                 this.clearUserCaches(user);
       <%_ } _%>
-                log.debug("Changed password for User: {}", user);
+                LOG.debug("Changed password for User: {}", user);
             });
     <%_ } _%>
     }
@@ -816,7 +820,7 @@ public class UserService {
     public void removeOldPersistentTokens() {
         LocalDate now = LocalDate.now();
         persistentTokenRepository.findByTokenDateBefore(now.minusMonths(1)).forEach(token -> {
-            log.debug("Deleting token {}", token.getSeries());<% if (databaseType === 'sql') { %>
+            LOG.debug("Deleting token {}", token.getSeries());<% if (databaseType === 'sql') { %>
             <%= user.persistClass %> user = token.getUser();
             user.getPersistentTokens().remove(token);<% } %>
             persistentTokenRepository.delete(token);
@@ -838,7 +842,7 @@ public class UserService {
         userRepository
             .findAllByActivatedIsFalseAndActivationKeyIsNotNullAndCreatedDateBefore(Instant.now().minus(3, ChronoUnit.DAYS))
             .forEach(user -> {
-                log.debug("Deleting not activated user {}", user.getLogin());
+                LOG.debug("Deleting not activated user {}", user.getLogin());
                 userRepository.delete(user);
       <%_ if (searchEngineElasticsearch) { _%>
                 userSearchRepository.deleteFromIndex(user);
@@ -864,7 +868,7 @@ public class UserService {
       <%_ if (cacheProviderAny) { _%>
             .doOnNext(this::clearUserCaches)
       <%_ } _%>
-            .doOnNext(user -> log.debug("Deleted User: {}", user));
+            .doOnNext(user -> LOG.debug("Deleted User: {}", user));
     }
     <%_ } _%>
   <%_ } _%>
@@ -901,7 +905,7 @@ public class UserService {
                     .toList();
                 return Flux.fromIterable(authoritiesToSave);
             })
-            .doOnNext(authority -> log.debug("Saving authority '{}' in local database", authority))
+            .doOnNext(authority -> LOG.debug("Saving authority '{}' in local database", authority))
             .flatMap(authorityRepository::save)
             .then(userRepository.findOneByLogin(user.getLogin()))
             .switchIfEmpty(<% if (authenticationTypeOauth2 && databaseTypeSql) { %>saveUser(user, true)<% } else { %>userRepository.save(user)<% } %>)
@@ -916,15 +920,12 @@ public class UserService {
                         idpModifiedDate = Instant.ofEpochSecond((Integer) details.get("updated_at"));
                     }
                     if (idpModifiedDate.isAfter(dbModifiedDate)) {
-                        log.debug("Updating user '{}' in local database", user.getLogin());
-                        return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(),
-                            user.getLangKey(), user.getImageUrl());
+                        LOG.debug("Updating user '{}' in local database", user.getLogin());
+                        return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), user.getLangKey(), user.getImageUrl());
                     }
-                    // no last updated info, blindly update
                 } else {
-                    log.debug("Updating user '{}' in local database", user.getLogin());
-                    return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(),
-                        user.getLangKey(), user.getImageUrl());
+                    LOG.debug("Updating user '{}' in local database", user.getLogin());
+                    return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), user.getLangKey(), user.getImageUrl());
                 }
                 return Mono.empty();
             })
@@ -939,7 +940,7 @@ public class UserService {
       <%_ } _%>
         for (String authority : userAuthorities) {
             if (!dbAuthorities.contains(authority)) {
-                log.debug("Saving authority '{}' in local database", authority);
+                LOG.debug("Saving authority '{}' in local database", authority);
                 Authority authorityToSave = new Authority();
                 authorityToSave.setName(authority);
                 authorityRepository.save(authorityToSave);
@@ -958,18 +959,18 @@ public class UserService {
                     idpModifiedDate = Instant.ofEpochSecond((Integer) details.get("updated_at"));
                 }
                 if (idpModifiedDate.isAfter(dbModifiedDate)) {
-                    log.debug("Updating user '{}' in local database", user.getLogin());
+                    LOG.debug("Updating user '{}' in local database", user.getLogin());
                     updateUser(user.getFirstName(), user.getLastName(), user.getEmail(),
                         user.getLangKey(), user.getImageUrl());
                 }
                 // no last updated info, blindly update
             } else {
-                log.debug("Updating user '{}' in local database", user.getLogin());
+                LOG.debug("Updating user '{}' in local database", user.getLogin());
                 updateUser(user.getFirstName(), user.getLastName(), user.getEmail(),
                     user.getLangKey(), user.getImageUrl());
             }
         } else {
-            log.debug("Saving user '{}' in local database", user.getLogin());
+            LOG.debug("Saving user '{}' in local database", user.getLogin());
             userRepository.save(user);
       <%_ if (cacheProviderAny) { _%>
             this.clearUserCaches(user);

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs

@@ -68,7 +68,7 @@ import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 <%_ } _%>
 public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
 
-    private final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
+    private static final Logger LOG = LoggerFactory.getLogger(<%= serviceClassName %>.class);
 <%- include('../_partials_entity_/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: false, mapsIdAssoc: null, isController: false}); -%>
 <%_ if (paginationNo) { _%>
 
@@ -79,7 +79,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public List<<%= instanceType %>> findByCriteria(<%= criteria %> criteria) {
-        log.debug("find by criteria : {}", criteria);
+        LOG.debug("find by criteria : {}", criteria);
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
   <%_ if (dtoMapstruct) { _%>
         return <%= entityListToDto %>(<% if (containsBagRelationships) { %><%= repository %>.fetchBagRelationships(<% } %><%= repository %>.findAll(specification)<% if (containsBagRelationships) { %>)<% } %>);
@@ -97,7 +97,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public Page<<%= instanceType %>> findByCriteria(<%= criteria %> criteria, Pageable page) {
-        log.debug("find by criteria : {}, page: {}", criteria, page);
+        LOG.debug("find by criteria : {}, page: {}", criteria, page);
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
   <%_ if (dtoMapstruct) { _%>
         return <% if (containsBagRelationships) { %><%= repository %>.fetchBagRelationships(<% } %><%= repository %>.findAll(specification, page)<% if (containsBagRelationships) { %>)<% } %>
@@ -115,7 +115,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public long countByCriteria(<%= criteria %> criteria) {
-        log.debug("count by criteria : {}", criteria);
+        LOG.debug("count by criteria : {}", criteria);
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
         return <%= repository %>.count(specification);
     }

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.java.ejs

@@ -95,7 +95,7 @@ import java.util.stream.StreamSupport;
 @Transactional<% } %>
 public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= entityClass %>Service<% } %> {
 
-    private final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
+    private static final Logger LOG = LoggerFactory.getLogger(<%= serviceClassName %>.class);
 <%- include('../../_partials_entity_/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false}); -%>
 
 <%_ if (!serviceImpl) { _%>
@@ -110,7 +110,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Override
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> save(<%= instanceType %> <%= instanceName %>) {
-        log.debug("Request to save <%= entityClass %> : {}", <%= instanceName %>);
+        LOG.debug("Request to save <%= entityClass %> : {}", <%= instanceName %>);
 <%- include('/_global_partials_entity_/save_template', {saveNewEntityOperation: true, returnDirectly: true}); -%>
     }
 <%_ if (updatableEntity) { _%>
@@ -127,7 +127,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Override
   <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> update(<%= instanceType %> <%= instanceName %>) {
-        log.debug("Request to update <%= entityClass %> : {}", <%= instanceName %>);
+        LOG.debug("Request to update <%= entityClass %> : {}", <%= instanceName %>);
 <%- include('/_global_partials_entity_/save_template', {saveNewEntityOperation: false, returnDirectly: true}); -%>
     }
 
@@ -143,7 +143,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Override
   <%_ } _%>
     public <% if (reactive) { %>Mono<% } else { %>Optional<% } %><<%= instanceType %>> partialUpdate(<%= instanceType %> <%= instanceName %>) {
-        log.debug("Request to partially update <%= entityClass %> : {}", <%= instanceName %>);
+        LOG.debug("Request to partially update <%= entityClass %> : {}", <%= instanceName %>);
 <%- include('../../_partials_entity_/patch_template', {isService: true, viaService: false}); -%>
     }
 <%_ } _%>
@@ -166,7 +166,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Transactional(readOnly = true)
   <%_ } _%>
     public <% if (paginationNo) { %><%= listOrFlux %><% } else { %><%= pageOrFlux %><% } %><<%= instanceType %>> findAll(<% if (!paginationNo) { %>Pageable pageable<% } %>) {
-        log.debug("Request to get all <%= entityClassPlural %>");
+        LOG.debug("Request to get all <%= entityClassPlural %>");
   <%_ if (paginationNo) { _%>
         return <%= entityInstance %>Repository.findAll()<% if (dtoMapstruct) { %><% if (!reactive) { %>.stream()<% } %>
             .map(<%= entityToDtoReference %>)<% if (!reactive) { %>
@@ -196,7 +196,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Transactional(readOnly = true)
     <%_ } _%>
     public <% if (paginationNo) { %><%= listOrFlux %><% } else { %><%= pageOrFlux %><% } %><<%= instanceType %>> findByCriteria(<%= entityClass %>Criteria criteria<% if (!paginationNo) { %>, Pageable pageable<% } %>) {
-        log.debug("Request to get all <%= entityClassPlural %> by Criteria");
+        LOG.debug("Request to get all <%= entityClassPlural %> by Criteria");
     <%_ if (paginationNo) { _%>
         return <%= entityInstance %>Repository.findByCriteria(criteria, null)<% if (dtoMapstruct) { %>.map(<%= entityToDtoReference  %>)<% } %>;
     <%_ } else { _%>
@@ -210,7 +210,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     * @return the count of <%= entityInstancePlural %>
     */
     public Mono<Long> countByCriteria(<%= entityClass %>Criteria criteria) {
-        log.debug("Request to get the count of all <%= entityClassPlural %> by Criteria");
+        LOG.debug("Request to get the count of all <%= entityClassPlural %> by Criteria");
         return <%= entityInstance %>Repository.countByCriteria(criteria);
     }
 <%_ }  _%>
@@ -270,7 +270,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Transactional(readOnly = true)
     <%_ } _%>
     public <%= optionalOrMono %><<%= instanceType %>> findOne(<%= primaryKey.type %> id) {
-        log.debug("Request to get <%= entityClass %> : {}", id);<%- include('../../_partials_entity_/get_template', {viaService: false, returnDirectly:true, implementsEagerLoadApis}); -%>
+        LOG.debug("Request to get <%= entityClass %> : {}", id);<%- include('../../_partials_entity_/get_template', {viaService: false, returnDirectly:true, implementsEagerLoadApis}); -%>
     }
 
 <%_ if (!serviceImpl) { _%>
@@ -287,7 +287,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Override
 <%_ } _%>
     public <%- reactive ? 'Mono<Void>' : 'void' %> delete(<%= primaryKey.type %> id) {
-        log.debug("Request to delete <%= entityClass %> : {}", id);
+        LOG.debug("Request to delete <%= entityClass %> : {}", id);
 <%- include('../../_partials_entity_/delete_template', {viaService: false, fromResource: false}); -%>
     }
 <%_ if (searchEngineAny) { _%>
@@ -311,9 +311,9 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
   <%_ } _%>
     public <% if (!paginationNo) { %><%= pageOrFlux %><<%= instanceType %><% } else { %><%= listOrFlux %><<%= instanceType %><% } %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>) {
   <%_ if (paginationNo) { _%>
-        log.debug("Request to search <%= entityClassPlural %> for query {}", query);<%- include('../../_partials_entity_/search_stream_template', {viaService: false, fromResource: false}); -%>
+        LOG.debug("Request to search <%= entityClassPlural %> for query {}", query);<%- include('../../_partials_entity_/search_stream_template', {viaService: false, fromResource: false}); -%>
   <%_ } else { _%>
-        log.debug("Request to search for a page of <%= entityClassPlural %> for query {}", query);
+        LOG.debug("Request to search for a page of <%= entityClassPlural %> for query {}", query);
         return <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(query, pageable)<%_ if (!dtoMapstruct) { _%>;<% } else { %>
             .map(<%= entityToDtoReference %>);
   <%_ } } _%>

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

@@ -84,7 +84,7 @@ public class PublicUserResource {
     private static final List<String> ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(Arrays.asList("id", "login", "firstName", "lastName", "email", "activated", "langKey"));
 <%_ } _%>
 
-    private final Logger log = LoggerFactory.getLogger(PublicUserResource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PublicUserResource.class);
 
     private final UserService userService;
 <%_ if (searchEngineElasticsearch) { _%>
@@ -124,7 +124,7 @@ public class PublicUserResource {
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
   <%_ if (reactive) { _%>
     public Mono<ResponseEntity<Flux<<%= user.dtoClass %>>>> getAllPublicUsers(ServerHttpRequest request, @org.springdoc.core.annotations.ParameterObject Pageable pageable) {
-        log.debug("REST request to get all public User names");
+        LOG.debug("REST request to get all public User names");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
             return Mono.just(ResponseEntity.badRequest().build());
@@ -138,7 +138,7 @@ public class PublicUserResource {
     }
   <%_ } else { _%>
     public ResponseEntity<List<<%= user.dtoClass %>>> getAllPublicUsers(@org.springdoc.core.annotations.ParameterObject Pageable pageable) {
-        log.debug("REST request to get all public User names");
+        LOG.debug("REST request to get all public User names");
     <%_ if (!authenticationTypeOauth2) { _%>
         if (!onlyContainsAllowedProperties(pageable)) {
             return ResponseEntity.badRequest().build();

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

@@ -112,10 +112,24 @@ import java.util.stream.StreamSupport;
 @RestController
 @RequestMapping("/api/admin")
 public class UserResource {
-    private static final List<String> ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(Arrays.asList(
-    "id", "login", "firstName", "lastName", "email", "activated", "langKey", "createdBy", "createdDate", "lastModifiedBy", "lastModifiedDate"));
 
-    private final Logger log = LoggerFactory.getLogger(UserResource.class);
+    private static final List<String> ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(
+        Arrays.asList(
+            "id",
+            "login",
+            "firstName",
+            "lastName",
+            "email",
+            "activated",
+            "langKey",
+            "createdBy",
+            "createdDate",
+            "lastModifiedBy",
+            "lastModifiedDate"
+        )
+    );
+
+    private static final Logger LOG = LoggerFactory.getLogger(UserResource.class);
 
     @Value("${jhipster.clientApp.name}")
     private String applicationName;
@@ -149,14 +163,15 @@ public class UserResource {
     @PostMapping("/users")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
     public <% if (reactive) { %>Mono<ResponseEntity<<%= user.persistClass %>>><% } else { %>ResponseEntity<<%= user.persistClass %>><% } %> createUser(@Valid @RequestBody <%= user.adminUserDto %> userDTO)<% if (!reactive) { %> throws URISyntaxException<% } %> {
-        log.debug("REST request to save User : {}", userDTO);
+        LOG.debug("REST request to save User : {}", userDTO);
 
         if (userDTO.getId() != null) {
             throw new BadRequestAlertException("A new user cannot already have an ID", "userManagement", "idexists");
             // Lowercase the user login before comparing with database
 <%_ if (reactive) { _%>
         }
-        return userRepository.findOneByLogin(userDTO.getLogin().toLowerCase())
+        return userRepository
+            .findOneByLogin(userDTO.getLogin().toLowerCase())
             .hasElement()
             .flatMap(loginExists -> {
                 if (Boolean.TRUE.equals(loginExists)) {
@@ -208,7 +223,7 @@ public class UserResource {
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
 <%_ if (reactive) { _%>
     public Mono<ResponseEntity<<%= user.adminUserDto %>>> updateUser(@PathVariable(name = "login", required = false) @Pattern(regexp = Constants.LOGIN_REGEX) String login, @Valid @RequestBody <%= user.adminUserDto %> userDTO) {
-        log.debug("REST request to update User : {}", userDTO);
+        LOG.debug("REST request to update User : {}", userDTO);
         return userRepository.findOneByEmailIgnoreCase(userDTO.getEmail())
             .filter(user -> !user.getId().equals(userDTO.getId()))
             .hasElement()
@@ -233,7 +248,7 @@ public class UserResource {
             );
 <%_ } else { _%>
     public ResponseEntity<<%= user.adminUserDto %>> updateUser(@PathVariable(name = "login", required = false) @Pattern(regexp = Constants.LOGIN_REGEX) String login, @Valid @RequestBody <%= user.adminUserDto %> userDTO) {
-        log.debug("REST request to update User : {}", userDTO);
+        LOG.debug("REST request to update User : {}", userDTO);
         Optional<<%= user.persistClass %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
         if (existingUser.isPresent() && (!existingUser.orElseThrow().getId().equals(userDTO.getId()))) {
             throw new EmailAlreadyUsedException();
@@ -263,18 +278,24 @@ public class UserResource {
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
   <%_ if (reactive) { _%>
     public Mono<ResponseEntity<Flux<<%= user.adminUserDto %>>>> getAllUsers(@org.springdoc.core.annotations.ParameterObject ServerHttpRequest request, @org.springdoc.core.annotations.ParameterObject Pageable pageable) {
-        log.debug("REST request to get all User for an admin");
+        LOG.debug("REST request to get all User for an admin");
         if (!onlyContainsAllowedProperties(pageable)) {
             return Mono.just(ResponseEntity.badRequest().build());
         }
 
-        return userService.countManagedUsers()
+        return userService
+            .countManagedUsers()
             .map(total -> new PageImpl<>(new ArrayList<>(), pageable, total))
-            .map(page -> PaginationUtil.generatePaginationHttpHeaders(ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()), page))
+            .map(page ->
+                PaginationUtil.generatePaginationHttpHeaders(
+                    ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()),
+                    page
+                )
+            )
             .map(headers -> ResponseEntity.ok().headers(headers).body(userService.getAllManagedUsers(pageable)));
   <%_ } else { _%>
     public ResponseEntity<List<<%= user.adminUserDto %>>> getAllUsers(@org.springdoc.core.annotations.ParameterObject Pageable pageable) {
-        log.debug("REST request to get all User for an admin");
+        LOG.debug("REST request to get all User for an admin");
         if (!onlyContainsAllowedProperties(pageable)) {
             return ResponseEntity.badRequest().build();
         }
@@ -291,7 +312,7 @@ public class UserResource {
 
 <%_ } else { /* Cassandra */ _%>
     public <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= user.adminUserDto %>> getAllUsers() {
-        log.debug("REST request to get all User for an admin");
+        LOG.debug("REST request to get all User for an admin");
         return userService.getAllManagedUsers();
     }
 
@@ -307,13 +328,13 @@ public class UserResource {
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
 <%_ if (reactive) { _%>
     public Mono<<%= user.adminUserDto %>> getUser(@PathVariable("login") String login) {
-        log.debug("REST request to get User : {}", login);
+        LOG.debug("REST request to get User : {}", login);
         return userService.getUserWithAuthoritiesByLogin(login)
             .map(<%= user.adminUserDto %>::new)
             .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND)));
 <%_ } else { _%>
     public ResponseEntity<<%= user.adminUserDto %>> getUser(@PathVariable("login") @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
-        log.debug("REST request to get User : {}", login);
+        LOG.debug("REST request to get User : {}", login);
         return ResponseUtil.wrapOrNotFound(
             userService.getUserWithAuthoritiesByLogin(login)
                 .map(<%= user.adminUserDto %>::new));
@@ -330,12 +351,12 @@ public class UserResource {
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
 <%_ if (reactive) { _%>
     public Mono<ResponseEntity<Void>> deleteUser(@PathVariable("login") @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
-        log.debug("REST request to delete User: {}", login);
+        LOG.debug("REST request to delete User: {}", login);
         return userService.deleteUser(login)
         .then(Mono.just(ResponseEntity.noContent().headers(HeaderUtil.createAlert( applicationName, <% if (enableTranslation) { %> "userManagement.deleted"<% } else { %> "A user is deleted with identifier " + login<% } %>, login)).build()));
 <%_ } else { _%>
     public ResponseEntity<Void> deleteUser(@PathVariable("login") @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
-        log.debug("REST request to delete User: {}", login);
+        LOG.debug("REST request to delete User: {}", login);
         userService.deleteUser(login);
         return ResponseEntity.noContent().headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %> "userManagement.deleted"<% } else { %> "A user is deleted with identifier " + login<% } %>, login)).build();
 <%_ } _%>

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

@@ -139,7 +139,7 @@ import java.util.stream.StreamSupport;
 <%_ } _%>
 public class <%= entityClass %>Resource {
 
-    private final Logger log = LoggerFactory.getLogger(<%= entityClass %>Resource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(<%= entityClass %>Resource.class);
 <%_ if (!readOnly) { _%>
 
   <%_ let entityName = entityInstance;
@@ -171,7 +171,7 @@ public class <%= entityClass %>Resource {
     @PreAuthorize("<%- entitySpringPreAuthorize %>")
   <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> create<%= entityClass %>(<% if (anyPropertyHasValidation) { %>@Valid <% } %>@RequestBody <%= instanceType %> <%= instanceName %>) throws URISyntaxException {
-        log.debug("REST request to save <%= entityClass %> : {}", <%= instanceName %>);
+        LOG.debug("REST request to save <%= entityClass %> : {}", <%= instanceName %>);
   <%_ if (primaryKey.autoGenerate) { _%>
         if (<%= instanceName %>.get<%= primaryKey.nameCapitalized %>() != null) {
             throw new BadRequestAlertException("A new <%= entityInstance %> cannot already have an ID", ENTITY_NAME, "idexists");
@@ -264,7 +264,7 @@ public class <%= entityClass %>Resource {
         @PathVariable(value = "<%= primaryKey.name %>", required = false) final <%= primaryKey.type %> <%= primaryKey.name %>,
         <% if (anyPropertyHasValidation) { %>@Valid <% } %>@RequestBody <%= restClass %> <%= restInstance %>
     ) throws URISyntaxException {
-        log.debug("REST request to update <%= entityClass %> : {}, {}", <%= primaryKey.name %>, <%= instanceName %>);
+        LOG.debug("REST request to update <%= entityClass %> : {}, {}", <%= primaryKey.name %>, <%= instanceName %>);
         if (<%= instanceName %>.get<%= primaryKey.nameCapitalized %>() == null) {
             throw new BadRequestAlertException("Invalid id", ENTITY_NAME, "idnull");
         }
@@ -344,7 +344,7 @@ public class <%= entityClass %>Resource {
         @PathVariable(value = "<%= primaryKey.name %>", required = false) final <%= primaryKey.type %> <%= primaryKey.name %>,
         <% if (anyPropertyHasValidation) { %>@NotNull <% } %>@RequestBody <%= instanceType %> <%= instanceName %>
     ) throws URISyntaxException {
-        log.debug("REST request to partial update <%= entityClass %> partially : {}, {}", <%= primaryKey.name %>, <%= instanceName %>);
+        LOG.debug("REST request to partial update <%= entityClass %> partially : {}, {}", <%= primaryKey.name %>, <%= instanceName %>);
         if (<%= instanceName %>.get<%= primaryKey.nameCapitalized %>() == null) {
             throw new BadRequestAlertException("Invalid id", ENTITY_NAME, "idnull");
         }
@@ -442,7 +442,7 @@ public class <%= entityClass %>Resource {
     @PreAuthorize("<%- entitySpringReadPreAuthorize %>")
 <%_ } _%>
     public Flux<<%= instanceType %>> getAll<%= entityClassPlural %>AsStream() {
-        log.debug("REST request to get all <%= entityClassPlural %> as a stream");
+        LOG.debug("REST request to get all <%= entityClassPlural %> as a stream");
   <%_ if (viaService) { _%>
         return <%= entityInstance %>Service.findAll();
   <%_ } else { _%>
@@ -465,7 +465,7 @@ public class <%= entityClass %>Resource {
     @PreAuthorize("<%- entitySpringReadPreAuthorize %>")
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= instanceType %>><% if (reactive) { %>><% } %> get<%= entityClass %>(@PathVariable("id") <%= primaryKey.type %> id) {
-        log.debug("REST request to get <%= entityClass %> : {}", id);<%- include('../../_partials_entity_/get_template', {viaService, returnDirectly:false, implementsEagerLoadApis}); -%>
+        LOG.debug("REST request to get <%= entityClass %> : {}", id);<%- include('../../_partials_entity_/get_template', {viaService, returnDirectly:false, implementsEagerLoadApis}); -%>
         return ResponseUtil.wrapOrNotFound(<%= instanceName %>);
     }
 <%_ if (!readOnly) { _%>
@@ -481,7 +481,7 @@ public class <%= entityClass %>Resource {
     @PreAuthorize("<%- entitySpringPreAuthorize %>")
   <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Void><% if (reactive) { %>><% } %> delete<%= entityClass %>(@PathVariable("id") <%= primaryKey.type %> id) {
-        log.debug("REST request to delete <%= entityClass %> : {}", id);
+        LOG.debug("REST request to delete <%= entityClass %> : {}", id);
 <%- include('../../_partials_entity_/delete_template', {viaService: viaService, fromResource: true}); -%>
   <%_ if (reactive) { _%>
     <%_ if (databaseTypeCouchbase) { _%>