generator-jhipster 8.6.0 → 8.7.1

package/dist/generators/spring-boot/templates/settings.gradle.ejs

@@ -0,0 +1,73 @@
+<%#
+ Copyright 2013-2024 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+
+pluginManagement {
+    repositories {
+<%_ if (addSpringMilestoneRepository) { _%>
+        mavenCentral()
+        maven { url 'https://repo.spring.io/milestone' }
+        gradlePluginPortal()
+<%_ } _%>
+        // jhipster-needle-gradle-plugin-management-repositories - JHipster will add additional entries here
+    }
+<%_ if (databaseMigrationLiquibase) { _%>
+    buildscript {
+        repositories {
+            mavenCentral()
+        }
+        dependencies {
+            classpath group: 'org.liquibase', name: 'liquibase-core', version: "${liquibaseCoreVersion}"
+        }
+    }
+<%_ } _%>
+    plugins {
+        id 'com.gorylenko.gradle-git-properties' version "${gitPropertiesPluginVersion}"
+<%_ if (enableGradleEnterprise) { _%>
+        id "com.gradle.enterprise" version "${gradleEnterprisePluginVersion}"
+        id "com.gradle.common-custom-user-data-gradle-plugin" version "${gradleCommonCustomUserDataPluginVersion}"
+<%_ } _%>
+        // jhipster-needle-gradle-plugin-management-plugins - JHipster will add additional entries here
+    }
+}
+
+<%_ if (enableGradleEnterprise) { _%>
+plugins {
+    id 'com.gradle.enterprise'
+    id 'com.gradle.common-custom-user-data-gradle-plugin'
+}
+
+gradleEnterprise {
+    server = "<%= gradleEnterpriseHost %>"
+    buildScan {
+        captureTaskInputFiles = true
+        uploadInBackground = System.getenv("CI") == null // adjust to your CI provider
+        publishAlways()
+    }
+}
+
+buildCache {
+    local { enabled = true }
+    remote(HttpBuildCache) {
+        push = true
+        enabled = false // Disabled as this might not always desired
+        url = '<%= gradleEnterpriseHost %>/cache/' // note the trailing slash!
+    }
+}
+<%_ } _%>
+rootProject.name = "<%= dasherizedBaseName %>"

package/dist/generators/spring-boot/templates/src/main/java/_package_/Application.java.ejs

@@ -0,0 +1,144 @@
+<%#
+ Copyright 2013-2024 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>;
+
+import <%= packageName %>.config.ApplicationProperties;
+import <%= packageName %>.config.CRLFLogConverter;
+
+import tech.jhipster.config.DefaultProfileUtil;
+import tech.jhipster.config.JHipsterConstants;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+<%_ if (databaseMigrationLiquibase) { _%>
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
+<%_ } _%>
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.core.env.Environment;
+
+import jakarta.annotation.PostConstruct;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+
+@SpringBootApplication
+@EnableConfigurationProperties({<% if (databaseMigrationLiquibase) { %>LiquibaseProperties.class, <% } %>ApplicationProperties.class})
+public class <%= mainClass %> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(<%= mainClass %>.class);
+
+    private final Environment env;
+
+    public <%= mainClass %>(Environment env) {
+        this.env = env;
+    }
+
+    /**
+     * Initializes <%= baseName %>.
+     * <p>
+     * Spring profiles can be configured with a program argument --spring.profiles.active=your-active-profile
+     * <p>
+     * You can find more information on how profiles work with JHipster on <a href="https://www.jhipster.tech/profiles/">https://www.jhipster.tech/profiles/</a>.
+     */
+    @PostConstruct
+    public void initApplication() {
+        Collection<String> activeProfiles = Arrays.asList(env.getActiveProfiles());
+        if (
+            activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) &&
+            activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)
+        ) {
+            LOG.error(
+                "You have misconfigured your application! It should not run " + "with both the 'dev' and 'prod' profiles at the same time."
+            );
+        }
+        if (
+            activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) &&
+            activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_CLOUD)
+        ) {
+            LOG.error(
+                "You have misconfigured your application! It should not " + "run with both the 'dev' and 'cloud' profiles at the same time."
+            );
+        }
+    }
+
+    /**
+     * Main method, used to run the application.
+     *
+     * @param args the command line arguments.
+     */
+    public static void main(String[] args) {
+        SpringApplication app = new SpringApplication(<%= mainClass %>.class);
+        DefaultProfileUtil.addDefaultProfile(app);
+        Environment env = app.run(args).getEnvironment();
+        logApplicationStartup(env);
+    }
+
+    private static void logApplicationStartup(Environment env) {
+        String protocol = Optional.ofNullable(env.getProperty("server.ssl.key-store")).map(key -> "https").orElse("http");
+        String applicationName = env.getProperty("spring.application.name");
+        String serverPort = env.getProperty("server.port");
+        String contextPath = Optional.ofNullable(env.getProperty("server.servlet.context-path"))
+            .filter(StringUtils::isNotBlank)
+            .orElse("/");
+        String hostAddress = "localhost";
+        try {
+            hostAddress = InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            LOG.warn("The host name could not be determined, using `localhost` as fallback");
+        }
+        LOG.info(
+            CRLFLogConverter.CRLF_SAFE_MARKER,
+            """
+
+            ----------------------------------------------------------
+            \tApplication '{}' is running! Access URLs:
+            \tLocal: \t\t{}://localhost:{}{}
+            \tExternal: \t{}://{}:{}{}
+            \tProfile(s): \t{}
+            ----------------------------------------------------------""",
+            applicationName,
+            protocol,
+            serverPort,
+            contextPath,
+            protocol,
+            hostAddress,
+            serverPort,
+            contextPath,
+            env.getActiveProfiles().length == 0 ? env.getDefaultProfiles() : env.getActiveProfiles()
+        );
+<%_ if (serviceDiscoveryAny && (applicationTypeMicroservice || applicationTypeGateway)) { _%>
+
+        String configServerStatus = env.getProperty("configserver.status");
+        if (configServerStatus == null) {
+            configServerStatus = "Not found or not setup for this application";
+        }
+        LOG.info(
+            CRLFLogConverter.CRLF_SAFE_MARKER,
+            "\n----------------------------------------------------------\n\t" +
+            "Config Server: \t{}\n----------------------------------------------------------",
+            configServerStatus
+        );
+<%_ } _%>
+    }
+}

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs

