generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/{server → spring-boot}/templates/README.md.jhi.spring-boot.ejs

@@ -216,28 +216,6 @@ See Cypress' documentation for setting OS [environment variables](https://docs.c
 **Auth0 requires a user to provide authorization consent on the first login.** Consent flow is currently not handled in the Cypress test suite. To mitigate the issue, you can use a user account that has already granted consent to authorize application access via interactive login.
   <%_ } _%>
 <%_ } _%>
-
-<%_ if (enableSwaggerCodegen) { _%>
-### Doing API-First development using openapi-generator-cli
-
-[OpenAPI-Generator]() is configured for this application. You can generate API code from the `src/main/resources/swagger/api.yml` definition file by running:
-    <%_ if (buildToolMaven) { _%>
-```bash
-./mvnw generate-sources
-```
-    <%_ } _%>
-    <%_ if (buildToolGradle) { _%>
-```bash
-./gradlew openApiGenerate
-```
-    <%_ } _%>
-Then implements the generated delegate classes with `@Service` classes.
-
-To edit the `api.yml` definition file, you can use a tool such as [Swagger-Editor](). Start a local instance of the swagger-editor using docker by running: `docker compose -f src/main/docker/swagger-editor.yml up -d`. The editor will then be reachable at [http://localhost:7742](http://localhost:7742).
-
-Refer to [Doing API-First development][] for more details.
-<%_ } _%>
-
 <&_ } -&>
 
 <&_ if (fragment.testingSection) { -&>
@@ -397,11 +375,3 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
 To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
 
 <&_ } -&>
-
-<&_ if (fragment.referenceSection) { -&>
-  <%_ if (enableSwaggerCodegen) { _%>
-[OpenAPI-Generator]: https://openapi-generator.tech
-[Swagger-Editor]: https://editor.swagger.io
-[Doing API-First development]: <%= documentationArchiveUrl %>/doing-api-first-development/
-  <%_ } _%>
-<&_ } -&>

package/dist/generators/spring-boot/templates/_global_partials_entity_/save_template.ejs

@@ -33,5 +33,5 @@
 <%_ if (dtoMapstruct) { _%>
         <%- returnDirectly ? 'return' : `${dtoInstance} =` %> <%- entityInstance %>Mapper.toDto(<%- persistInstance %>);
 <%_ } else if (returnDirectly && searchEngineElasticsearch) { _%>
-        return <%- entityInstance %>;
+        return <%- persistInstance %>;
 <%_ } _%>

package/dist/generators/{server → spring-boot}/templates/build.gradle.ejs

@@ -22,9 +22,6 @@ plugins {
     id "idea"
     id "eclipse"
     id "com.gorylenko.gradle-git-properties"
-<%_ if (enableSwaggerCodegen) { _%>
-    id "org.openapi.generator"
-<%_ } _%>
     // jhipster-needle-gradle-plugins - JHipster will add additional gradle plugins here
 }
 
@@ -70,9 +67,6 @@ repositories {
 
 apply plugin: 'io.spring.dependency-management'
 
-<%_ if (enableSwaggerCodegen) { _%>
-apply from: "gradle/swagger.gradle"
-<%_ } _%>
 // jhipster-needle-gradle-apply-from - JHipster will add additional gradle scripts to be applied here
 
 if (project.hasProperty("prod")) {
@@ -186,9 +180,6 @@ dependencies {
 <%_ } _%>
     annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
     implementation "org.mapstruct:mapstruct:${mapstructVersion}"
-<%_ if (enableSwaggerCodegen) { _%>
-    implementation "org.openapitools:jackson-databind-nullable:${jacksonDatabindNullableVersion}"
-<%_ } _%>
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
     implementation "org.springframework.boot:spring-boot-loader-tools"
 <%_ /* This is useful for major Spring Boot migration */
@@ -255,6 +246,7 @@ if (addSpringMilestoneRepository) { _%>
     implementation "org.springframework.retry:spring-retry"
 <%_ } _%>
     testImplementation "org.springframework.security:spring-security-test"
+    // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 <%_ if (reactive) { _%>
     OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem();
     Architecture arch = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentArchitecture();
@@ -266,7 +258,6 @@ if (addSpringMilestoneRepository) { _%>
         }
     }
 <%_ } _%>
