generator-jhipster 7.7.0 → 7.9.0

package/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs

@@ -18,133 +18,85 @@
 -%>
 package <%= packageName %>.web.rest;
 
-import <%= packageName %>.config.KafkaProperties;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-<%_ if (!reactive) { _%>
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.clients.producer.RecordMetadata;
-<%_ }  _%>
+import static org.springframework.web.servlet.mvc.method.annotation.SseEmitter.event;
+
+import java.io.IOException;
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cloud.stream.annotation.StreamListener;
+import org.springframework.http.MediaType;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.support.GenericMessage;
+import org.springframework.util.MimeTypeUtils;
+
 import org.springframework.web.bind.annotation.*;
-<%_ if (reactive) { _%>
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.kafka.receiver.KafkaReceiver;
-import reactor.kafka.receiver.ReceiverOptions;
-import reactor.kafka.sender.KafkaSender;
-import reactor.kafka.sender.SenderOptions;
-import reactor.kafka.sender.SenderRecord;
-import reactor.kafka.sender.SenderResult;
-<%_ }  _%>
-<%_ if (!reactive) { _%>
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-<%_ }  _%>
 
-<%_ if (!reactive) { _%>
-import java.time.Duration;
-<%_ }  _%>
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-<%_ if (!reactive) { _%>
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-<%_ }  _%>
+import <%= packageName %>.config.KafkaSseConsumer;
+import <%= packageName %>.config.KafkaSseProducer;
 
 @RestController
 @RequestMapping("/api/<%= dasherizedBaseName %>-kafka")
 public class <%= upperFirstCamelCase(baseName) %>KafkaResource {
 
     private final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCase(baseName) %>KafkaResource.class);
+    private final MessageChannel output;
+
+    // TODO implement state of the art emitter repository to become 12 factor
+    private Map<String, SseEmitter> emitters = new HashMap<>();
 