@@ -33,7 +33,7 @@ if (!paginationNo) {
 for (const relationship of relationships) {
   if (relationship.relationshipOneToOne && !relationship.ownerSide) { %>
         if ("<%= relationship.relationshipName.toLowerCase() %>-is-null".equals(filter)) {
-            log.debug("REST request to get all <%= entityClass %>s where <%= relationship.relationshipName %> is null");
+            LOG.debug("REST request to get all <%= entityClass %>s where <%= relationship.relationshipName %> is null");
     <%_ if (viaService) { _%>
             return <%- toResponseEntityPrefix %><%= entityInstance %>Service.findAllWhere<%= relationship.relationshipNameCapitalized %>IsNull()<% if (reactiveSql) { %>.collectList()<% } %><%= toResponseEntityPostfix %>;
     <%_ } else { _%>

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs

@@ -28,7 +28,7 @@
 _%>
 <%_ if (jpaMetamodelFiltering) { _%>
     public <% if (reactiveNoPagination) { %>Flux<<%= instanceType %>><% } else if (reactivePagination) { %>Mono<ResponseEntity<List<<%= instanceType %>>>><% } else { %>ResponseEntity<List<<%= instanceType %>>><% } %> getAll<%= entityClassPlural %>(<%= entityClass %>Criteria criteria<% if (!paginationNo) { %>, @org.springdoc.core.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% } %>) {
-        log.debug("REST request to get <%= entityClassPlural %> by criteria: {}", criteria);
+        LOG.debug("REST request to get <%= entityClassPlural %> by criteria: {}", criteria);
   <% if(!reactive) { %>
     <%_ if (paginationNo) { _%>
         List<<%= instanceType %>> entityList = <%= entityInstance %>QueryService.findByCriteria(criteria);
@@ -65,10 +65,10 @@ _%>
     @GetMapping("/count")
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<Long><% if (reactive) { %>><% } %> count<%= entityClassPlural %>(<%= entityClass %>Criteria criteria) {
     <% if (!reactive) { %>
-        log.debug("REST request to count <%= entityClassPlural %> by criteria: {}", criteria);
+        LOG.debug("REST request to count <%= entityClassPlural %> by criteria: {}", criteria);
         return ResponseEntity.ok().body(<%= entityInstance %>QueryService.countByCriteria(criteria));
     <% } else { %>
-        log.debug("REST request to count <%= entityClassPlural %> by criteria: {}", criteria);
+        LOG.debug("REST request to count <%= entityClassPlural %> by criteria: {}", criteria);
         return <%= entityInstance %>Service.countByCriteria(criteria)
                 .map(count -> ResponseEntity.status(HttpStatus.OK).body(count));
     <% } %>
@@ -76,7 +76,7 @@ _%>
 <%_ } else { _%>
   <%_ if (paginationNo) { _%>
     public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> getAll<%= entityClassPlural %>(<% if (fieldsContainNoOwnerOneToOne) { %>@RequestParam(name = "filter", required = false) String filter<% } %><% if (implementsEagerLoadApis && fieldsContainNoOwnerOneToOne) { %>,<% } %><% if (implementsEagerLoadApis) { %>@RequestParam(name = "eagerload", required = false, defaultValue = "true") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
-        log.debug("REST request to get all <%= entityClassPlural %>");
+        LOG.debug("REST request to get all <%= entityClassPlural %>");
     <%_ if (viaService) { _%>
         return <%= entityInstance %>Service.findAll()<% if (reactive) { %>.collectList()<% } %>;
     <%_ } else if (dtoMapstruct) { _%>
@@ -97,7 +97,7 @@ _%>
     <%_ } _%>
   <%_ } else { _%>
     public <% if (reactive) { %>Mono<ResponseEntity<List<<%= instanceType %>>>><% } else { %>ResponseEntity<List<<%= instanceType %>>><% } %> getAll<%= entityClassPlural %>(@org.springdoc.core.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% if (fieldsContainNoOwnerOneToOne) { %>, @RequestParam(name = "filter", required = false) String filter<% } %><% if (implementsEagerLoadApis) { %>, @RequestParam(name = "eagerload", required = false, defaultValue = "true") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
-        log.debug("REST request to get a page of <%= entityClassPlural %>");
+        LOG.debug("REST request to get a page of <%= entityClassPlural %>");
     <%_ if (reactive) { _%>
         return <%= entityInstance %><%= viaService ? 'Service.countAll' : 'Repository.count' %>().zipWith(<%= entityInstance %><%= viaService ? 'Service.findAll' : 'Repository.findAllBy' %>(pageable)<%= reactiveEntityToDto %>.collectList())
                 .map(countWithEntities ->

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs

@@ -30,7 +30,7 @@ for (const relationship of relationships) { if (relationship.relationshipOneToOn
   <%_ if (databaseTypeSql) { _%>
     @Transactional(readOnly = true) <% } %>
     public <%= reactiveSql ? 'Flux' : 'List' %><<%= instanceType %>> findAllWhere<%= relationship.relationshipNameCapitalized %>IsNull() {
-        log.debug("Request to get all <%= entityInstancePlural %> where <%= relationship.relationshipNameCapitalized %> is null");
+        LOG.debug("Request to get all <%= entityInstancePlural %> where <%= relationship.relationshipNameCapitalized %> is null");
     <%_ if (reactiveSql) { _%>
         return <%= entityInstance %>Repository.findAllWhere<%= relationship.relationshipNameCapitalized %>IsNull()<%_ if (dtoMapstruct) { _%>
              .map(<%= entityToDtoReference %>)<%_ } _%>;

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs

@@ -25,10 +25,10 @@
   const entityListToDtoListReference = mapper + '.' + 'toDto';
 if (paginationNo) { %>
     public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam("query") String query) {
-        log.debug("REST request to search <%= entityClassPlural %> for query {}", query);<%- include('search_stream_template', {viaService: viaService, fromResource: true}); -%>
+        LOG.debug("REST request to search <%= entityClassPlural %> for query {}", query);<%- include('search_stream_template', {viaService: viaService, fromResource: true}); -%>
 <% } else { %>
     public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= listOrFlux %><<%= instanceType %>>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam("query") String query, @org.springdoc.core.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %>) {
-        log.debug("REST request to search for a page of <%= entityClassPlural %> for query {}", query);
+        LOG.debug("REST request to search for a page of <%= entityClassPlural %> for query {}", query);
   <%_ if (reactive) { _%>
         return <%= entityInstance %><%= viaService ?
                 'Service.' + (searchEngineElasticsearch ? 'searchCount' : 'countAll') :

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs

@@ -368,7 +368,9 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal {
     @Override
     public Flux<<%= user.persistClass %>> findAllWithAuthorities(Pageable pageable) {
         String property = pageable.getSort().stream().map(Sort.Order::getProperty).findFirst().orElse("id");
-        String direction = String.valueOf(pageable.getSort().stream().map(Sort.Order::getDirection).findFirst().orElse(Sort.DEFAULT_DIRECTION));
+        String direction = String.valueOf(
+            pageable.getSort().stream().map(Sort.Order::getDirection).findFirst().orElse(Sort.DEFAULT_DIRECTION)
+        );
         long page = pageable.getPageNumber();
         long size = pageable.getPageSize();
 
@@ -381,7 +383,11 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal {
             .all()
             .groupBy(t -> t.getT1().getLogin())
             .flatMap(l -> l.collectList().map(t -> updateUserWithAuthorities(t.get(0).getT1(), t)))
-            .sort(Sort.Direction.fromString(direction) == Sort.DEFAULT_DIRECTION ? new BeanComparator<>(property) : new BeanComparator<>(property).reversed())
+            .sort(
+                Sort.Direction.fromString(direction) == Sort.DEFAULT_DIRECTION
+                    ? new BeanComparator<>(property)
+                    : new BeanComparator<>(property).reversed()
+            )
             .skip(page * size)
             .take(size);
     }
@@ -424,20 +430,17 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal {
             tuples
                 .stream()
                 .filter(t -> t.getT2().isPresent())
-                .map(
-                    t -> {
-                        Authority authority = new Authority();
-                        authority.setName(t.getT2().orElseThrow());
-                        return authority;
-                    }
-                )
+                .map(t -> {
+                    Authority authority = new Authority();
+                    authority.setName(t.getT2().orElseThrow());
+                    return authority;
+                })
                 .collect(Collectors.toSet())
         );
 
         return user;
     }
 }
-
 <%_ } else if (databaseTypeCassandra) { _%>
 @Repository
 public class UserRepository {

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 static 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 static 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);
     }