generator-jhipster 7.1.0 → 7.4.0

package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs

@@ -35,13 +35,13 @@ logging:
   level:
     ROOT: INFO
     tech.jhipster: INFO
-    <%_ if (packageName !== 'tech.jhipster') { _%>
+<%_ if (packageName !== 'tech.jhipster') { _%>
     <%= packageName %>: INFO
-    <%_ } _%>
-    <%_ if (databaseType === 'neo4j') { _%>
+<%_ } _%>
+<%_ if (databaseTypeNeo4j) { _%>
     org.neo4j.driver: WARN
-    <%_ } _%>
-<%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
 
 eureka:
   instance:
@@ -51,7 +51,7 @@ eureka:
       defaultZone: http://admin:${jhipster.registry.password}@localhost:8761/eureka/
 <%_ } _%>
 
-<%_ if (databaseType === 'neo4j') { _%>
+<%_ if (databaseTypeNeo4j) { _%>
 org:
   neo4j:
     driver:
@@ -74,7 +74,7 @@ spring:
       enabled: false
     livereload:
       enabled: false
-  <%_ if (databaseType === 'neo4j') { _%>
+<%_ if (databaseTypeNeo4j) { _%>
   neo4j:
     pool:
       metrics-enabled: true
@@ -83,8 +83,8 @@ spring:
     # authentication:
     #   username: neo4j
     #   password: secret
-  <%_ } _%>
-  <%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
   cloud:
     config:
       retry:
@@ -97,130 +97,125 @@ spring:
       profile: prod
       label: main # toggle to switch to a different version of the configuration as stored in git
       # it can be set to any label, branch or commit of the configuration source Git repository
-  <%_ } _%>
-  <%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryConsul) { _%>
   cloud:
     consul:
       discovery:
         prefer-ip-address: true
       host: localhost
       port: 8500
-  <%_ } _%>
-  <%_ if (databaseType === 'sql' && !reactive) { _%>
+<%_ } _%>
+<%_ if (databaseTypeSql && !reactive) { _%>
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    <%_ if (prodDatabaseType === 'mysql' || prodDatabaseType === 'mariadb') { _%>
+  <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
     url: <%- getJDBCUrl(prodDatabaseType, { databaseName: baseName, hostname: 'localhost' }) %>
     username: root
     password:
-    <%_ } else if (prodDatabaseType === 'postgresql') { _%>
+  <%_ } else if (prodDatabaseTypePostgres) { _%>
     url: <%- getJDBCUrl(prodDatabaseType, { databaseName: baseName, hostname: 'localhost' }) %>
     username: <%= baseName %>
     password:
-    <%_ } else if (prodDatabaseType === 'mssql') { _%>
+  <%_ } else if (prodDatabaseTypeMssql) { _%>
     url: <%- getJDBCUrl(prodDatabaseType, { databaseName: baseName, hostname: 'localhost' }) %>
     username: SA
     password: yourStrong(!)Password
-    <%_ } else if (prodDatabaseType === 'oracle') { _%>
+  <%_ } else if (prodDatabaseTypeOracle) { _%>
     url: <%- getJDBCUrl(prodDatabaseType, { databaseName: 'xe', hostname: 'localhost' }) %>
     username: system
     password: oracle
-    <%_ } _%>
+  <%_ } _%>
     hikari:
       poolName: Hikari
       auto-commit: false
-    <%_ if (prodDatabaseType === 'mysql' || prodDatabaseType === 'mariadb' || prodDatabaseType === 'mssql') { _%>
+  <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb || prodDatabaseTypeMssql) { _%>
       data-source-properties:
         cachePrepStmts: true
         prepStmtCacheSize: 250
         prepStmtCacheSqlLimit: 2048
         useServerPrepStmts: true
-    <%_ } _%>
+  <%_ } _%>
   jpa:
-    <%_ if (prodDatabaseType === 'postgresql') { _%>
+  <%_ if (prodDatabaseTypePostgres) { _%>
     database-platform: tech.jhipster.domain.util.FixedPostgreSQL10Dialect
-    <%_ } _%>
   <%_ } _%>
