Merge pull request #7 from looorent/quarkus-3.30

[3.0.4] Compatibility with Quarkus 3.30.x

Author: looorent

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.4] - 2025-12-10
+
+* Support for Quarkus `3.30.x`
+
 ## [3.0.3] - 2025-05-09
 
 * Release with JReleaser

README.md

@@ -16,7 +16,7 @@ This project is decoupled in a set of JAR you can pick up depending on your own
 
 All librairies are available on Maven Central. For example, `jflu-subscriber-rabbitmq` can be included in your dependencies like this (Gradle example):
 ```groovy
-implementation "be.looorent:jflu-subscriber-rabbitmq:3.0.3"
+implementation "be.looorent:jflu-subscriber-rabbitmq:3.0.4"
 ```
 
 ## `jflu-core`

build.gradle

@@ -28,7 +28,7 @@ def moduleProjects = [
 ]
 
 group = "be.looorent"
-version "3.0.3"
+version "3.0.4"
 
 subprojects {
     group "net.commuty"
@@ -42,7 +42,7 @@ subprojects {
     targetCompatibility = JavaVersion.VERSION_21
 
     group = "be.looorent"
-    version "3.0.3"
+    version "3.0.4"
 
     repositories {
         mavenCentral()

gradle.properties

@@ -10,7 +10,7 @@ rabbitmqVersion=5.22.0
 groovyVersion=3.0.24
 spockVersion=2.4-M6-groovy-3.0
 systemRulesVersion=1.19.0
-quarkusVersion=3.22.0
+quarkusVersion=3.30.2
 cglibVersion=3.3.0
 objenesisVersion=3.4
 hibernateVersion=5.2.4.Final

jflu-producer-rabbitmq-quarkus-deployment/src/main/java/be/looorent/jflu/publisher/rabbitmq/quarkus/deployment/JFluProducerProcessor.java

@@ -1,7 +1,7 @@
 package be.looorent.jflu.publisher.rabbitmq.quarkus.deployment;
 
-import be.looorent.jflu.EventSerializer;
 import be.looorent.jflu.*;
+import be.looorent.jflu.EventSerializer;
 import be.looorent.jflu.EventSerializer.EventDataDeserializer;
 import be.looorent.jflu.EventSerializer.TimestampDeserializer;
 import be.looorent.jflu.entity.*;
@@ -13,7 +13,6 @@
 import be.looorent.jflu.publisher.rabbitmq.RabbitMQPropertyName;
 import be.looorent.jflu.publisher.rabbitmq.quarkus.ProducerBuildConfiguration;
 import be.looorent.jflu.publisher.rabbitmq.quarkus.ProducerRecorder;
-import be.looorent.jflu.publisher.rabbitmq.quarkus.ProducerRuntimeConfiguration;
 import be.looorent.jflu.request.RequestEventFactory;
 import be.looorent.jflu.subscriber.*;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
@@ -38,21 +37,16 @@ FeatureBuildItem feature() {
 
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep(onlyIf = IsEnabled.class)
-    public void configureBuild(ProducerRecorder recorder,
-                               ProducerBuildConfiguration buildConfiguration,
-                               BeanContainerBuildItem beanContainer) {
-        LOGGER.infof("Configure Build of JFlu - RabbitMQ producer: %s", buildConfiguration);
-        recorder.configureBuild(buildConfiguration, beanContainer.getValue());
+    public void configureBuild(ProducerRecorder recorder, BeanContainerBuildItem beanContainer) {
+        LOGGER.infof("Configure Build of JFlu - RabbitMQ producer");
+        recorder.configureBuild(beanContainer.getValue());
     }
 
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep(onlyIf = IsEnabled.class)
-    public void configureProducer(ProducerRecorder recorder,
-                                  ProducerRuntimeConfiguration runtimeConfiguration,
-                                  ProducerBuildConfiguration buildConfiguration,
-                                  BeanContainerBuildItem beanContainer) {
-        LOGGER.infof("Configure Runtime of JFlu - RabbitMQ producer: %s", runtimeConfiguration);
-        recorder.configureRuntime(runtimeConfiguration, buildConfiguration, beanContainer.getValue());
+    public void configureProducer(ProducerRecorder recorder, BeanContainerBuildItem beanContainer) {
+        LOGGER.infof("Configure Runtime of JFlu - RabbitMQ producer");
+        recorder.configureRuntime(beanContainer.getValue());
     }
 
     @BuildStep(onlyIf = IsEnabled.class)
@@ -98,7 +92,7 @@ static class IsEnabled implements BooleanSupplier {
         ProducerBuildConfiguration configuration;
 
         public boolean getAsBoolean() {
-            return configuration.enabled;
+            return configuration.enabled();
         }
     }
 }

jflu-producer-rabbitmq-quarkus/src/main/java/be/looorent/jflu/publisher/rabbitmq/quarkus/EventFactoryProducer.java

@@ -17,7 +17,7 @@ public class EventFactoryProducer {
     @Produces
     @Dependent
     public ManualEventFactory produceManualEventFactory() {
-        String emitter = isEnabled() ? runtimeConfiguration.emitter : "[JFluDisabled]";
+        String emitter = isEnabled() ? runtimeConfiguration.emitter() : "[JFluDisabled]";
         LOGGER.infof("Instanciate manual event factory for emitter='%s'", emitter);
         return new ManualEventFactory(emitter);
     }
@@ -28,6 +28,6 @@ public void init(ProducerRuntimeConfiguration runtimeConfiguration, ProducerBuil
     }
 
     private boolean isEnabled() {
-        return buildConfiguration != null && buildConfiguration.enabled;
+        return buildConfiguration != null && buildConfiguration.enabled();
     }
 }

jflu-producer-rabbitmq-quarkus/src/main/java/be/looorent/jflu/publisher/rabbitmq/quarkus/EventPublisherProducer.java

@@ -25,15 +25,15 @@ public EventPublisher producePublisher() {
         if (isEnabled()) {
             LOGGER.info("Instanciate singleton EventPublisher of type RabbitMQEventTopicPublisher");
             Properties properties = new Properties();
-            USERNAME.writeTo(properties, runtimeConfiguration.username.orElse(""));
-            PASSWORD.writeTo(properties, runtimeConfiguration.password.orElse(""));
-            HOST.writeTo(properties, runtimeConfiguration.host);
-            PORT.writeTo(properties, runtimeConfiguration.port.orElse(0));
-            VIRTUAL_HOST.writeTo(properties, runtimeConfiguration.virtualHost.orElse(""));
-            EXCHANGE_NAME.writeTo(properties, runtimeConfiguration.exchangeName);
-            EXCHANGE_DURABLE.writeTo(properties, runtimeConfiguration.exchangeDurable);
-            WAIT_FOR_CONNECTION.writeTo(properties, runtimeConfiguration.waitForConnection);
-            USE_SSL.writeTo(properties, runtimeConfiguration.useSsl);
+            USERNAME.writeTo(properties, runtimeConfiguration.username().orElse(""));
+            PASSWORD.writeTo(properties, runtimeConfiguration.password().orElse(""));
+            HOST.writeTo(properties, runtimeConfiguration.host());
+            PORT.writeTo(properties, runtimeConfiguration.port().orElse(0));
+            VIRTUAL_HOST.writeTo(properties, runtimeConfiguration.virtualHost().orElse(""));
+            EXCHANGE_NAME.writeTo(properties, runtimeConfiguration.exchangeName());
+            EXCHANGE_DURABLE.writeTo(properties, runtimeConfiguration.exchangeDurable());
+            WAIT_FOR_CONNECTION.writeTo(properties, runtimeConfiguration.waitForConnection());
+            USE_SSL.writeTo(properties, runtimeConfiguration.useSsl());
             return new RabbitMQEventTopicPublisher(properties);
         } else {
             LOGGER.info("JFlu-producer is disabled. EventPublisher will not publish anywhere.");
@@ -47,6 +47,6 @@ public void init(ProducerRuntimeConfiguration runtimeConfiguration, ProducerBuil
     }
 
     private boolean isEnabled() {
-        return buildConfiguration != null && buildConfiguration.enabled;
+        return buildConfiguration != null && buildConfiguration.enabled();
     }
 }

jflu-producer-rabbitmq-quarkus/src/main/java/be/looorent/jflu/publisher/rabbitmq/quarkus/ProducerBuildConfiguration.java

@@ -1,23 +1,18 @@
 package be.looorent.jflu.publisher.rabbitmq.quarkus;
 
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 
 import static io.quarkus.runtime.annotations.ConfigPhase.BUILD_AND_RUN_TIME_FIXED;
 
-@ConfigRoot(name = "jflu.producer.rabbitmq", phase = BUILD_AND_RUN_TIME_FIXED)
-public class ProducerBuildConfiguration {
+@ConfigMapping(prefix = "quarkus.jflu.producer.rabbitmq")
+@ConfigRoot(phase = BUILD_AND_RUN_TIME_FIXED)
+public interface ProducerBuildConfiguration {
 
     /**
      * Produces event or not
      */
-    @ConfigItem(defaultValue = "false")
-    public boolean enabled;
-
-    @Override
-    public String toString() {
-        return "ProducerBuildConfiguration{" +
-                "enabled=" + enabled +
-                '}';
-    }
+    @WithDefault("false")
+    boolean enabled();
 }

jflu-producer-rabbitmq-quarkus/src/main/java/be/looorent/jflu/publisher/rabbitmq/quarkus/ProducerRecorder.java

@@ -1,20 +1,29 @@
 package be.looorent.jflu.publisher.rabbitmq.quarkus;
 
 import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
 import org.jboss.logging.Logger;
 
 @Recorder
 public class ProducerRecorder {
     private static final Logger LOGGER = Logger.getLogger(ProducerRecorder.class);
-    public void configureBuild(ProducerBuildConfiguration buildConfig, BeanContainer container) {
-        LOGGER.infof("JFLU Producer enabled? -> %b", buildConfig.enabled);
+
+    private final RuntimeValue<ProducerRuntimeConfiguration> runtimeConfig;
+    private final ProducerBuildConfiguration buildConfig;
+
+    public ProducerRecorder(RuntimeValue<ProducerRuntimeConfiguration> runtimeConfig,
+                            ProducerBuildConfiguration buildConfig) {
+        this.runtimeConfig = runtimeConfig;
+        this.buildConfig = buildConfig;
+    }
+
+    public void configureBuild(BeanContainer container) {
+        LOGGER.infof("JFLU Producer enabled? -> %b", buildConfig.enabled());
     }
 
-    public void configureRuntime(ProducerRuntimeConfiguration runtimeConfig,
-                                 ProducerBuildConfiguration buildConfig,
-                                 BeanContainer container) {
-        container.beanInstance(EventPublisherProducer.class).init(runtimeConfig, buildConfig);
-        container.beanInstance(EventFactoryProducer.class).init(runtimeConfig, buildConfig);
+    public void configureRuntime(BeanContainer container) {
+        container.beanInstance(EventPublisherProducer.class).init(runtimeConfig.getValue(), buildConfig);
+        container.beanInstance(EventFactoryProducer.class).init(runtimeConfig.getValue(), buildConfig);
     }
 }

jflu-producer-rabbitmq-quarkus/src/main/java/be/looorent/jflu/publisher/rabbitmq/quarkus/ProducerRuntimeConfiguration.java

@@ -1,86 +1,67 @@
 package be.looorent.jflu.publisher.rabbitmq.quarkus;
 
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 
 import java.util.Optional;
 import java.util.OptionalInt;
 
 import static io.quarkus.runtime.annotations.ConfigPhase.RUN_TIME;
 
-@ConfigRoot(name = "jflu.producer.rabbitmq", phase = RUN_TIME)
-public class ProducerRuntimeConfiguration {
+@ConfigMapping(prefix = "quarkus.jflu.producer.rabbitmq")
+@ConfigRoot(phase = RUN_TIME)
+public interface ProducerRuntimeConfiguration {
     /**
      * RabbitMQ's username
      */
-    @ConfigItem
-    public Optional<String> username;
+    Optional<String> username();
 
     /**
      * RabbitMQ's password
      */
-    @ConfigItem
-    public Optional<String> password;
+    Optional<String> password();
 
     /**
      * RabbitMQ's host
      */
-    @ConfigItem
-    public String host;
+    String host();
 
     /**
      * RabbitMQ's port
      */
-    @ConfigItem(defaultValue = "5672")
-    public OptionalInt port;
+    @WithDefault("5672")
+    OptionalInt port();
 
     /**
      * RabbitMQ's virtual host
      */
-    @ConfigItem(defaultValue = "/")
-    public Optional<String> virtualHost;
+    @WithDefault("/")
+    Optional<String> virtualHost();
     /**
      * RabbitMQ's exchange name
      */
-    @ConfigItem
-    public String exchangeName;
+    String exchangeName();
 
     /**
      * Name of emitter for each event
      */
-    @ConfigItem
-    public String emitter;
+    String emitter();
 
     /**
      * Whether the event must be flagged with "exchange durable" or not
      */
-    @ConfigItem
-    public boolean exchangeDurable;
+    boolean exchangeDurable();
 
     /**
      * Wait for RabbitMQ to be reachable
      */
-    @ConfigItem(defaultValue = "false")
-    public boolean waitForConnection;
+    @WithDefault("false")
+    boolean waitForConnection();
 
     /**
      * Use SSL with the RabbitMQ's management API or not
      */
-    @ConfigItem(defaultValue = "false")
-    public boolean useSsl;
-
-    @Override
-    public String toString() {
-        return "ProducerRuntimeConfiguration{" +
-                "username=" + username +
-                ", host='" + host + '\'' +
-                ", port=" + port +
-                ", virtualHost=" + virtualHost +
-                ", exchangeName='" + exchangeName + '\'' +
-                ", emitter='" + emitter + '\'' +
-                ", exchangeDurable=" + exchangeDurable +
-                ", waitForConnection=" + waitForConnection +
-                ", useSsl=" + useSsl +
-                '}';
-    }
+    @WithDefault("false")
+    boolean useSsl();
 }