-    // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 }
 
 task cleanResources(type: Delete) {

package/dist/generators/{server → spring-boot}/templates/gradle/profile_dev.gradle.ejs

@@ -163,7 +163,7 @@ processResources {
     inputs.property('springProfiles', springProfiles)
     filesMatching("**/application.yml") {
         filter {
-            it.replace("#project.version#", version)
+            it.replace("@project.version@", version)
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {

package/dist/generators/{server → spring-boot}/templates/gradle/profile_prod.gradle.ejs

@@ -98,7 +98,7 @@ processResources {
     inputs.property('springProfiles', springProfiles)
     filesMatching("**/application.yml") {
         filter {
-            it.replace("#project.version#", version)
+            it.replace("@project.version@", version)
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {

package/dist/generators/{server → spring-boot}/templates/gradle.properties.ejs

@@ -22,18 +22,12 @@ profile=dev
 # Dependency versions
 mapstructVersion=<%- javaDependencies.mapstruct %>
 archunitJunit5Version=<%- javaDependencies['archunit-junit5'] %>
-<%_ if (enableSwaggerCodegen) { _%>
-jacksonDatabindNullableVersion=<%- javaDependencies['jackson-databind-nullable'] %>
-<%_ } _%>
 <%_ if (reactive) { _%>
 blockhoundJunitPlatformVersion=<%- javaDependencies['blockhound-junit-platform'] %>
 <%_ } _%>
 
 # gradle plugin version
 gitPropertiesPluginVersion=<%- javaDependencies['gradle-git-properties'] %>
-<%_ if (enableSwaggerCodegen) { _%>
-openapiPluginVersion=<%- javaDependencies['gradle-openapi-generator'] %>
-<%_ } _%>
 <%_ if (enableGradleEnterprise) { _%>
 gradleEnterprisePluginVersion=<%- javaDependencies['gradle-enterprise'] %>
 gradleCommonCustomUserDataPluginVersion=<%- javaDependencies['common-custom-user-data-gradle-plugin'] %>

package/dist/generators/{server → spring-boot}/templates/pom.xml.ejs

@@ -64,9 +64,6 @@
 <%_ } _%>
         <archunit-junit5.version><%- javaDependencies['archunit-junit5'] %></archunit-junit5.version>
         <mapstruct.version><%- javaDependencies.mapstruct %></mapstruct.version>
-<%_ if (enableSwaggerCodegen) { _%>
-        <jackson-databind-nullable.version><%- javaDependencies['jackson-databind-nullable'] %></jackson-databind-nullable.version>
-<%_ } _%>
         <git-commit-id-maven-plugin.version><%- javaDependencies['git-commit-id-maven-plugin'] %></git-commit-id-maven-plugin.version>
         <lifecycle-mapping.version><%- javaDependencies['lifecycle-mapping'] %></lifecycle-mapping.version>
         <maven-clean-plugin.version><%- javaDependencies['maven-clean-plugin'] %></maven-clean-plugin.version>
@@ -79,9 +76,6 @@
         <maven-site-plugin.version><%- javaDependencies['maven-site-plugin'] %></maven-site-plugin.version>
         <maven-surefire-plugin.version><%- javaDependencies['maven-surefire-plugin'] %></maven-surefire-plugin.version>
         <maven-war-plugin.version><%- javaDependencies['maven-war-plugin'] %></maven-war-plugin.version>
-<%_ if (enableSwaggerCodegen) { _%>
-        <openapi-generator-maven-plugin.version><%- javaDependencies['openapi-generator-maven-plugin'] %></openapi-generator-maven-plugin.version>
-<%_ } _%>
     </properties>
 
     <dependencies>
@@ -161,13 +155,6 @@
             <version>${mapstruct.version}</version>
             <scope>provided</scope>
         </dependency>
-<%_ if (enableSwaggerCodegen) { _%>
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>jackson-databind-nullable</artifactId>
-            <version>${jackson-databind-nullable.version}</version>
-        </dependency>
-<%_ } _%>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -350,16 +337,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-<%_ if (enableSwaggerCodegen) { _%>
-            <plugin>
-                <!--
-                    Plugin that provides API-first development using openapi-generator-cli to
-                    generate Spring-MVC endpoint stubs at compile time from an OpenAPI definition file
-                -->
-                <groupId>org.openapitools</groupId>
-                <artifactId>openapi-generator-maven-plugin</artifactId>
-            </plugin>
-<%_ } _%>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -490,32 +467,6 @@
                         </rules>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>${maven-resources-plugin.version}</version>
-                    <executions>
-                        <execution>
-                            <id>config-resources</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory><%= SERVER_MAIN_RES_DIR %></directory>
-                                        <filtering>true</filtering>
-                                        <includes>
-                                            <include>config/*.yml</include>
-                                        </includes>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -541,45 +492,18 @@
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>${maven-jar-plugin.version}</version>
                </plugin>
-<%_ if (enableSwaggerCodegen) { _%>
                 <plugin>
-                    <!--
-                        Plugin that provides API-first development using openapi-generator-cli to
-                        generate Spring-MVC endpoint stubs at compile time from an OpenAPI definition file
-                    -->
-                    <groupId>org.openapitools</groupId>
-                    <artifactId>openapi-generator-maven-plugin</artifactId>
-                    <version>${openapi-generator-maven-plugin.version}</version>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
                     <executions>
                         <execution>
+                            <id>build-info</id>
                             <goals>
-                                <goal>generate</goal>
+                                <goal>build-info</goal>
                             </goals>
-                            <configuration>
-                                <inputSpec>${project.basedir}/<%= SERVER_MAIN_RES_DIR %>swagger/api.yml</inputSpec>
-                                <generatorName>spring</generatorName>
-                                <apiPackage><%= packageName %>.web.api</apiPackage>
-                                <modelPackage><%= packageName %>.service.api.dto</modelPackage>
-                                <supportingFilesToGenerate>ApiUtil.java</supportingFilesToGenerate>
-                                <skipValidateSpec>false</skipValidateSpec>
-                                <configOptions>
-  <%_ if (reactive) { _%>
-                                    <reactive>true</reactive>
-  <%_ } _%>
-                                    <delegatePattern>true</delegatePattern>
-                                    <title><%= dasherizedBaseName %></title>
-                                    <useSpringBoot3>true</useSpringBoot3>
-                                </configOptions>
-                            </configuration>
                         </execution>
-                    </executions>
-                </plugin>
-<%_ } _%>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <executions>
                         <execution>
+                            <id>repackage</id>
                             <goals>
                                 <goal>repackage</goal>
                             </goals>
@@ -701,17 +625,6 @@
                             </filesets>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>build-info</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>io.github.git-commit-id</groupId>
                         <artifactId>git-commit-id-maven-plugin</artifactId>
@@ -861,22 +774,6 @@
             </properties>
             <build>
                 <finalName>e2e</finalName>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.springframework.boot</groupId>
-                            <artifactId>spring-boot-maven-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <id>repackage</id>
-                                    <goals>
-                                        <goal>repackage</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
             </build>
         </profile>
 <%_ } _%>

package/dist/generators/{server → spring-boot}/templates/settings.gradle.ejs

@@ -26,11 +26,18 @@ pluginManagement {
 <%_ } _%>
         // 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 (enableSwaggerCodegen) { _%>
-        id "org.openapi.generator" version "${openapiPluginVersion}"
-<%_ } _%>
 <%_ if (enableGradleEnterprise) { _%>
         id "com.gradle.enterprise" version "${gradleEnterprisePluginVersion}"
         id "com.gradle.common-custom-user-data-gradle-plugin" version "${gradleCommonCustomUserDataPluginVersion}"

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

@@ -46,7 +46,7 @@ import java.util.Optional;
 @EnableConfigurationProperties({<% if (databaseMigrationLiquibase) { %>LiquibaseProperties.class, <% } %>ApplicationProperties.class})
 public class <%= mainClass %> {
 
-    private static final Logger log = LoggerFactory.getLogger(<%= mainClass %>.class);
+    private static final Logger LOG = LoggerFactory.getLogger(<%= mainClass %>.class);
 
     private final Environment env;
 
@@ -64,13 +64,21 @@ public class <%= mainClass %> {
     @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_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.");
+        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."
+            );
         }
     }
 
@@ -90,23 +98,25 @@ public class <%= mainClass %> {
         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 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.warn("The host name could not be determined, using `localhost` as fallback");
         }
-        log.info(
+        LOG.info(
             CRLFLogConverter.CRLF_SAFE_MARKER,
             """
 
-                ----------------------------------------------------------
-                \tApplication '{}' is running! Access URLs:
-                \tLocal: \t\t{}://localhost:{}{}
-                \tExternal: \t{}://{}:{}{}
-                \tProfile(s): \t{}
-                ----------------------------------------------------------""",
+            ----------------------------------------------------------
+            \tApplication '{}' is running! Access URLs:
+            \tLocal: \t\t{}://localhost:{}{}
+            \tExternal: \t{}://{}:{}{}
+            \tProfile(s): \t{}
+            ----------------------------------------------------------""",
             applicationName,
             protocol,
             serverPort,
@@ -123,7 +133,7 @@ public class <%= mainClass %> {
         if (configServerStatus == null) {
             configServerStatus = "Not found or not setup for this application";
         }
-        log.info(
+        LOG.info(
             CRLFLogConverter.CRLF_SAFE_MARKER,
             "\n----------------------------------------------------------\n\t" +
             "Config Server: \t{}\n----------------------------------------------------------",

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 {