-  <%_ if (databaseType === 'mongodb' || databaseType === 'cassandra' || (searchEngine === 'elasticsearch' && reactive)) { _%>
+<%_ } _%>
+<%_ if (databaseTypeMongodb || databaseTypeCassandra || (searchEngineElasticsearch && reactive)) { _%>
   data:
-  <%_ } _%>
-  <%_ if (databaseType === 'mongodb') { _%>
+<%_ } _%>
+<%_ if (databaseTypeMongodb) { _%>
     mongodb:
       uri: mongodb://localhost:27017<% if (reactive) { %>/?waitQueueMultiple=1000<% } %>
       database: <%= baseName %>
-  <%_ } _%>
-  <%_ if (databaseType === 'cassandra') { _%>
+<%_ } _%>
+<%_ if (databaseTypeCassandra) { _%>
     cassandra:
       contact-points: localhost
       compression: LZ4
       keyspace-name: <%= baseName %>
       local-datacenter: datacenter1
-  <%_ } _%>
-  <%_ if (searchEngine === 'elasticsearch') { _%>
-    <%_ if (reactive) { _%>
+<%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+  <%_ if (reactive) { _%>
     elasticsearch:
       client:
         reactive:
           endpoints: localhost:9200
-    <%_ } else { _%>
+  <%_ } else { _%>
   elasticsearch:
     rest:
       uris: http://localhost:9200
-    <%_ } _%>
   <%_ } _%>
-  <%_ if (databaseType === 'couchbase') { _%>
+<%_ } _%>
+<%_ if (databaseTypeCouchbase) { _%>
   couchbase:
-    bootstrap-hosts: localhost
-    bucket:
-      name: <%= baseName %>
-      password: password
-  <%_ } _%>
-  <%_ if (databaseType === 'sql') { _%>
+    connection-string: couchbase://localhost
+    username: Administrator
+    password: password
+<%_ } _%>
+<%_ if (databaseTypeSql) { _%>
   # Replace by 'prod, faker' to add the faker context and have sample data loaded in production
   liquibase:
     contexts: prod
-    <%_ if (reactive) { _%>
-      <%_ if (['mysql', 'mariadb', 'postgresql', 'mssql'].includes(prodDatabaseType)) { _%>
+  <%_ if (reactive) { _%>
+    <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb || prodDatabaseTypePostgres || prodDatabaseTypeMssql) { _%>
     url: <%- getJDBCUrl(prodDatabaseType, { databaseName: baseName, hostname: 'localhost' }) %>
-      <%_ } else if (prodDatabaseType === 'oracle') { _%>
+    <%_ } else if (prodDatabaseTypeOracle) { _%>
     url: <%- getJDBCUrl(prodDatabaseType, { databaseName: 'xe', hostname: 'localhost' }) %>
-      <%_ } _%>
     <%_ } _%>
   <%_ } _%>
-  <%_ if (!skipUserManagement) { _%>
+<%_ } _%>
+<%_ if (!skipUserManagement) { _%>
   mail:
     host: localhost
     port: 25
     username:
     password:
-  <%_ } _%>
-  <%_ if (databaseType === 'sql' && reactive) { _%>
+<%_ } _%>
+<%_ if (databaseTypeSql && reactive) { _%>
   r2dbc:
-    <%_ if (prodDatabaseType === 'mysql') { _%>
+  <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
     url: <%- getR2DBCUrl(prodDatabaseType, { databaseName: baseName, hostname: 'localhost' }) %>
     username: root
     password:
-    <%_ } else if (prodDatabaseType === 'mariadb') { _%>
-    url: <%- getR2DBCUrl(prodDatabaseType, { databaseName: baseName, hostname: 'localhost' }) %>
-    username: root
-    password:
-    <%_ } else if (prodDatabaseType === 'postgresql') { _%>
+  <%_ } else if (prodDatabaseTypePostgres) { _%>
     url: <%- getR2DBCUrl(prodDatabaseType, { databaseName: baseName, hostname: 'localhost' }) %>
     username: <%= baseName %>
     password:
-    <%_ } else if (prodDatabaseType === 'mssql') { _%>
+  <%_ } else if (prodDatabaseTypeMssql) { _%>
     url: <%- getR2DBCUrl(prodDatabaseType, { databaseName: baseName, hostname: 'localhost' }) %>
     username: SA
     password: yourStrong(!)Password
-    <%_ } else if (prodDatabaseType === 'oracle') { _%>
+  <%_ } else if (prodDatabaseTypeOracle) { _%>
     url: <%- getR2DBCUrl(prodDatabaseType, { databaseName: 'xe', hostname: 'localhost' }) %>
     username: system
     password: oracle
-    <%_ } _%>
   <%_ } _%>
+<%_ } _%>
   thymeleaf:
     cache: true
-<%_ if (serviceDiscoveryType || applicationType === 'gateway' || applicationType === 'microservice') { _%>
+<%_ if (serviceDiscoveryType || applicationTypeGateway || applicationTypeMicroservice) { _%>
   sleuth:
     sampler:
       probability: 1 # report 100% of traces
@@ -256,7 +251,7 @@ server:
   shutdown: graceful # see https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-graceful-shutdown
   compression:
     enabled: true
-    mime-types: text/html,text/xml,text/plain,text/css, application/javascript, application/json
+    mime-types: text/html,text/xml,text/plain,text/css,application/javascript,application/json,image/svg+xml
     min-response-size: 1024
 
 # ===================================================================
@@ -266,36 +261,41 @@ server:
 # ===================================================================
 
 jhipster:
-  <%_ if (applicationType === 'gateway' && cacheProvider === 'hazelcast' && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && cacheProviderHazelcast && serviceDiscoveryType) { _%>
   gateway:
     rate-limiting:
       enabled: false
-    <%_ if (!reactive) { _%>
+  <%_ if (!reactive) { _%>
     authorized-microservices-endpoints: # Access Control Policy, if left empty for a route, all endpoints will be accessible
       app1: /api # recommended prod configuration
-    <%_ } _%>
   <%_ } _%>
+<%_ } _%>
   http:
     cache: # Used by the CachingHttpHeadersFilter
       timeToLiveInDays: 1461
-  <%_ if (cacheProvider !== 'no') { _%>
+<%_ if (databaseTypeCouchbase) { _%>
+  database:
+    couchbase:
+      bucket-name: <%= baseName %>
+<%_ } _%>
+<%_ if (!cacheProviderNo) { _%>
   cache: # Cache configuration
-    <%_ if (cacheProvider === 'hazelcast') { _%>
+  <%_ if (cacheProviderHazelcast) { _%>
     hazelcast: # Hazelcast distributed cache
       time-to-live-seconds: 3600
       backup-count: 1
-    <%_ } _%>
-    <%_ if (cacheProvider === 'ehcache') { _%>
+  <%_ } _%>
+  <%_ if (cacheProviderEhCache) { _%>
     ehcache: # Ehcache configuration
       time-to-live-seconds: 3600 # By default objects stay 1 hour in the cache
       max-entries: 1000 # Number of objects in each cache entry
-    <%_ } _%>
-    <%_ if (cacheProvider === 'caffeine') { _%>
+  <%_ } _%>
+  <%_ if (cacheProviderCaffeine) { _%>
     caffeine: # Caffeine configuration
       time-to-live-seconds: 3600 # By default objects stay 1 hour in the cache. This sets expireAfterWrite in Caffeine (https://github.com/ben-manes/caffeine/wiki/Eviction#time-based)
       max-entries: 1000 # Number of objects in each cache entry
-    <%_ } _%>
-    <%_ if (cacheProvider === 'infinispan') { _%>
+  <%_ } _%>
+  <%_ if (cacheProviderInfinispan) { _%>
     infinispan:
       config-file: default-configs/default-jgroups-tcp.xml
       statsEnabled: true
@@ -312,28 +312,28 @@ jhipster:
       replicated:
         time-to-live-seconds: 3600 # By default objects stay 1 hour (in seconds) in the cache
         max-entries: 1000 # Number of objects in each cache entry
-    <%_ } _%>
-    <%_ if (cacheProvider === 'memcached') { _%>
+  <%_ } _%>
+  <%_ if (cacheProviderMemcached) { _%>
     memcached:
       enabled: true
       servers: localhost:11211
       expiration: 300
       use-binary-protocol: true
-    <%_ } _%>
-    <%_ if (cacheProvider === 'redis') { _%>
+  <%_ } _%>
+  <%_ if (cacheProviderRedis) { _%>
     redis: # Redis configuration
       expiration: 3600 # By default objects stay 1 hour (in seconds) in the cache
       server: redis://localhost:6379
       cluster: false
       # server: redis://localhost:6379,redis://localhost:16379,redis://localhost:26379
       # cluster: true
-    <%_ } _%>
   <%_ } _%>
-  <%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
   registry:
     password: admin
-  <%_ } _%>
-  <%_ if (authenticationType === 'jwt') { _%>
+<%_ } _%>
+<%_ if (authenticationTypeJwt) { _%>
   security:
     authentication:
       jwt:
@@ -346,8 +346,8 @@ jhipster:
         # Token is valid 24 hours
         token-validity-in-seconds: 86400
         token-validity-in-seconds-for-remember-me: 2592000
-  <%_ } _%>
-<%_ if (authenticationType === 'session' && !reactive) { _%>
+<%_ } _%>
+<%_ if (authenticationTypeSession && !reactive) { _%>
   security:
     remember-me:
       # security key (this key should be unique for your application, and kept secret)

package/generators/server/templates/src/main/resources/config/application-tls.yml.ejs

@@ -31,7 +31,7 @@ server:
     key-store-password: password
     key-store-type: PKCS12
     key-alias: selfsigned
-    ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, TLS_DHE_RSA_WITH_AES_128_CBC_SHA, TLS_DHE_RSA_WITH_AES_256_CBC_SHA, TLS_DHE_RSA_WITH_AES_128_CBC_SHA256, TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
+    ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
     enabled-protocols: TLSv1.2
   http2:
     enabled: true

package/generators/server/templates/src/main/resources/config/application.yml.ejs

@@ -32,7 +32,7 @@
 # http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
 # ===================================================================
 
-<%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ if (serviceDiscoveryEureka) { _%>
 eureka:
   client:
     enabled: true
@@ -58,47 +58,34 @@ eureka:
       git-branch: ${git.branch:}
       context-path: ${server.servlet.context-path:}
 <%_ } _%>
-<%_ if (applicationType === 'gateway') { _%>
-
-# See https://github.com/Netflix/Hystrix/wiki/Configuration
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 10000
-
+<%_ if (applicationTypeGateway || (applicationTypeMicroservice && reactive)) { _%>
+reactive:
+  feign:
+    circuit:
+      breaker:
+        enabled: true
+  # client:
+  #   config:
+  #     default:
+  #       connectTimeout: 5000
+  #       readTimeout: 5000
 <%_ } _%>
-<%_ if (applicationType === 'microservice') { _%>
+<%_ if (applicationTypeMicroservice && !reactive) { _%>
 feign:
-  hystrix:
+  circuitbreaker:
     enabled: true
   # client:
   #   config:
   #     default:
   #       connectTimeout: 5000
   #       readTimeout: 5000
-
-# See https://github.com/Netflix/Hystrix/wiki/Configuration
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          strategy: SEMAPHORE
-          # See https://github.com/spring-cloud/spring-cloud-netflix/issues/1330
-          # thread:
-          #   timeoutInMilliseconds: 10000
-  shareSecurityContext: true
-
 <%_ } _%>
 management:
   endpoints:
     web:
       base-path: /management
       exposure:
-        include: ["configprops", "env", <% if (applicationType === 'gateway' && reactive) { %>"gateway", <% } %>"health", "info", "jhimetrics", "logfile", "loggers", "prometheus", "threaddump"<% if (cacheManagerIsAvailable === true) { %>, "caches"<% } %><% if (databaseType === 'sql') { %>, "liquibase"<% } %>]
+        include: ["configprops", "env", <% if (applicationTypeGateway && reactive) { %>"gateway", <% } %>"health", "info", "jhimetrics", "logfile", "loggers", "prometheus", "threaddump"<% if (cacheManagerIsAvailable) { %>, "caches"<% } %><% if (databaseTypeSql) { %>, "liquibase"<% } %>]
   endpoint:
     health:
       show-details: when_authorized
@@ -115,7 +102,7 @@ management:
       liveness:
         include: livenessState
       readiness:
-        include: readinessState<% if (databaseType === 'sql') { %>,datasource<% } %>
+        include: readinessState<% if (databaseTypeSql) { %>,db<% } %>
     mail:
       enabled: false # When using the MailService, configure an SMTP server and set this to true
   metrics:
@@ -143,22 +130,22 @@ management:
           autotime:
             enabled: true
 
-<%_ if (databaseType === 'mongodb') { _%>
+<%_ if (databaseTypeMongodb) { _%>
 mongock:
   change-logs-scan-package:
     - <%= packageName %>.config.dbmigrations
 
 <%_ } _%>
 spring:
-  <%_ if (databaseType === 'sql' && messageBroker === 'kafka') { _%>
+<%_ if (databaseTypeSql && messageBrokerKafka) { _%>
   autoconfigure:
     exclude: org.springframework.boot.actuate.autoconfigure.metrics.jdbc.DataSourcePoolMetricsAutoConfiguration
-  <%_ } _%>
+<%_ } _%>
   application:
     name: <%= baseName %>
-  <%_ if (serviceDiscoveryType === 'consul' || (applicationType === 'gateway' && reactive)) { _%>
+<%_ if (serviceDiscoveryConsul || (applicationTypeGateway && reactive)) { _%>
   cloud:
-    <%_ if (serviceDiscoveryType === 'consul') { _%>
+  <%_ if (serviceDiscoveryConsul) { _%>
     consul:
       discovery:
         healthCheckPath: /management/health
@@ -167,11 +154,11 @@ spring:
       config:
         watch:
           enabled: false
-    <%_ } _%>
-    <%_ if (applicationType === 'gateway' && reactive) { _%>
+  <%_ } _%>
+  <%_ if (applicationTypeGateway && reactive) { _%>
     gateway:
       default-filters:
-        - <% if (authenticationType === 'jwt') { %>JWTRelay<% } else { %>TokenRelay<% } %>
+        - <% if (authenticationTypeJwt) { %>JWTRelay<% } else { %>TokenRelay<% } %>
       discovery:
         locator:
           enabled: true
@@ -188,8 +175,8 @@ spring:
       httpclient:
         pool:
           max-connections: 1000
-    <%_ } _%>
   <%_ } _%>
+<%_ } _%>
   profiles:
     # The commented value for `active` can be replaced with valid Spring profiles to load.
     # Otherwise, it will be filled in by <%= buildTool %> when building the JAR file
@@ -203,7 +190,7 @@ spring:
         #- tls
   jmx:
     enabled: false
-  <%_ if (databaseType === 'sql' && !reactive) { _%>
+<%_ if (databaseTypeSql && !reactive) { _%>
   data:
     jpa:
       repositories:
@@ -221,38 +208,38 @@ spring:
       hibernate.jdbc.batch_size: 25
       hibernate.order_inserts: true
       hibernate.order_updates: true
-      <%_ if (prodDatabaseType === 'mssql' || prodDatabaseType === 'oracle') { _%>
+  <%_ if (prodDatabaseTypeMssql || prodDatabaseTypeOracle) { _%>
       # modify fetch size as necessary
       hibernate.jdbc.fetch_size: 150
       hibernate.criteria.literal_handling_mode: BIND
-      <%_ } _%>
+  <%_ } _%>
       hibernate.query.fail_on_pagination_over_collection_fetch: true
       hibernate.query.in_clause_parameter_padding: true
-      <%_ if (enableHibernateCache) { _%>
-        <%_ if (cacheProvider === 'hazelcast') { _%>
+  <%_ if (enableHibernateCache) { _%>
+    <%_ if (cacheProviderHazelcast) { _%>
       hibernate.cache.region.factory_class: com.hazelcast.hibernate.HazelcastCacheRegionFactory
       hibernate.cache.use_minimal_puts: true
       hibernate.cache.hazelcast.instance_name: <%= baseName %>
       hibernate.cache.hazelcast.use_lite_member: true
-        <%_ } else if (cacheProvider === 'infinispan') { _%>
+    <%_ } else if (cacheProviderInfinispan) { _%>
       hibernate.cache.infinispan.statistics: false
       hibernate.cache.use_minimal_puts: true
       hibernate.cache.infinispan.entity.expiration.lifespan: 3600000
       hibernate.cache.infinispan.entity.memory.size: 1000
       hibernate.cache.infinispan.jgroups_cfg: default-configs/default-jgroups-tcp.xml
-        <%_ } _%>
-      <%_ } _%>
+    <%_ } _%>
+  <%_ } _%>
     hibernate:
       ddl-auto: none
       naming:
         physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
         implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
-  <%_ } _%>
+<%_ } _%>
   messages:
     basename: i18n/messages
   main:
     allow-bean-definition-overriding: true
-  <%_ if (skipUserManagement && ['monolith', 'gateway'].includes(applicationType) && authenticationType !== 'oauth2') { _%>
+<%_ if (skipUserManagement && (applicationTypeMonolith || applicationTypeGateway) && !authenticationTypeOauth2) { _%>
   security:
     user:
       name: admin
@@ -260,7 +247,7 @@ spring:
       roles:
         - ADMIN
         - USER
-  <%_ } _%>
+<%_ } _%>
   task:
     execution:
       thread-name-prefix: <%= dasherizedBaseName %>-task-
@@ -277,7 +264,7 @@ spring:
   output:
     ansi:
       console-available: true
-<%_ if (authenticationType === 'oauth2') { _%>
+<%_ if (authenticationTypeOauth2) { _%>
   security:
     oauth2:
       client:
@@ -286,13 +273,13 @@ spring:
             issuer-uri: http://localhost:9080/auth/realms/jhipster
         registration:
           oidc:
-          <%_ if (applicationType === 'microservice') { _%>
+  <%_ if (applicationTypeMicroservice) { _%>
             client-id: internal
             client-secret: internal
-          <%_ } else { _%>
+  <%_ } else { _%>
             client-id: web_app
             client-secret: web_app
-          <%_ } _%>
+  <%_ } _%>
             scope: openid,profile,email
 <%_ } _%>
 
@@ -333,8 +320,8 @@ jhipster:
   api-docs:
     default-include-pattern: ${server.servlet.context-path:}/api/.*
     management-include-pattern: ${server.servlet.context-path:}/management/.*
-    title: <%= baseName %> API
-    description: <%= baseName %> API documentation
+    title: <%= humanizedBaseName %> API
+    description: <%= humanizedBaseName %> API documentation
     version: 0.0.1
     terms-of-service-url:
     contact-name:

package/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs

@@ -13,12 +13,12 @@
  limitations under the License.
 -%>
 # ===================================================================
-# Spring Cloud <% if (serviceDiscoveryType === 'consul') { %>Consul <% } %>Config bootstrap configuration for the "prod" profile
+# Spring Cloud <% if (serviceDiscoveryConsul) { %>Consul <% } %>Config bootstrap configuration for the "prod" profile
 # ===================================================================
 
 spring:
   cloud:
-    <%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ if (serviceDiscoveryEureka) { _%>
     config:
       fail-fast: true
       retry:
@@ -31,8 +31,8 @@ spring:
       profile: prod # profile(s) of the property source
       label: main # toggle to switch to a different version of the configuration as stored in git
       # it can be set to any label, branch or commit of the configuration source Git repository
-    <%_ } _%>
-    <%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryConsul) { _%>
     consul:
       config:
         fail-fast: true
@@ -42,10 +42,10 @@ spring:
         initial-interval: 1000
         max-interval: 2000
         max-attempts: 100
-    <%_ } _%>
-<%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
 
 jhipster:
   registry:
     password: admin
-<%_ } _%>
+<%_ } _%>

package/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs

@@ -13,10 +13,10 @@
  limitations under the License.
 -%>
 # ===================================================================
-# Spring Cloud <% if (serviceDiscoveryType === 'consul') { %>Consul <% } %>Config bootstrap configuration for the "dev" profile
+# Spring Cloud <% if (serviceDiscoveryConsul) { %>Consul <% } %>Config bootstrap configuration for the "dev" profile
 # In prod profile, properties will be overwritten by the ones defined in bootstrap-prod.yml
 # ===================================================================
-<%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ if (serviceDiscoveryEureka) { _%>
 
 jhipster:
   registry:
@@ -32,7 +32,7 @@ spring:
     # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
     active: #spring.profiles.active#
   cloud:
-    <%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ if (serviceDiscoveryConsul) { _%>
     consul:
       config:
         fail-fast: false # if not in "prod" profile, do not force to use Spring Cloud Config
@@ -49,8 +49,8 @@ spring:
 
       host: localhost
       port: 8500
-    <%_ } _%>
-    <%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
     config:
       fail-fast: false # if not in "prod" profile, do not force to use Spring Cloud Config
       uri: http://admin:${jhipster.registry.password}@localhost:8761/config
@@ -59,4 +59,4 @@ spring:
       profile: dev # profile(s) of the property source
       label: main # toggle to switch to a different version of the configuration as stored in git
       # it can be set to any label, branch or commit of the configuration source Git repository
-    <%_ } _%>
+<%_ } _%>

package/generators/server/templates/src/main/resources/config/cql/changelog/create-tables.cql.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (databaseType === 'cassandra' && (!skipUserManagement || authenticationType === 'oauth2')) { _%>
+<%_ if (databaseTypeCassandra && (!skipUserManagement || authenticationTypeOauth2)) { _%>
 CREATE TABLE IF NOT EXISTS user (
     id text,
     login text,