From 7edae787bdb4da6938b04158e8c04a896d319231 Mon Sep 17 00:00:00 2001 From: Yuvaraj Sanjeevi Date: Mon, 16 Aug 2021 11:15:27 +0530 Subject: [PATCH 1/5] No Database selection project generation issue fix Fix #15507 --- generators/generator-base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-base.js b/generators/generator-base.js index 81b5cf42d90..51dc717c90d 100644 --- a/generators/generator-base.js +++ b/generators/generator-base.js @@ -207,7 +207,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase { isUsingBuiltInUser() { return ( !this.jhipsterConfig || - !this.jhipsterConfig.skipUserManagement || + (!this.jhipsterConfig.skipUserManagement && this.jhipsterConfig.databaseType !== NO_DATABASE) || (this.jhipsterConfig.authenticationType === OAUTH2 && this.jhipsterConfig.databaseType !== NO_DATABASE) ); } From 4c14baee51a4ffce4aef989ad63270706a74f075 Mon Sep 17 00:00:00 2001 From: Yuvaraj Sanjeevi Date: Thu, 19 Aug 2021 12:11:14 +0530 Subject: [PATCH 2/5] No Database selection gateway compilation issue fix Fix #15507 --- generators/server/templates/build.gradle.ejs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index 99e7f0f5e69..ffb459535d9 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -542,6 +542,9 @@ dependencies { liquibaseRuntime "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>" <%_ } _%> implementation "org.mapstruct:mapstruct:${mapstructVersion}" + <%_ if (reactive) { _%> + implementation "org.springframework.data:spring-data-commons" + <%_ } _%> annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}" <%_ if (databaseType === 'sql') { _%> annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateVersion}" From 1b0ad48ce64205402b2d4aef279d8b1a1f5685da Mon Sep 17 00:00:00 2001 From: Yuvaraj Sanjeevi Date: Sun, 29 Aug 2021 23:51:01 +0530 Subject: [PATCH 3/5] Revert Spring Cloud data commons dependency as fixed in jhipster bom --- generators/server/templates/build.gradle.ejs | 3 --- 1 file changed, 3 deletions(-) diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index ffb459535d9..99e7f0f5e69 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.ejs @@ -542,9 +542,6 @@ dependencies { liquibaseRuntime "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>" <%_ } _%> implementation "org.mapstruct:mapstruct:${mapstructVersion}" - <%_ if (reactive) { _%> - implementation "org.springframework.data:spring-data-commons" - <%_ } _%> annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}" <%_ if (databaseType === 'sql') { _%> annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateVersion}" From 215339c3135edb720a65fd1d0fad544c87976e7a Mon Sep 17 00:00:00 2001 From: Yuvaraj Sanjeevi Date: Mon, 30 Aug 2021 01:24:56 +0530 Subject: [PATCH 4/5] No Database selection project compilation issue fix Fix #15507 --- .../src/main/java/package/config/WebConfigurer.java.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs b/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs index e89122ba677..5a011e6d5df 100644 --- a/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +++ b/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs @@ -49,7 +49,7 @@ import org.springframework.context.annotation.Profile; <%_ } _%> import org.springframework.core.annotation.Order; <%_ } _%> -<%_ if (reactive) { _%> +<%_ if (reactive && databaseType != 'no') { _%> import org.springframework.data.web.ReactivePageableHandlerMethodArgumentResolver; import org.springframework.data.web.ReactiveSortHandlerMethodArgumentResolver; <%_ } _%> @@ -205,6 +205,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia } <%_ if (reactive) { _%> + <%_ if (databaseType != 'no') { _%> // TODO: remove when this is supported in spring-boot @Bean HandlerMethodArgumentResolver reactivePageableHandlerMethodArgumentResolver() { @@ -216,6 +217,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia HandlerMethodArgumentResolver reactiveSortHandlerMethodArgumentResolver() { return new ReactiveSortHandlerMethodArgumentResolver(); } + <%_ } _%> @Bean @Order(-2) // The handler must have precedence over WebFluxResponseStatusExceptionHandler and Spring Boot's ErrorWebExceptionHandler From f9ca3445ff67ded020538b10be5d6b3c4900c97a Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sun, 29 Aug 2021 19:32:58 -0300 Subject: [PATCH 5/5] Adjusts --- .../src/main/java/package/config/WebConfigurer.java.ejs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs b/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs index 5a011e6d5df..a39659ee0d7 100644 --- a/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +++ b/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs @@ -49,7 +49,7 @@ import org.springframework.context.annotation.Profile; <%_ } _%> import org.springframework.core.annotation.Order; <%_ } _%> -<%_ if (reactive && databaseType != 'no') { _%> +<%_ if (reactive && !databaseTypeNo) { _%> import org.springframework.data.web.ReactivePageableHandlerMethodArgumentResolver; import org.springframework.data.web.ReactiveSortHandlerMethodArgumentResolver; <%_ } _%> @@ -205,7 +205,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia } <%_ if (reactive) { _%> - <%_ if (databaseType != 'no') { _%> + <%_ if (!databaseTypeNo) { _%> // TODO: remove when this is supported in spring-boot @Bean HandlerMethodArgumentResolver reactivePageableHandlerMethodArgumentResolver() { @@ -217,7 +217,7 @@ public class WebConfigurer implements <% if (!reactive) { %>ServletContextInitia HandlerMethodArgumentResolver reactiveSortHandlerMethodArgumentResolver() { return new ReactiveSortHandlerMethodArgumentResolver(); } - <%_ } _%> + <%_ } _%> @Bean @Order(-2) // The handler must have precedence over WebFluxResponseStatusExceptionHandler and Spring Boot's ErrorWebExceptionHandler