Skip to content

Commit

Permalink
fix(kafka): add missing base package
Browse files Browse the repository at this point in the history
  • Loading branch information
@fdelbrayelle
fdelbrayelle committed Jul 12, 2022
1 parent 7758d20 commit 444c094
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 24 deletions.
24 changes: 12 additions & 12 deletions ...ech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ public JHipsterModule buildModuleInit(final JHipsterModuleProperties properties)
.and()
.files()
.add(SOURCE.template("kafka.yml"), toSrcMainDocker().append("kafka.yml"))
.add(SOURCE.template("KafkaTestContainerExtension.java"), toSrcTestJava().append("/server/springboot/broker/kafka/KafkaTestContainerExtension.java"))
.add(SOURCE.template("KafkaPropertiesTest.java"), toSrcTestJava().append(TECHNICAL_INFRASTRUCTURE_CONFIG_KAFKA + "/KafkaPropertiesTest.java"))
.add(SOURCE.template("KafkaProperties.java"), toSrcMainJava().append(TECHNICAL_INFRASTRUCTURE_CONFIG_KAFKA + "/KafkaProperties.java"))
.add(SOURCE.template("KafkaConfiguration.java"), toSrcMainJava().append(TECHNICAL_INFRASTRUCTURE_CONFIG_KAFKA + "/KafkaConfiguration.java"))
.add(SOURCE.template("KafkaTestContainerExtension.java"), toSrcTestJava().append(properties.basePackage().basePackage() + "/KafkaTestContainerExtension.java"))
.add(SOURCE.template("KafkaPropertiesTest.java"), toSrcTestJava().append(properties.basePackage().basePackage() + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG_KAFKA + "/KafkaPropertiesTest.java"))
.add(SOURCE.template("KafkaProperties.java"), toSrcMainJava().append(properties.basePackage().basePackage() + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG_KAFKA + "/KafkaProperties.java"))
.add(SOURCE.template("KafkaConfiguration.java"), toSrcMainJava().append(properties.basePackage().basePackage() + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG_KAFKA + "/KafkaConfiguration.java"))
.and()
.mandatoryReplacements()
.in(TEST_JAVA + "/" + properties.basePackage().path() + "/IntegrationTest.java")
.in(TEST_JAVA + "/" + properties.basePackage().basePackage() + "/IntegrationTest.java")
.add(text("import org.springframework.boot.test.context.SpringBootTest;"), importExtendWith())
.add(text("public @interface"), extendWith())
.and()
Expand Down Expand Up @@ -83,13 +83,13 @@ public JHipsterModule buildModuleDummyProducerConsumer(final JHipsterModulePrope
.set(propertyKey("kafka.topic.dummy"), propertyValue("queue." + properties.projectBaseName().name() + ".dummy"))
.and()
.files()
.add(SOURCE.template("DummyProducer.java"), toSrcMainJava().append(DUMMY_INFRASTRUCTURE_SECONDARY_KAFKA_PRODUCER + "/DummyProducer.java"))
.add(SOURCE.template("DummyProducerTest.java"), toSrcTestJava().append(DUMMY_INFRASTRUCTURE_SECONDARY_KAFKA_PRODUCER + "/DummyProducerTest.java"))
.add(SOURCE.template("DummyProducerIT.java"), toSrcTestJava().append(DUMMY_INFRASTRUCTURE_SECONDARY_KAFKA_PRODUCER + "/DummyProducerIT.java"))
.add(SOURCE.template("AbstractConsumer.java"), toSrcMainJava().append(DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/AbstractConsumer.java"))
.add(SOURCE.template("DummyConsumer.java"), toSrcMainJava().append(DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumer.java"))
.add(SOURCE.template("DummyConsumerTest.java"), toSrcTestJava().append(DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumerTest.java"))
.add(SOURCE.template("DummyConsumerIT.java"), toSrcTestJava().append(DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumerIT.java"))
.add(SOURCE.template("DummyProducer.java"), toSrcMainJava().append(properties.basePackage().basePackage() + "/" + DUMMY_INFRASTRUCTURE_SECONDARY_KAFKA_PRODUCER + "/DummyProducer.java"))
.add(SOURCE.template("DummyProducerTest.java"), toSrcTestJava().append(properties.basePackage().basePackage() + "/" + DUMMY_INFRASTRUCTURE_SECONDARY_KAFKA_PRODUCER + "/DummyProducerTest.java"))
.add(SOURCE.template("DummyProducerIT.java"), toSrcTestJava().append(properties.basePackage().basePackage() + "/" + DUMMY_INFRASTRUCTURE_SECONDARY_KAFKA_PRODUCER + "/DummyProducerIT.java"))
.add(SOURCE.template("AbstractConsumer.java"), toSrcMainJava().append(properties.basePackage().basePackage() + "/" + DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/AbstractConsumer.java"))
.add(SOURCE.template("DummyConsumer.java"), toSrcMainJava().append(properties.basePackage().basePackage() + "/" + DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumer.java"))
.add(SOURCE.template("DummyConsumerTest.java"), toSrcTestJava().append(properties.basePackage().basePackage() + "/" + DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumerTest.java"))
.add(SOURCE.template("DummyConsumerIT.java"), toSrcTestJava().append(properties.basePackage().basePackage() + "/" + DUMMY_INFRASTRUCTURE_PRIMARY_KAFKA_CONSUMER + "/DummyConsumerIT.java"))
.and();
//@formatter:on

Expand Down
32 changes: 20 additions & 12 deletions ...jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void shouldBuildKafkaModuleInit() {
pomFile(),
new ModuleFile(
"src/main/resources/generator/server/springboot/core/IntegrationTest.java.mustache",
TEST_JAVA + "/" + properties.basePackage().path() + "/IntegrationTest.java"
TEST_JAVA + "/" + properties.basePackage().basePackage() + "/IntegrationTest.java"
),
readmeFile()
)
Expand All @@ -65,14 +65,22 @@ void shouldBuildKafkaModuleInit() {
.containing("kafka.producer.value.serializer=org.apache.kafka.common.serialization.StringSerializer")
.containing("kafka.polling.timeout=10000")
.and()
.createFile(TEST_JAVA + "/" + properties.basePackage().path() + "/IntegrationTest.java")
.createFile(TEST_JAVA + "/" + properties.basePackage().basePackage() + "/KafkaTestContainerExtension.java")
.and()
.createFile(TEST_JAVA + "/" + properties.basePackage().basePackage() + "/IntegrationTest.java")
.containing("@ExtendWith(KafkaTestContainerExtension.class)")
.and()
.createFile(MAIN_JAVA + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG + "/kafka/KafkaProperties.java")
.createFile(
MAIN_JAVA + "/" + properties.basePackage().basePackage() + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG + "/kafka/KafkaProperties.java"
)
.and()
.createFile(TEST_JAVA + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG + "/kafka/KafkaPropertiesTest.java")
.createFile(
TEST_JAVA + "/" + properties.basePackage().basePackage() + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG + "/kafka/KafkaPropertiesTest.java"
)
.and()
.createFile(MAIN_JAVA + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG + "/kafka/KafkaConfiguration.java")
.createFile(
MAIN_JAVA + "/" + properties.basePackage().basePackage() + "/" + TECHNICAL_INFRASTRUCTURE_CONFIG + "/kafka/KafkaConfiguration.java"
)
.and()
.createPrefixedFiles("documentation", "apache-kafka.md")
.createFile("README.md")
Expand Down Expand Up @@ -100,19 +108,19 @@ void shouldBuildKafkaModuleDummyProducerConsumer() {
.createFile(TEST_RESOURCES + "/config/application.properties")
.containing("kafka.topic.dummy=queue.myapp.dummy")
.and()
.createFile(MAIN_JAVA + "/" + dummyProducerPath + "/DummyProducer.java")
.createFile(MAIN_JAVA + "/" + properties.basePackage().basePackage() + "/" + dummyProducerPath + "/DummyProducer.java")
.and()
.createFile(TEST_JAVA + "/" + dummyProducerPath + "/DummyProducerTest.java")
.createFile(TEST_JAVA + "/" + properties.basePackage().basePackage() + "/" + dummyProducerPath + "/DummyProducerTest.java")
.and()
.createFile(TEST_JAVA + "/" + dummyProducerPath + "/DummyProducerIT.java")
.createFile(TEST_JAVA + "/" + properties.basePackage().basePackage() + "/" + dummyProducerPath + "/DummyProducerIT.java")
.and()
.createFile(MAIN_JAVA + "/" + dummyConsumerPath + "/AbstractConsumer.java")
.createFile(MAIN_JAVA + "/" + properties.basePackage().basePackage() + "/" + dummyConsumerPath + "/AbstractConsumer.java")
.and()
.createFile(MAIN_JAVA + "/" + dummyConsumerPath + "/DummyConsumer.java")
.createFile(MAIN_JAVA + "/" + properties.basePackage().basePackage() + "/" + dummyConsumerPath + "/DummyConsumer.java")
.and()
.createFile(TEST_JAVA + "/" + dummyConsumerPath + "/DummyConsumerTest.java")
.createFile(TEST_JAVA + "/" + properties.basePackage().basePackage() + "/" + dummyConsumerPath + "/DummyConsumerTest.java")
.and()
.createFile(TEST_JAVA + "/" + dummyConsumerPath + "/DummyConsumerIT.java")
.createFile(TEST_JAVA + "/" + properties.basePackage().basePackage() + "/" + dummyConsumerPath + "/DummyConsumerIT.java")
.and();
}

Expand Down

0 comments on commit 444c094

Please sign in to comment.