-    private final KafkaProperties kafkaProperties;
-<%_ if (reactive) { _%>
-    private KafkaSender<String, String> sender;
-<%_ } else { _%>
-    private KafkaProducer<String, String> producer;
-    private ExecutorService sseExecutorService = Executors.newCachedThreadPool();
-<%_ }  _%>
-
-    public <%= upperFirstCamelCase(baseName) %>KafkaResource(KafkaProperties kafkaProperties) {
-        this.kafkaProperties = kafkaProperties;
-<%_ if (reactive) { _%>
-        this.sender = KafkaSender.create(SenderOptions.create(kafkaProperties.getProducerProps()));
-<%_ } else { _%>
-        this.producer = new KafkaProducer<>(kafkaProperties.getProducerProps());
-<%_ }  _%>
+    public <%= upperFirstCamelCase(baseName) %>KafkaResource(@Qualifier(KafkaSseProducer.CHANNELNAME) MessageChannel output) {
+        this.output = output;
     }
 
-    @PostMapping("/publish/{topic}")
-    public <% if (reactive) { %>Mono<PublishResult><% } else { %>PublishResult<% }  %> publish(@PathVariable String topic, @RequestParam String message, @RequestParam(required = false) String key)<% if (!reactive) { %> throws ExecutionException, InterruptedException<% } %> {
-        log.debug("REST request to send to Kafka topic {} with key {} the message : {}", topic, key, message);
-<%_ if (reactive) { _%>
-        return Mono.just(SenderRecord.create(topic, null, null, key, message, null))
-            .as(sender::send)
-            .next()
-            .map(SenderResult::recordMetadata)
-            .map(metadata -> new PublishResult(metadata.topic(), metadata.partition(), metadata.offset(), Instant.ofEpochMilli(metadata.timestamp())));
-<%_ } else { _%>
-        RecordMetadata metadata = producer.send(new ProducerRecord<>(topic, key, message)).get();
-        return new PublishResult(metadata.topic(), metadata.partition(), metadata.offset(), Instant.ofEpochMilli(metadata.timestamp()));
-<%_ }  _%>
+    @PostMapping("/publish")
+    public void publish(@RequestParam String message) {
+        log.debug("REST request the message : {} to send to Kafka topic ", message);
+        Map<String, Object> map = new HashMap<>();
+        map.put(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN_VALUE);
+        MessageHeaders headers = new MessageHeaders(map);
+        output.send(new GenericMessage<>(message, headers));
     }
 
-    @GetMapping("/consume")
-    public <% if (reactive) { %>Flux<String><% } else { %>SseEmitter<% }  %> consume(@RequestParam("topic") List<String> topics, @RequestParam Map<String, String> consumerParams) {
-        log.debug("REST request to consume records from Kafka topics {}", topics);
-        Map<String, Object> consumerProps = kafkaProperties.getConsumerProps();
-        consumerProps.putAll(consumerParams);
-        consumerProps.remove("topic");
-
-<%_ if (reactive) { _%>
-        ReceiverOptions<String, String> receiverOptions = ReceiverOptions.<String, String>create(consumerProps)
-            .subscription(topics);
-        return KafkaReceiver.create(receiverOptions)
-            .receive()
-            .map(ConsumerRecord::value);
-<%_ } else { _%>
-        SseEmitter emitter = new SseEmitter(0L);
-        sseExecutorService.execute(() -> {
-            KafkaConsumer<String, String> consumer = new KafkaConsumer<>(consumerProps);
-            emitter.onCompletion(consumer::close);
-            consumer.subscribe(topics);
-            boolean exitLoop = false;
-            while(!exitLoop) {
+    @GetMapping("/register")
+    public ResponseBodyEmitter register(Principal principal) {
+        log.debug("Registering sse client for {}", principal.getName());
+        SseEmitter emitter = new SseEmitter();
+        emitter.onCompletion(() -> emitters.remove(emitter));
+        emitters.put(principal.getName(), emitter);
+        return emitter;
+    }
+
+    @GetMapping("/unregister")
+    public void unregister(Principal principal) {
+        String user = principal.getName();
+        log.debug("Unregistering sse emitter for user: {}", user);
+        Optional.ofNullable(emitters.get(user))
+            .ifPresent(ResponseBodyEmitter::complete);
+    }
+
+    @StreamListener(value = KafkaSseConsumer.CHANNELNAME, copyHeaders = "false")
+    public void consume(Message<String> message) {
+        log.debug("Got message from kafka stream: {}", message.getPayload());
+        emitters.entrySet().stream().map(Map.Entry::getValue)
+            .forEach((SseEmitter emitter) -> {
                 try {
-                    ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(5));
-                    for (ConsumerRecord<String, String> record : records) {
-                        emitter.send(record.value());
-                    }
-                    emitter.send(SseEmitter.event().comment(""));
-                } catch (Exception ex) {
-                    log.trace("Complete with error {}", ex.getMessage(), ex);
-                    emitter.completeWithError(ex);
-                    exitLoop = true;
-                }
+                    emitter.send(event().data(message.getPayload(), MediaType.TEXT_PLAIN));
+                } catch (IOException e) {
+                log.debug("error sending sse message, {}", message.getPayload());
             }
-            consumer.close();
-            emitter.complete();
         });
-        return emitter;
-<%_ }  _%>
     }
 
-    private static class PublishResult {
-        public final String topic;
-        public final int partition;
-        public final long offset;
-        public final Instant timestamp;
-
-        private PublishResult(String topic, int partition, long offset, Instant timestamp) {
-            this.topic = topic;
-            this.partition = partition;
-            this.offset = offset;
-            this.timestamp = timestamp;
-        }
-    }
+
 }
+

package/generators/server/templates/src/main/java/package/web/rest/KafkaResource_reactive.java.ejs

@@ -0,0 +1,74 @@
+<%#
+ Copyright 2013-2022 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 %>.web.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cloud.stream.annotation.StreamListener;
+import org.springframework.http.ResponseEntity;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.support.GenericMessage;
+import org.springframework.util.MimeTypeUtils;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.publisher.Sinks;
+import <%= packageName %>.config.KafkaSseConsumer;
+import <%= packageName %>.config.KafkaSseProducer;
+
+@RestController
+@RequestMapping("/api/<%= dasherizedBaseName %>-kafka")
+public class <%= upperFirstCamelCase(baseName) %>KafkaResource {
+
+    private final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCase(baseName) %>KafkaResource.class);
+
+    private final MessageChannel output;
+    private Sinks.Many<Message<String>> sink = Sinks.many().unicast().onBackpressureBuffer();
+
+    public <%= upperFirstCamelCase(baseName) %>KafkaResource(@Qualifier(KafkaSseProducer.CHANNELNAME) MessageChannel output) {
+        this.output = output;
+    }
+
+    @PostMapping("/publish")
+    public Mono<ResponseEntity<Void>> publish(@RequestParam String message) {
+        log.debug("REST request the message : {} to send to Kafka topic", message);
+        Map<String, Object> map = new HashMap<>();
+        map.put(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN_VALUE);
+        MessageHeaders headers = new MessageHeaders(map);
+        output.send(new GenericMessage<>(message, headers));
+        return Mono.just(ResponseEntity.noContent().build());
+    }
+
+    @GetMapping("/consume")
+    public Flux<String> consume() {
+        log.debug("REST request to consume records from Kafka topics");
+        return sink.asFlux().map(m -> m.getPayload());
+    }
+
+    @StreamListener(value = KafkaSseConsumer.CHANNELNAME, copyHeaders = "false")
+    public void consume(Message<String> message) {
+        log.debug("Got message from kafka stream: {}", message.getPayload());
+        sink.emitNext(message, Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}

package/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs

@@ -61,13 +61,9 @@ public class LogoutResource {
 
         String originUrl = request.getHeader(HttpHeaders.ORIGIN);
 
-        if (logoutUrl.indexOf("/protocol") > -1) {
-            logoutUrl.append("?redirect_uri=").append(originUrl);
-        } else if (logoutUrl.indexOf("auth0.com") > -1) {
-            // Auth0
+        if (issuerUri.contains("auth0.com")) {
             logoutUrl.append("?client_id=").append(this.registration.getClientId()).append("&returnTo=").append(originUrl);
         } else {
-            // Okta
             logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
         }
 

package/generators/server/templates/src/main/java/package/web/rest/LogoutResource_reactive.java.ejs

@@ -68,13 +68,9 @@ public class LogoutResource {
         }
 
         String originUrl = request.getHeaders().getOrigin();
-        if (logoutUrl.indexOf("/protocol") > -1) {
-            logoutUrl.append("?redirect_uri=").append(originUrl);
-        } else if (logoutUrl.indexOf("auth0.com") > -1) {
-            // Auth0
+        if (issuerUri.contains("auth0.com")) {
             logoutUrl.append("?client_id=").append(clientRegistration.getClientId()).append("&returnTo=").append(originUrl);
         } else {
-            // Okta
             logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
         }
         return Map.of("logoutUrl", logoutUrl.toString());

package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs

@@ -195,7 +195,7 @@ public class UserResource {
             .map(user -> {
                 try {
                     return ResponseEntity.created(new URI("/api/admin/users/" + user.getLogin()))
-                        .headers(HeaderUtil.createAlert(applicationName, "userManagement.created", user.getLogin()))
+                        .headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %> "userManagement.created"<% } else { %> "A user is created with identifier " + user.getLogin()<% } %>, user.getLogin()))
                         .body(user);
                 } catch (URISyntaxException e) {
                     throw new RuntimeException(e);
@@ -248,7 +248,7 @@ public class UserResource {
             })
             .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND)))
             .map(user -> ResponseEntity.ok()
-                .headers(HeaderUtil.createAlert(applicationName, "userManagement.updated", userDTO.getLogin()))
+                .headers(HeaderUtil.createAlert(applicationName, <% if (enableTranslation) { %>"userManagement.updated"<% } else { %>"A user is updated with identifier " + userDTO.getLogin()<% } %>, userDTO.getLogin()))
                 .body(user)
             );
   <%_ } else { _%>
@@ -357,11 +357,10 @@ public class UserResource {
     @DeleteMapping("/users/{login}")
     @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")")
   <%_ if (reactive) { _%>
-    @ResponseStatus(code = HttpStatus.NO_CONTENT)
     public Mono<ResponseEntity<Void>> deleteUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to delete User: {}", login);
         return userService.deleteUser(login)
-            .map(it -> ResponseEntity.noContent().headers(HeaderUtil.createAlert( applicationName, "userManagement.deleted", login)).build());
+        .then(Mono.just(ResponseEntity.noContent().headers(HeaderUtil.createAlert( applicationName, <% if (enableTranslation) { %> "userManagement.deleted"<% } else { %> "A user is deleted with identifier " + login<% } %>, login)).build()));
   <%_ } else { _%>
     public ResponseEntity<Void> deleteUser(@PathVariable @Pattern(regexp = Constants.LOGIN_REGEX) String login) {
         log.debug("REST request to delete User: {}", login);

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

@@ -167,8 +167,6 @@ spring:
   jpa:
   <%_ if (devDatabaseTypePostgres) { _%>
     database-platform: tech.jhipster.domain.util.FixedPostgreSQL10Dialect
-  <%_ } else if (devDatabaseTypeH2Any) { _%>
-    database-platform: tech.jhipster.domain.util.FixedH2Dialect
   <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb || databaseTypeCassandra || (searchEngineElasticsearch && reactive)) { _%>
@@ -355,7 +353,10 @@ jhipster:
   # CORS is only enabled by default with the "dev" profile
   cors:
     # Allow Ionic for JHipster by default (* no longer allowed in Spring Boot 2.4+)
-    allowed-origins: "http://localhost:8100,https://localhost:8100,http://localhost:9000,https://localhost:9000<%_ if (!skipClient) { _%>,http://localhost:<%= devServerPort %>,https://localhost:<%= devServerPort %><%_ if (applicationTypeGateway && microfrontend) { for ({applicationIndex, devServerPort: microserviceDevServerPort = devServerPort + applicationIndex} of Object.values(jhipsterConfig.applications || {})) { _%>,http://localhost:<%= microserviceDevServerPort %>,https://localhost:<%= microserviceDevServerPort %><%_ } } _%><%_ } _%>"
+  <%_ if (microfrontend) { _%>
+    # Ports <%= devServerPort + 1 %>-<%= devServerPort + 9 %> are allowed for microfrontend development
+  <%_ } _%>
+    allowed-origins: "http://localhost:8100,https://localhost:8100,http://localhost:9000,https://localhost:9000<%_ if (!skipClient) { _%>,http://localhost:<%= devServerPort %>,https://localhost:<%= devServerPort %><%_ if (microfrontend) { for (let port = 1; port < 10; port++) { _%>,http://localhost:<%= devServerPort + port %>,https://localhost:<%= devServerPort + port %><%_ } _%><%_ } } _%>"
     # Enable CORS when running in GitHub Codespaces
     allowed-origin-patterns: 'https://*.githubpreview.dev'
     allowed-methods: "*"

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

@@ -156,7 +156,7 @@ spring:
 <%_ } _%>
   application:
     name: <%= baseName %>
-<%_ if (serviceDiscoveryConsul || (applicationTypeGateway && reactive)) { _%>
+<%_ if (serviceDiscoveryConsul || (applicationTypeGateway && reactive) || messageBrokerKafka) { _%>
   cloud:
   <%_ if (serviceDiscoveryConsul) { _%>
     consul:
@@ -189,6 +189,23 @@ spring:
         pool:
           max-connections: 1000
   <%_ } _%>
+  <%_ if (messageBrokerKafka) { _%>
+    stream:
+      kafka:
+        binder:
+          replicationFactor: 1
+          auto-create-topics: true
+          brokers: localhost:9092
+      bindings:
+        binding-in-sse:
+          destination: sse-topic
+          content-type: text/plain
+          group: <%= dasherizedBaseName %>
+        binding-out-sse:
+          destination: sse-topic
+          content-type: text/plain
+          group: <%= dasherizedBaseName %>
+  <%_ } _%>
 <%_ } _%>
   profiles:
     # The commented value for `active` can be replaced with valid Spring profiles to load.
@@ -252,7 +269,6 @@ spring:
     basename: i18n/messages
   main:
     allow-bean-definition-overriding: true
-    allow-circular-references: true
 <%_ if (!reactive) { _%>
   mvc:
     pathmatch:
@@ -289,7 +305,7 @@ spring:
       client:
         provider:
           oidc:
-            issuer-uri: http://localhost:9080/auth/realms/jhipster
+            issuer-uri: http://localhost:9080/realms/jhipster
         registration:
           oidc:
   <%_ if (applicationTypeMicroservice) { _%>
@@ -299,7 +315,7 @@ spring:
             client-id: web_app
             client-secret: web_app
   <%_ } _%>
-            scope: openid,profile,email
+            scope: openid, profile, email, offline_access # last one for refresh tokens
 <%_ } _%>
 
 server:
@@ -330,11 +346,11 @@ jhipster:
   #   allowed-origins: "http://localhost:8100,http://localhost:9000"
   #   allowed-methods: "*"
   #   allowed-headers: "*"
-  <%_ if (authenticationType === 'session') { _%>
+<%_ if (authenticationTypeSession) { _%>
   #   exposed-headers: "Link,X-Total-Count,X-${jhipster.clientApp.name}-alert,X-${jhipster.clientApp.name}-error,X-${jhipster.clientApp.name}-params"
-  <%_ } else { _%>
+<%_ } else { _%>
   #   exposed-headers: "Authorization,Link,X-Total-Count,X-${jhipster.clientApp.name}-alert,X-${jhipster.clientApp.name}-error,X-${jhipster.clientApp.name}-params"
-  <%_ } _%>
+<%_ } _%>
   #   allow-credentials: true
   #   max-age: 1800
   mail:
@@ -352,28 +368,16 @@ jhipster:
     license: unlicensed
     license-url:
   security:
-    <%_ if (clientTheme !== 'none') { _%>
+<%_ if (clientTheme !== 'none') { _%>
     content-security-policy: "default-src 'self'; frame-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://storage.googleapis.com; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; img-src 'self' data:; font-src 'self' https://fonts.gstatic.com data:"
-    <%_ } else { _%>
+<%_ } else { _%>
     content-security-policy: "default-src 'self'; frame-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://storage.googleapis.com; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:"
-    <%_ } _%>
-    <%_ if (authenticationType === 'oauth2') { _%>
+<%_ } _%>
+<%_ if (authenticationTypeOauth2) { _%>
     oauth2:
       audience:
         - account
         - api://default
-  <%_ } _%>
-<%_ if (messageBroker === 'kafka') { _%>
-kafka:
-  bootstrap-servers: localhost:9092
-  consumer:
-    key.deserializer: org.apache.kafka.common.serialization.StringDeserializer
-    value.deserializer: org.apache.kafka.common.serialization.StringDeserializer
-    group.id: <%= dasherizedBaseName %>
-    auto.offset.reset: earliest
-  producer:
-    key.serializer: org.apache.kafka.common.serialization.StringSerializer
-    value.serializer: org.apache.kafka.common.serialization.StringSerializer
 <%_ } _%>
 
 # ===================================================================

package/generators/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs

@@ -21,7 +21,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
 <%_ const isAutoIncrementDB = reactive || prodDatabaseTypeMysql; _%>

package/generators/server/templates/src/main/resources/config/liquibase/master.xml.ejs

@@ -2,38 +2,68 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-<%= LIQUIBASE_DTD_VERSION %>.xsd">
-
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+<%_ if (devDatabaseTypeH2Any) { _%>
     <property name="now" value="now()" dbms="h2"/>
-<%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
-    <property name="now" value="now()" dbms="mysql, mariadb"/>
+    <property name="floatType" value="float4" dbms="h2"/>
+  <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
+    <property name="uuidType" value="varchar(36)" dbms="h2"/>
+  <%_ } else { _%>
+    <property name="uuidType" value="uuid" dbms="h2"/>
+  <%_ } _%>
+    <property name="datetimeType" value="datetime" dbms="h2"/>
+  <%_ if (reactive) { _%>
+    <property name="clobType" value="varchar(1000000)" dbms="h2"/>
+    <property name="blobType" value="varchar(1000000)" dbms="h2"/>
+  <%_ } else { _%>
+    <%_ if (prodDatabaseTypePostgres) { _%>
+    <property name="clobType" value="longvarchar" dbms="h2"/>
+    <%_ } else { _%>
+    <property name="clobType" value="clob" dbms="h2"/>
+    <%_ } _%>
+    <property name="blobType" value="blob" dbms="h2"/>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (devDatabaseTypeMysql || prodDatabaseTypeMysql) { _%>
+    <property name="now" value="now()" dbms="mysql"/>
+    <property name="floatType" value="float" dbms="mysql"/>
+    <property name="clobType" value="clob" dbms="mysql"/>
+    <property name="blobType" value="longblob" dbms="mysql"/>
+    <property name="uuidType" value="varchar(36)" dbms="mysql"/>
+    <property name="datetimeType" value="datetime(6)" dbms="mysql"/>
+<%_ } _%>
+<%_ if (devDatabaseTypeMariadb || prodDatabaseTypeMariadb) { _%>
+    <property name="now" value="now()" dbms="mariadb"/>
+    <property name="floatType" value="float" dbms="mariadb"/>
+    <property name="clobType" value="clob" dbms="mariadb"/>
+    <property name="blobType" value="longblob" dbms="mariadb"/>
+    <property name="uuidType" value="varchar(36)" dbms="mariadb"/>
+    <property name="datetimeType" value="datetime(6)" dbms="mariadb"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypePostgres) { _%>
+<%_ if (devDatabaseTypePostgres || prodDatabaseTypePostgres) { _%>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
+    <property name="floatType" value="float4" dbms="postgresql"/>
+    <property name="clobType" value="longvarchar" dbms="postgresql"/>
+    <property name="blobType" value="bytea" dbms="postgresql"/>
+    <property name="uuidType" value="uuid" dbms="postgresql"/>
+    <property name="datetimeType" value="datetime" dbms="postgresql"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypeOracle) { _%>
+<%_ if (devDatabaseTypeOracle || prodDatabaseTypeOracle) { _%>
     <property name="now" value="sysdate" dbms="oracle"/>
+    <property name="floatType" value="float" dbms="oracle"/>
+    <property name="clobType" value="clob" dbms="oracle"/>
+    <property name="blobType" value="blob" dbms="oracle"/>
+    <property name="uuidType" value="uuid" dbms="oracle"/>
+    <property name="datetimeType" value="datetime" dbms="oracle"/>
 <%_ } _%>
-<%_ if (prodDatabaseTypeMssql) { _%>
+<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
     <property name="now" value="GETDATE()" dbms="mssql"/>
+    <property name="floatType" value="float" dbms="mssql"/>
+    <property name="clobType" value="clob" dbms="mssql"/>
+    <property name="blobType" value="blob" dbms="mssql"/>
+    <property name="uuidType" value="uuid" dbms="mssql"/>
+    <property name="datetimeType" value="datetime" dbms="mssql"/>
 <%_ } _%>
-    <property name="floatType" value="float4" dbms="postgresql, h2"/>
-    <property name="floatType" value="float" dbms="mysql, oracle, mssql, mariadb"/>
-<%_ if (prodDatabaseTypePostgres) { _%>
-    <property name="clobType" value="longvarchar" dbms="h2"/>
-<%_ } else if (reactive) { _%>
-    <property name="clobType" value="varchar(1000000)" dbms="h2"/>
-<%_ } else { _%>
-    <property name="clobType" value="clob" dbms="h2"/>
-<%_ } _%>
-    <property name="clobType" value="clob" dbms="mysql, oracle, mssql, mariadb, postgresql"/>
-<%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
-    <property name="uuidType" value="varchar(36)" dbms="h2, mysql, mariadb"/>
-<%_ } else { _%>
-    <property name="uuidType" value="uuid" dbms="h2, <%= prodDatabaseType %>"/>
-<%_ } _%>
-    <property name="datetimeType" value="datetime(6)" dbms="mysql, mariadb"/>
-    <property name="datetimeType" value="datetime" dbms="oracle, mssql, postgresql, h2"/>
 
     <include file="config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/>
     <!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->

package/generators/server/templates/src/main/resources/swagger/api.yml.ejs

@@ -62,8 +62,8 @@ security:
       description: OAuth2 authentication with KeyCloak
       flows:
         authorizationCode:
-          authorizationUrl: http://localhost:9080/auth/realms/jhipster/protocol/openid-connect/auth
-          tokenUrl: http://localhost:9080/auth/realms/jhipster/protocol/openid-connect/token
+          authorizationUrl: http://localhost:9080/realms/jhipster/protocol/openid-connect/auth
+          tokenUrl: http://localhost:9080/realms/jhipster/protocol/openid-connect/token
           scopes:
             jhipster: Jhipster specific claims
             email: Email claims
@@ -71,7 +71,7 @@ security:
     openId:
       type: openIdConnect
       description: OpenID Connect authentication with KeyCloak
-      openIdConnectUrl: http://localhost:9080/auth/realms/jhipster/.well-known/openid-configuration
+      openIdConnectUrl: http://localhost:9080/realms/jhipster/.well-known/openid-configuration
 security:
   - oauth: [jhipster, email, profile]
   - openId: [jhipster, email, profile]

package/generators/server/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs

@@ -18,17 +18,16 @@
 -%>
 package <%= packageName %>;
 
-import <%= packageName %>.IntegrationTest;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.Metadata;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.cassandraunit.CQLDataLoader;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @IntegrationTest
-public class CassandraKeyspaceIT extends AbstractCassandraTest {
+public class CassandraKeyspaceIT {
 
     @Autowired
     private CqlSession session;
@@ -36,6 +35,6 @@ public class CassandraKeyspaceIT extends AbstractCassandraTest {
     @Test
     void shouldListCassandraUnitKeyspace() {
         Metadata metadata = session.getMetadata();
-        assertThat(metadata.getKeyspace(CASSANDRA_UNIT_KEYSPACE)).isNotNull();
+        assertThat(metadata.getKeyspace(CQLDataLoader.DEFAULT_KEYSPACE_NAME)).isNotNull();
     }
 }