This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6db8311ab55c8ace4b8a53e553fd61d51110ec42 Author: Amos Feng <zf...@redhat.com> AuthorDate: Mon Oct 25 22:18:23 2021 +0800 Revert "Fix #3206 to produce RunTimeConfigurationDefaultBuildItem with camel.component.kafka.brokers property" This reverts commit 03b6dbb4be7ddd0320ecb9b06100c9a6a089925a. --- .../camel/quarkus/component/kafka/deployment/KafkaProcessor.java | 6 +++--- .../component/kafka/deployment/KafkaDevServicesDisabledTest.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java index 9acafda..6aab15e 100644 --- a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java +++ b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java @@ -24,8 +24,8 @@ import io.quarkus.deployment.Capability; import io.quarkus.deployment.IsNormal; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; import io.quarkus.kafka.client.deployment.DevServicesKafkaBrokerBuildItem; import io.quarkus.kafka.client.deployment.KafkaBuildTimeConfig; @@ -55,13 +55,13 @@ class KafkaProcessor { public void configureKafkaComponentForDevServices( DevServicesKafkaBrokerBuildItem kafkaBrokerBuildItem, KafkaBuildTimeConfig kafkaBuildTimeConfig, - BuildProducer<RunTimeConfigurationDefaultBuildItem> runTimeConfig) { + BuildProducer<DevServicesConfigResultBuildItem> devServiceConfig) { Config config = ConfigProvider.getConfig(); Optional<String> brokers = config.getOptionalValue(CAMEL_KAFKA_BROKERS, String.class); if (brokers.isEmpty() && kafkaBuildTimeConfig.devservices.enabled.orElse(true)) { - runTimeConfig.produce(new RunTimeConfigurationDefaultBuildItem(CAMEL_KAFKA_BROKERS, + devServiceConfig.produce(new DevServicesConfigResultBuildItem(CAMEL_KAFKA_BROKERS, kafkaBrokerBuildItem.getBootstrapServers())); } } diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java index 14883db..75daa19 100644 --- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java +++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaDevServicesDisabledTest.java @@ -34,7 +34,8 @@ public class KafkaDevServicesDisabledTest { @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() .withConfigurationResource("application-configuration-devservices-disabled.properties") - .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)) + .overrideConfigKey("camel.component.kafka.brokers", ""); @Inject CamelContext context;