From c464493fff7485065d63b9af9129d0b5a2a85dec Mon Sep 17 00:00:00 2001 From: richersoon Date: Sun, 18 Aug 2024 19:22:22 +0800 Subject: [PATCH] Switch to Kafka native image. --- .../springboot/broker/kafka/domain/KafkaModuleFactory.java | 2 +- src/main/resources/generator/dependencies/Dockerfile | 2 +- .../broker/kafka/domain/KafkaModuleFactoryTest.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java index 9cbcfd4f019..a3a92f7cc88 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java @@ -30,7 +30,7 @@ public JHipsterModule buildModuleInit(JHipsterModuleProperties properties) { //@formatter:off return moduleBuilder(properties) .context() - .put("kafkaDockerImage", dockerImages.get("apache/kafka").fullName()) + .put("kafkaDockerImage", dockerImages.get("apache/kafka-native").fullName()) .put("kafkaClusterId", kafkaClusterId) .and() .documentation(documentationTitle("Apache Kafka"), SOURCE.template("apache-kafka.md")) diff --git a/src/main/resources/generator/dependencies/Dockerfile b/src/main/resources/generator/dependencies/Dockerfile index 5a3d0b39c33..4046736a30c 100644 --- a/src/main/resources/generator/dependencies/Dockerfile +++ b/src/main/resources/generator/dependencies/Dockerfile @@ -9,7 +9,7 @@ FROM mysql:9.0.1 FROM cassandra:4.1.5 FROM mcr.microsoft.com/mssql/server:2022-latest FROM postgres:16.4 -FROM apache/kafka:3.8.0 +FROM apache/kafka-native:3.8.0 FROM tchiotludo/akhq:0.25.1 FROM apachepulsar/pulsar:3.3.1 FROM neo4j:5.22.0-community diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java index 70c0ea15672..cc0e247ca52 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java @@ -28,7 +28,7 @@ class KafkaModuleFactoryTest { @Test void shouldBuildKafkaModuleInit() { - when(dockerImages.get("apache/kafka")).thenReturn(new DockerImageVersion("apache/kafka", "1.0.0")); + when(dockerImages.get("apache/kafka-native")).thenReturn(new DockerImageVersion("apache/kafka-native", "1.0.0")); JHipsterModuleProperties properties = JHipsterModulesFixture.propertiesBuilder(tmpDirForTest()) .basePackage("tech.jhipster.jhlitest") @@ -52,6 +52,7 @@ void shouldBuildKafkaModuleInit() { .containing("kafka") .and() .hasFile("src/main/docker/kafka.yml") + .containing("image: apache/kafka-native") .containing("CLUSTER_ID: 'my-cluster'") .and() .hasFile("src/main/resources/config/application.yml") @@ -81,6 +82,7 @@ void shouldBuildKafkaModuleInit() { ) .and() .hasFile("src/test/java/tech/jhipster/jhlitest/KafkaTestContainerExtension.java") + .containing("apache/kafka-native") .and() .hasFile("src/test/java/tech/jhipster/jhlitest/IntegrationTest.java") .containing("@ExtendWith(KafkaTestContainerExtension.class)")