Fixed bean scopes. See: eventuate-tram/eventuate-tram-core-quarkus#3

dartartem · Jan 19, 2021 · 78482b3 · 78482b3
1 parent e03c131
commit 78482b3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 26 deletions.
diff --git a/...ka/quarkus/basic/consumer/EventuateKafkaConsumerConfigurationPropertiesConfiguration.java b/...ka/quarkus/basic/consumer/EventuateKafkaConsumerConfigurationPropertiesConfiguration.java
@@ -2,12 +2,11 @@
 
 import io.eventuate.messaging.kafka.basic.consumer.EventuateKafkaConsumerConfigurationProperties;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class EventuateKafkaConsumerConfigurationPropertiesConfiguration {
-  @Produces
+  @Singleton
   public EventuateKafkaConsumerConfigurationProperties eventuateKafkaConsumerConfigurationProperties(EventuateKafkaConsumerQuarkusConfigurationProperties eventuateKafkaConsumerQuarkusConfigurationProperties) {
     EventuateKafkaConsumerConfigurationProperties eventuateKafkaConsumerConfigurationProperties = new EventuateKafkaConsumerConfigurationProperties(eventuateKafkaConsumerQuarkusConfigurationProperties.getPropertiesAsMap());
     eventuateKafkaConsumerConfigurationProperties.setBackPressure(eventuateKafkaConsumerQuarkusConfigurationProperties.getBackPressure().toBackPressureConfig());

diff --git a/...va/io/eventuate/messaging/kafka/quarkus/common/EventuateKafkaPropertiesConfiguration.java b/...va/io/eventuate/messaging/kafka/quarkus/common/EventuateKafkaPropertiesConfiguration.java
@@ -3,13 +3,12 @@
 import io.eventuate.messaging.kafka.common.EventuateKafkaConfigurationProperties;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class EventuateKafkaPropertiesConfiguration {
 
-  @Produces
+  @Singleton
   public EventuateKafkaConfigurationProperties eventuateKafkaConfigurationProperties(@ConfigProperty(name = "eventuatelocal.kafka.bootstrap.servers")
                                                                                                String bootstrapServers,
                                                                                      @ConfigProperty(name = "eventuatelocal.kafka.connection.validation.timeout", defaultValue = "1000")

diff --git a/...java/io/eventuate/messaging/kafka/quarkus/consumer/KafkaConsumerFactoryConfiguration.java b/...java/io/eventuate/messaging/kafka/quarkus/consumer/KafkaConsumerFactoryConfiguration.java
@@ -1,14 +1,14 @@
 package io.eventuate.messaging.kafka.quarkus.consumer;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
 import io.eventuate.messaging.kafka.basic.consumer.DefaultKafkaConsumerFactory;
 import io.eventuate.messaging.kafka.basic.consumer.KafkaConsumerFactory;
 import io.quarkus.arc.DefaultBean;
 
-@ApplicationScoped
+@Singleton
 public class KafkaConsumerFactoryConfiguration {
-  @Produces
+  @Singleton
   @DefaultBean
   public KafkaConsumerFactory kafkaConsumerFactory() {
     return new DefaultKafkaConsumerFactory();

diff --git a/...java/io/eventuate/messaging/kafka/quarkus/consumer/MessageConsumerKafkaConfiguration.java b/...java/io/eventuate/messaging/kafka/quarkus/consumer/MessageConsumerKafkaConfiguration.java
@@ -5,12 +5,11 @@
 import io.eventuate.messaging.kafka.common.EventuateKafkaConfigurationProperties;
 import io.eventuate.messaging.kafka.consumer.MessageConsumerKafkaImpl;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class MessageConsumerKafkaConfiguration {
-  @Produces
+  @Singleton
   public MessageConsumerKafkaImpl messageConsumerKafka(EventuateKafkaConfigurationProperties props,
                                                        EventuateKafkaConsumerConfigurationProperties eventuateKafkaConsumerConfigurationProperties,
                                                        KafkaConsumerFactory kafkaConsumerFactory) {

diff --git a/...essaging/kafka/quarkus/integration/tests/EventuateKafkaProducerConsumerConfiguration.java b/...essaging/kafka/quarkus/integration/tests/EventuateKafkaProducerConsumerConfiguration.java
@@ -8,24 +8,23 @@
 import io.eventuate.messaging.kafka.producer.EventuateKafkaProducer;
 import io.eventuate.messaging.kafka.producer.EventuateKafkaProducerConfigurationProperties;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class EventuateKafkaProducerConsumerConfiguration {
-  @Produces
+  @Singleton
   public EventuateKafkaProducer producer(EventuateKafkaConfigurationProperties kafkaProperties, EventuateKafkaProducerConfigurationProperties producerProperties) {
     return new EventuateKafkaProducer(kafkaProperties.getBootstrapServers(), producerProperties);
   }
 
-  @Produces
+  @Singleton
   public MessageConsumerKafkaImpl messageConsumerKafka(EventuateKafkaConfigurationProperties props,
                                                        EventuateKafkaConsumerConfigurationProperties eventuateKafkaConsumerConfigurationProperties,
                                                        KafkaConsumerFactory kafkaConsumerFactory) {
     return new MessageConsumerKafkaImpl(props.getBootstrapServers(), eventuateKafkaConsumerConfigurationProperties, kafkaConsumerFactory);
   }
 
-  @Produces
+  @Singleton
   public KafkaConsumerFactory kafkaConsumerFactory() {
     return new DefaultKafkaConsumerFactory();
   }

diff --git a/...ng/kafka/quarkus/producer/EventuateKafkaProducerConfigurationPropertiesConfiguration.java b/...ng/kafka/quarkus/producer/EventuateKafkaProducerConfigurationPropertiesConfiguration.java
@@ -2,12 +2,11 @@
 
 import io.eventuate.messaging.kafka.producer.EventuateKafkaProducerConfigurationProperties;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
 
-@ApplicationScoped
+@Singleton
 public class EventuateKafkaProducerConfigurationPropertiesConfiguration {
-  @Produces
+  @Singleton
   public EventuateKafkaProducerConfigurationProperties eventuateKafkaProducerConfigurationProperties(EventuateKafkaProducerQuarkusConfigurationProperties eventuateKafkaProducerQuarkusConfigurationProperties) {
     return new EventuateKafkaProducerConfigurationProperties(eventuateKafkaProducerQuarkusConfigurationProperties.getPropertiesAsMap());
   }