From 9fd098a84cf4f8ce1e717ebd9eb6551adc94732a Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Fri, 8 Mar 2024 17:02:19 +0100 Subject: [PATCH] Rename SmallRye Reactive Messaging extensions to Messaging --- bom/application/pom.xml | 93 +++++++++-- .../io/quarkus/deployment/Capability.java | 5 + .../java/io/quarkus/deployment/Feature.java | 12 +- devtools/bom-descriptor-json/pom.xml | 156 +++++++++--------- .../base/README.tpl.qute.md | 6 +- .../main/resources/application.tpl.qute.yml | 6 +- .../messaging-codestart/codestart.yml | 10 ++ .../org/acme/MyMessagingApplication.java} | 4 +- .../org/acme/MyMessagingApplicationTest.java} | 4 +- .../codestart.yml | 10 -- docs/pom.xml | 156 +++++++++--------- docs/src/main/asciidoc/amqp-dev-services.adoc | 2 +- docs/src/main/asciidoc/amqp-reference.adoc | 12 +- docs/src/main/asciidoc/amqp.adoc | 14 +- .../apicurio-registry-dev-services.adoc | 2 +- .../main/asciidoc/credentials-provider.adoc | 4 +- .../asciidoc/deploying-to-kubernetes.adoc | 2 +- docs/src/main/asciidoc/dev-services.adoc | 6 +- .../src/main/asciidoc/kafka-dev-services.adoc | 4 +- docs/src/main/asciidoc/kafka-dev-ui.adoc | 4 +- ...tarted.adoc => kafka-getting-started.adoc} | 14 +- .../asciidoc/kafka-schema-registry-avro.adoc | 6 +- .../kafka-schema-registry-json-schema.adoc | 8 +- docs/src/main/asciidoc/kafka-streams.adoc | 8 +- docs/src/main/asciidoc/kafka.adoc | 26 +-- docs/src/main/asciidoc/kotlin.adoc | 2 +- .../asciidoc/messaging-virtual-threads.adoc | 6 +- docs/src/main/asciidoc/opentelemetry.adoc | 6 +- .../main/asciidoc/pulsar-dev-services.adoc | 4 +- .../main/asciidoc/pulsar-getting-started.adoc | 14 +- docs/src/main/asciidoc/pulsar.adoc | 28 ++-- .../main/asciidoc/rabbitmq-dev-services.adoc | 2 +- .../src/main/asciidoc/rabbitmq-reference.adoc | 8 +- docs/src/main/asciidoc/rabbitmq.adoc | 18 +- .../main/asciidoc/telemetry-micrometer.adoc | 2 +- docs/src/main/asciidoc/vertx-reference.adoc | 8 +- extensions/opentelemetry/runtime/pom.xml | 2 +- .../deployment/pom.xml | 10 +- .../deployment/AmqpDevServicesProcessor.java | 2 +- ...mallRyeReactiveMessagingAmqpProcessor.java | 2 +- .../smallrye-reactive-messaging-amqp/pom.xml | 4 +- .../runtime/pom.xml | 8 +- .../resources/META-INF/quarkus-extension.yaml | 6 +- .../deployment/pom.xml | 10 +- ...ReactiveMessagingKafkaBuildTimeConfig.java | 2 +- ...allRyeReactiveMessagingKafkaProcessor.java | 2 +- .../smallrye-reactive-messaging-kafka/pom.xml | 4 +- .../runtime/pom.xml | 8 +- .../kafka/ReactiveMessagingKafkaConfig.java | 2 +- .../resources/META-INF/quarkus-extension.yaml | 8 +- .../deployment/pom.xml | 10 +- .../deployment/MqttDevServicesProcessor.java | 2 +- ...mallRyeReactiveMessagingMqttProcessor.java | 2 +- .../smallrye-reactive-messaging-mqtt/pom.xml | 4 +- .../runtime/pom.xml | 8 +- .../resources/META-INF/quarkus-extension.yaml | 4 +- .../deployment/pom.xml | 10 +- .../PulsarDevServicesProcessor.java | 2 +- ...eactiveMessagingPulsarBuildTimeConfig.java | 2 +- ...llRyeReactiveMessagingPulsarProcessor.java | 4 +- .../pom.xml | 4 +- .../runtime/pom.xml | 8 +- .../resources/META-INF/quarkus-extension.yaml | 6 +- .../deployment/pom.xml | 10 +- .../RabbitMQDevServicesProcessor.java | 2 +- ...RyeReactiveMessagingRabbitMQProcessor.java | 2 +- .../pom.xml | 4 +- .../runtime/pom.xml | 8 +- .../resources/META-INF/quarkus-extension.yaml | 4 +- .../deployment/pom.xml | 8 +- .../ReactiveMessagingBuildTimeConfig.java | 2 +- .../SmallRyeReactiveMessagingProcessor.java | 2 +- ...sabledConnectorAttachmentIncomingTest.java | 2 +- ...sabledConnectorAttachmentOutgoingTest.java | 2 +- .../kotlin/pom.xml | 6 +- .../smallrye-reactive-messaging/pom.xml | 4 +- .../runtime/pom.xml | 9 +- ...iveMessagingConfigFallbackInterceptor.java | 25 +++ ...iveMessagingConfigRelocateInterceptor.java | 25 +++ .../ReactiveMessagingConfiguration.java | 2 +- .../resources/META-INF/quarkus-extension.yaml | 7 +- ...io.smallrye.config.ConfigSourceInterceptor | 2 + ...-descriptor-999-SNAPSHOT-999-SNAPSHOT.json | 6 +- integration-tests/devmode/pom.xml | 2 +- .../DevUIReactiveMessagingJsonRPCTest.java | 2 +- .../quarkus/QuarkusCodestartBuildIT.java | 2 +- .../quarkus/ReactiveMessagingCodestartIT.java | 12 +- .../AbstractRemoveExtensionsTest.java | 6 +- ...love_quark_us_MyMessagingApplication.java} | 4 +- ..._quark_us_MyMessagingApplicationTest.java} | 4 +- ...love_quark_us_MyMessagingApplication.java} | 4 +- ..._quark_us_MyMessagingApplicationTest.java} | 4 +- .../kafka-oauth-keycloak/pom.xml | 4 +- integration-tests/kafka-sasl-elytron/pom.xml | 4 +- .../quarkus-standard-way-kafka/pom.xml | 4 +- .../opentelemetry-reactive-messaging/pom.xml | 4 +- .../reactive-messaging-amqp/pom.xml | 4 +- .../reactive-messaging-hibernate-orm/pom.xml | 4 +- .../pom.xml | 4 +- .../reactive-messaging-kafka/pom.xml | 4 +- .../reactive-messaging-mqtt/pom.xml | 4 +- .../reactive-messaging-pulsar/pom.xml | 4 +- .../reactive-messaging-rabbitmq-dyn/pom.xml | 4 +- .../reactive-messaging-rabbitmq/pom.xml | 4 +- .../resteasy-reactive-kotlin/standard/pom.xml | 4 +- .../amqp-virtual-threads/pom.xml | 4 +- .../jms-virtual-threads/pom.xml | 4 +- .../kafka-virtual-threads/pom.xml | 4 +- relocations/generaterelocations.java | 16 ++ relocations/pom.xml | 13 ++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ .../pom.xml | 22 +++ tcks/microprofile-reactive-messaging/pom.xml | 6 +- 124 files changed, 903 insertions(+), 462 deletions(-) rename devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/{reactive-messaging-codestart => messaging-codestart}/base/README.tpl.qute.md (66%) rename devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/{reactive-messaging-codestart => messaging-codestart}/base/src/main/resources/application.tpl.qute.yml (73%) create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/codestart.yml rename devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/{reactive-messaging-codestart/java/src/main/java/org/acme/MyReactiveMessagingApplication.java => messaging-codestart/java/src/main/java/org/acme/MyMessagingApplication.java} (91%) rename devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/{reactive-messaging-codestart/java/src/test/java/org/acme/MyReactiveMessagingApplicationTest.java => messaging-codestart/java/src/test/java/org/acme/MyMessagingApplicationTest.java} (87%) delete mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/codestart.yml rename docs/src/main/asciidoc/{kafka-reactive-getting-started.adoc => kafka-getting-started.adoc} (97%) create mode 100644 extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigFallbackInterceptor.java create mode 100644 extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigRelocateInterceptor.java create mode 100644 extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor rename integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/{testKafkaContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java => testAMQPContent/src_main_java_ilove_quark_us_MyMessagingApplication.java} (91%) rename integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/{src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java => src_test_java_ilove_quark_us_MyMessagingApplicationTest.java} (87%) rename integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/{testAMQPContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java => testKafkaContent/src_main_java_ilove_quark_us_MyMessagingApplication.java} (91%) rename integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/{src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java => src_test_java_ilove_quark_us_MyMessagingApplicationTest.java} (87%) create mode 100644 relocations/quarkus-smallrye-reactive-messaging-amqp-deployment/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-amqp/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-deployment/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-kafka-deployment/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-kafka/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-kotlin/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-mqtt-deployment/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-mqtt/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-pulsar-deployment/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-pulsar/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-rabbitmq-deployment/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging-rabbitmq/pom.xml create mode 100644 relocations/quarkus-smallrye-reactive-messaging/pom.xml diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 416081863695b..dd7998df06214 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -1522,67 +1522,67 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-kotlin + quarkus-messaging-kotlin ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-pulsar + quarkus-messaging-pulsar ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-pulsar-deployment + quarkus-messaging-pulsar-deployment ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-amqp + quarkus-messaging-amqp ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-amqp-deployment + quarkus-messaging-amqp-deployment ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-mqtt + quarkus-messaging-mqtt ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-mqtt-deployment + quarkus-messaging-mqtt-deployment ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq + quarkus-messaging-rabbitmq ${project.version} io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq-deployment + quarkus-messaging-rabbitmq-deployment ${project.version} @@ -6526,6 +6526,73 @@ quarkus-spring-web-resteasy-classic-deployment ${project.version} + + + + io.quarkus + quarkus-smallrye-reactive-messaging + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-kotlin + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-deployment + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-kafka + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-kafka-deployment + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-pulsar + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-pulsar-deployment + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-amqp + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-amqp-deployment + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-mqtt + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-mqtt-deployment + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-rabbitmq + ${project.version} + + + io.quarkus + quarkus-smallrye-reactive-messaging-rabbitmq-deployment + ${project.version} + diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java index cb86e4a416160..ccac2064b6255 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java @@ -140,7 +140,12 @@ public interface Capability { String KAFKA = QUARKUS_PREFIX + ".kafka"; + @Deprecated + /** + * @deprecated use {@link #MESSAGING} instead + */ String SMALLRYE_REACTIVE_MESSAGING = QUARKUS_PREFIX + ".smallrye.reactive.messaging"; + String MESSAGING = QUARKUS_PREFIX + ".messaging"; String REDIS_CLIENT = QUARKUS_PREFIX + ".redis"; String CACHE = QUARKUS_PREFIX + ".cache"; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java index df6f6737bcf32..066beb6502c50 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java @@ -131,12 +131,12 @@ public enum Feature { SMALLRYE_JWT, SMALLRYE_METRICS, SMALLRYE_OPENAPI, - SMALLRYE_REACTIVE_MESSAGING, - SMALLRYE_REACTIVE_MESSAGING_KAFKA, - SMALLRYE_REACTIVE_MESSAGING_AMQP, - SMALLRYE_REACTIVE_MESSAGING_MQTT, - SMALLRYE_REACTIVE_MESSAGING_RABBITMQ, - SMALLRYE_REACTIVE_MESSAGING_PULSAR, + MESSAGING, + MESSAGING_KAFKA, + MESSAGING_AMQP, + MESSAGING_MQTT, + MESSAGING_RABBITMQ, + MESSAGING_PULSAR, SMALLRYE_REACTIVE_STREAMS_OPERATORS, SMALLRYE_REACTIVE_TYPE_CONVERTERS, SMALLRYE_GRAPHQL, diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml index 08ece66d3f7ad..3bd719fcf959b 100644 --- a/devtools/bom-descriptor-json/pom.xml +++ b/devtools/bom-descriptor-json/pom.xml @@ -1318,6 +1318,84 @@ + + io.quarkus + quarkus-messaging + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-amqp + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-kafka + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-mqtt + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-pulsar + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-rabbitmq + ${project.version} + pom + test + + + * + * + + + io.quarkus quarkus-micrometer @@ -2514,84 +2592,6 @@ - - io.quarkus - quarkus-smallrye-reactive-messaging - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-amqp - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-kafka - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-mqtt - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-pulsar - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq - ${project.version} - pom - test - - - * - * - - - io.quarkus quarkus-smallrye-reactive-streams-operators diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/base/README.tpl.qute.md b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/base/README.tpl.qute.md similarity index 66% rename from devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/base/README.tpl.qute.md rename to devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/base/README.tpl.qute.md index 4b89133ba542e..d1f55731de018 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/base/README.tpl.qute.md +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/base/README.tpl.qute.md @@ -2,11 +2,11 @@ {#each input.selected-extensions-ga} {#switch it} -{#case 'io.quarkus:quarkus-smallrye-reactive-messaging-kafka'} +{#case 'io.quarkus:quarkus-messaging-kafka'} [Related Apache Kafka guide section...](https://quarkus.io/guides/kafka-reactive-getting-started) -{#case 'io.quarkus:quarkus-smallrye-reactive-messaging-amqp'} +{#case 'io.quarkus:quarkus-messaging-amqp'} [Related Apache AMQP 1.0 guide section...](https://quarkus.io/guides/amqp) {/switch} -{/each} \ No newline at end of file +{/each} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/base/src/main/resources/application.tpl.qute.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/base/src/main/resources/application.tpl.qute.yml similarity index 73% rename from devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/base/src/main/resources/application.tpl.qute.yml rename to devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/base/src/main/resources/application.tpl.qute.yml index 43a617e888278..c99225b19aa2c 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/base/src/main/resources/application.tpl.qute.yml +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/base/src/main/resources/application.tpl.qute.yml @@ -1,6 +1,6 @@ {#each input.selected-extensions-ga} {#switch it} -{#case 'io.quarkus:quarkus-smallrye-reactive-messaging-kafka'} +{#case 'io.quarkus:quarkus-messaging-kafka'} mp: messaging: outgoing: @@ -13,7 +13,7 @@ mp: offset: reset: earliest -{#case 'io.quarkus:quarkus-smallrye-reactive-messaging-amqp'} +{#case 'io.quarkus:quarkus-messaging-amqp'} mp: messaging: outgoing: @@ -23,4 +23,4 @@ mp: words-in: address: words {/switch} -{/each} \ No newline at end of file +{/each} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/codestart.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/codestart.yml new file mode 100644 index 0000000000000..47f772d3b06ab --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/codestart.yml @@ -0,0 +1,10 @@ +name: messaging-codestart +ref: messaging +tags: extension-codestart +type: code +metadata: + title: Messaging codestart + description: Use Quarkus Messaging +language: + base: + dependencies: diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/main/java/org/acme/MyReactiveMessagingApplication.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/java/src/main/java/org/acme/MyMessagingApplication.java similarity index 91% rename from devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/main/java/org/acme/MyReactiveMessagingApplication.java rename to devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/java/src/main/java/org/acme/MyMessagingApplication.java index 8e05b96dd60b6..c2254aff79618 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/main/java/org/acme/MyReactiveMessagingApplication.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/java/src/main/java/org/acme/MyMessagingApplication.java @@ -9,7 +9,7 @@ import java.util.stream.Stream; @ApplicationScoped -public class MyReactiveMessagingApplication { +public class MyMessagingApplication { @Inject @Channel("words-out") @@ -20,7 +20,7 @@ public class MyReactiveMessagingApplication { * Messages are sent to the broker. **/ void onStart(@Observes StartupEvent ev) { - Stream.of("Hello", "with", "SmallRye", "reactive", "message").forEach(string -> emitter.send(string)); + Stream.of("Hello", "with", "Quarkus", "Messaging", "message").forEach(string -> emitter.send(string)); } /** diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/test/java/org/acme/MyReactiveMessagingApplicationTest.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/java/src/test/java/org/acme/MyMessagingApplicationTest.java similarity index 87% rename from devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/test/java/org/acme/MyReactiveMessagingApplicationTest.java rename to devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/java/src/test/java/org/acme/MyMessagingApplicationTest.java index 33bef2283995d..26b5971a06b6a 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/test/java/org/acme/MyReactiveMessagingApplicationTest.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/messaging-codestart/java/src/test/java/org/acme/MyMessagingApplicationTest.java @@ -12,10 +12,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest -class MyReactiveMessagingApplicationTest { +class MyMessagingApplicationTest { @Inject - MyReactiveMessagingApplication application; + MyMessagingApplication application; @Test void test() { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/codestart.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/codestart.yml deleted file mode 100644 index 50e0bedddb2c1..0000000000000 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/codestart.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: reactive-messaging-codestart -ref: reactive-messaging -tags: extension-codestart -type: code -metadata: - title: Reactive Messaging codestart - description: Use SmallRye Reactive Messaging -language: - base: - dependencies: diff --git a/docs/pom.xml b/docs/pom.xml index 0a5aacc53f629..7e96fa36caba9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1334,6 +1334,84 @@ + + io.quarkus + quarkus-messaging-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-amqp-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-kafka-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-mqtt-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-pulsar-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-messaging-rabbitmq-deployment + ${project.version} + pom + test + + + * + * + + + io.quarkus quarkus-micrometer-deployment @@ -2530,84 +2608,6 @@ - - io.quarkus - quarkus-smallrye-reactive-messaging-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-amqp-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-mqtt-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-pulsar-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq-deployment - ${project.version} - pom - test - - - * - * - - - io.quarkus quarkus-smallrye-reactive-streams-operators-deployment diff --git a/docs/src/main/asciidoc/amqp-dev-services.adoc b/docs/src/main/asciidoc/amqp-dev-services.adoc index f68fb219e3abc..0c1c921b86ff6 100644 --- a/docs/src/main/asciidoc/amqp-dev-services.adoc +++ b/docs/src/main/asciidoc/amqp-dev-services.adoc @@ -7,7 +7,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc include::_attributes.adoc[] :categories: messaging :summary: Start AMQP automatically in dev and test modes. -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-amqp +:extensions: io.quarkus:quarkus-messaging-amqp :topics: messaging,amqp,dev-services,testing,dev-mode Dev Services for AMQP automatically starts an AMQP 1.0 broker in dev mode and when running tests. diff --git a/docs/src/main/asciidoc/amqp-reference.adoc b/docs/src/main/asciidoc/amqp-reference.adoc index 10cdff6374bae..3f543b44faaac 100644 --- a/docs/src/main/asciidoc/amqp-reference.adoc +++ b/docs/src/main/asciidoc/amqp-reference.adoc @@ -6,7 +6,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc = Reactive Messaging AMQP 1.0 Connector Reference Documentation include::_attributes.adoc[] :categories: messaging -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-amqp +:extensions: io.quarkus:quarkus-messaging-amqp :topics: messaging,amqp This guide is the companion from the xref:amqp.adoc[Getting Started with AMQP 1.0]. @@ -22,11 +22,11 @@ Check <> to get more details. == AMQP connector extension -To use the connector, you need to add the `quarkus-smallrye-reactive-messaging-amqp` extension. +To use the connector, you need to add the `quarkus-messaging-amqp` extension. You can add the extension to your project using: -:add-extension-extensions: quarkus-smallrye-reactive-messaging-amqp +:add-extension-extensions: quarkus-messaging-amqp include::{includes}/devtools/extension-add.adoc[] Or just add the following dependency to your project: @@ -36,14 +36,14 @@ Or just add the following dependency to your project: ---- io.quarkus - quarkus-smallrye-reactive-messaging-amqp + quarkus-messaging-amqp ---- [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"] .build.gradle ---- -implementation("io.quarkus:quarkus-smallrye-reactive-messaging-amqp") +implementation("io.quarkus:quarkus-messaging-amqp") ---- Once added to your project, you can map _channels_ to AMQP addresses by configuring the `connector` attribute: @@ -68,7 +68,7 @@ This auto-attachment can be disabled using: [source, properties] ---- -quarkus.reactive-messaging.auto-connector-attachment=false +quarkus.messaging.auto-connector-attachment=false ---- ==== diff --git a/docs/src/main/asciidoc/amqp.adoc b/docs/src/main/asciidoc/amqp.adoc index 29aac0172ef54..d36d6391cb059 100644 --- a/docs/src/main/asciidoc/amqp.adoc +++ b/docs/src/main/asciidoc/amqp.adoc @@ -3,16 +3,16 @@ This guide is maintained in the main Quarkus repository and pull requests should be submitted there: https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc //// -= Getting Started to SmallRye Reactive Messaging with AMQP 1.0 += Getting Started to Quarkus Messaging with AMQP 1.0 include::_attributes.adoc[] :categories: messaging -:summary: This guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with AMQP. -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-amqp +:summary: This guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with AMQP. +:extensions: io.quarkus:quarkus-messaging-amqp :topics: messaging,amqp -This guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with AMQP 1.0. +This guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with AMQP 1.0. -IMPORTANT: If you want to use RabbitMQ, you should use the xref:rabbitmq.adoc[SmallRye Reactive Messaging RabbitMQ extension]. +IMPORTANT: If you want to use RabbitMQ, you should use the xref:rabbitmq.adoc[Quarkus Messaging RabbitMQ extension]. Alternatively, if you want to use RabbitMQ with AMQP 1.0 you need to enable the AMQP 1.0 plugin in the RabbitMQ broker; check the https://smallrye.io/smallrye-reactive-messaging/smallrye-reactive-messaging/3.9/amqp/amqp.html#amqp-rabbitmq[connecting to RabbitMQ] documentation. @@ -58,7 +58,7 @@ First, we need to create two projects: the _producer_ and the _processor_. To create the _producer_ project, in a terminal run: :create-app-artifact-id: amqp-quickstart-producer -:create-app-extensions: rest-jackson,smallrye-reactive-messaging-amqp +:create-app-extensions: rest-jackson,messaging-amqp :create-app-post-command: include::{includes}/devtools/create-app.adoc[] @@ -70,7 +70,7 @@ This command creates the project structure and select the two Quarkus extensions To create the _processor_ project, from the same directory, run: :create-app-artifact-id: amqp-quickstart-processor -:create-app-extensions: smallrye-reactive-messaging-amqp +:create-app-extensions: messaging-amqp :create-app-post-command: include::{includes}/devtools/create-app.adoc[] diff --git a/docs/src/main/asciidoc/apicurio-registry-dev-services.adoc b/docs/src/main/asciidoc/apicurio-registry-dev-services.adoc index fc4f80b948176..5a3819edc8811 100644 --- a/docs/src/main/asciidoc/apicurio-registry-dev-services.adoc +++ b/docs/src/main/asciidoc/apicurio-registry-dev-services.adoc @@ -8,7 +8,7 @@ include::_attributes.adoc[] :categories: messaging :summary: Start Apicurio Registry automatically in dev and test modes. :topics: messaging,kafka,apicurio,registry,dev-services,dev-mode,testing -:extensions: io.quarkus:quarkus-apicurio-registry-avro,io.quarkus:quarkus-smallrye-reactive-messaging-kafka +:extensions: io.quarkus:quarkus-apicurio-registry-avro,io.quarkus:quarkus-messaging-kafka If an extension for schema registry, such as `quarkus-apicurio-registry-avro` or `quarkus-confluent-registry-avro`, is present, Dev Services for Apicurio Registry automatically starts an Apicurio Registry instance in dev mode and when running tests. Also, all Kafka channels in SmallRye Reactive Messaging are automatically configured to use this registry. diff --git a/docs/src/main/asciidoc/credentials-provider.adoc b/docs/src/main/asciidoc/credentials-provider.adoc index 579ea95715fc9..a651b5dca1fba 100644 --- a/docs/src/main/asciidoc/credentials-provider.adoc +++ b/docs/src/main/asciidoc/credentials-provider.adoc @@ -37,7 +37,7 @@ by the following credentials consumer extensions: * `reactive-pg-client` * `oidc` * `oidc-client` -* `smallrye-reactive-messaging-rabbitmq` +* `messaging-rabbitmq` All extensions that rely on username/password authentication also allow setting configuration properties in the `application.properties` as an alternative. But the `Credentials Provider` is the only option @@ -114,7 +114,7 @@ property is less than the credentials expiration time. === RabbitMQ -When using the `smallrye-reactive-messaging-rabbitmq` extension there is no configuration needed. The +When using the `messaging-rabbitmq` extension there is no configuration needed. The extension will automatically recycle connections before their credentials expire based on the expiration timestamp provided by the Credentials Provider. diff --git a/docs/src/main/asciidoc/deploying-to-kubernetes.adoc b/docs/src/main/asciidoc/deploying-to-kubernetes.adoc index be05f697039ed..523793c9373bc 100644 --- a/docs/src/main/asciidoc/deploying-to-kubernetes.adoc +++ b/docs/src/main/asciidoc/deploying-to-kubernetes.adoc @@ -1508,7 +1508,7 @@ To enable Service Binding for supported extensions, add the `quarkus-kubernetes- * `quarkus-mongodb-client` * `quarkus-kafka-client` -* `quarkus-smallrye-reactive-messaging-kafka` +* `quarkus-messaging-kafka` * `quarkus-reactive-db2-client` * `quarkus-reactive-mssql-client` diff --git a/docs/src/main/asciidoc/dev-services.adoc b/docs/src/main/asciidoc/dev-services.adoc index d8dff1bd729e2..f8aea5e5c5f14 100644 --- a/docs/src/main/asciidoc/dev-services.adoc +++ b/docs/src/main/asciidoc/dev-services.adoc @@ -28,7 +28,7 @@ If you don't have Docker installed you will need to configure your services norm == AMQP -The AMQP Dev Service will be enabled when the `quarkus-smallrye-reactive-messaging-amqp` extension is present in your application, and +The AMQP Dev Service will be enabled when the `quarkus-messaging-amqp` extension is present in your application, and the broker address has not been explicitly configured. More information can be found in the xref:amqp-dev-services.adoc[AMQP Dev Services Guide]. @@ -94,7 +94,7 @@ include::{generated-dir}/config/quarkus-mongodb-config-group-dev-services-build- == RabbitMQ -The RabbitMQ Dev Service will be enabled when the `quarkus-smallrye-reactive-messaging-rabbitmq` extension is present in your application, and +The RabbitMQ Dev Service will be enabled when the `quarkus-messaging-rabbitmq` extension is present in your application, and the broker address has not been explicitly configured. More information can be found in the xref:rabbitmq-dev-services.adoc[RabbitMQ Dev Services Guide]. @@ -102,7 +102,7 @@ include::{generated-dir}/config/quarkus-smallrye-reactivemessaging-rabbitmq-conf == Pulsar -The Pulsar Dev Service will be enabled when the `quarkus-smallrye-reactive-messaging-pulsar` extension is present in your application, and +The Pulsar Dev Service will be enabled when the `quarkus-messaging-pulsar` extension is present in your application, and the broker address has not been explicitly configured. More information can be found in the xref:pulsar-dev-services.adoc[Pulsar Dev Services Guide]. diff --git a/docs/src/main/asciidoc/kafka-dev-services.adoc b/docs/src/main/asciidoc/kafka-dev-services.adoc index 0382a8f3209ae..2937185d7bfe3 100644 --- a/docs/src/main/asciidoc/kafka-dev-services.adoc +++ b/docs/src/main/asciidoc/kafka-dev-services.adoc @@ -8,9 +8,9 @@ include::_attributes.adoc[] :categories: messaging :summary: Start Apache Kafka automatically in dev and test modes. :topics: messaging,kafka,dev-services,testing,dev-mode -:extensions: io.quarkus:quarkus-kafka-client,io.quarkus:quarkus-smallrye-reactive-messaging-kafka +:extensions: io.quarkus:quarkus-kafka-client,io.quarkus:quarkus-messaging-kafka -If any Kafka-related extension is present (e.g. `quarkus-smallrye-reactive-messaging-kafka`), Dev Services for Kafka automatically starts a Kafka broker in dev mode and when running tests. +If any Kafka-related extension is present (e.g. `quarkus-messaging-kafka`), Dev Services for Kafka automatically starts a Kafka broker in dev mode and when running tests. So, you don't have to start a broker manually. The application is configured automatically. diff --git a/docs/src/main/asciidoc/kafka-dev-ui.adoc b/docs/src/main/asciidoc/kafka-dev-ui.adoc index 90cf6335f6961..230cac7810e53 100644 --- a/docs/src/main/asciidoc/kafka-dev-ui.adoc +++ b/docs/src/main/asciidoc/kafka-dev-ui.adoc @@ -8,9 +8,9 @@ include::_attributes.adoc[] :categories: messaging :summary: Dev UI extension for Apache Kafka for development purposes. :topics: messaging,kafka,dev-ui,dev-mode -:extensions: io.quarkus:quarkus-kafka-client,io.quarkus:quarkus-smallrye-reactive-messaging-kafka +:extensions: io.quarkus:quarkus-kafka-client,io.quarkus:quarkus-messaging-kafka -If any Kafka-related extension is present (e.g. `quarkus-smallrye-reactive-messaging-kafka`), +If any Kafka-related extension is present (e.g. `quarkus-messaging-kafka`), the Quarkus Dev UI is extended with a Kafka broker management UI. It is connected automatically to the Kafka broker configured for the application. diff --git a/docs/src/main/asciidoc/kafka-reactive-getting-started.adoc b/docs/src/main/asciidoc/kafka-getting-started.adoc similarity index 97% rename from docs/src/main/asciidoc/kafka-reactive-getting-started.adoc rename to docs/src/main/asciidoc/kafka-getting-started.adoc index ab03e6bfab1f0..86c795b6e7062 100644 --- a/docs/src/main/asciidoc/kafka-reactive-getting-started.adoc +++ b/docs/src/main/asciidoc/kafka-getting-started.adoc @@ -3,14 +3,14 @@ This guide is maintained in the main Quarkus repository and pull requests should be submitted there: https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc //// -= Getting Started to SmallRye Reactive Messaging with Apache Kafka += Getting Started to Quarkus Messaging with Apache Kafka include::_attributes.adoc[] :categories: messaging -:summary: This guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with Apache Kafka. +:summary: This guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with Apache Kafka. :topics: messaging,kafka,reactive-messaging -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-kafka +:extensions: io.quarkus:quarkus-messaging-kafka -This guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with Apache Kafka. +This guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with Apache Kafka. == Prerequisites @@ -52,7 +52,7 @@ First, we need to create two projects: the _producer_ and the _processor_. To create the _producer_ project, in a terminal run: :create-app-artifact-id: kafka-quickstart-producer -:create-app-extensions: rest-jackson,smallrye-reactive-messaging-kafka +:create-app-extensions: rest-jackson,messaging-kafka :create-app-post-command: include::{includes}/devtools/create-app.adoc[] @@ -64,7 +64,7 @@ This command creates the project structure and selects two Quarkus extensions we To create the _processor_ project, from the same directory, run: :create-app-artifact-id: kafka-quickstart-processor -:create-app-extensions: smallrye-reactive-messaging-kafka +:create-app-extensions: messaging-kafka :create-app-post-command: include::{includes}/devtools/create-app.adoc[] @@ -507,7 +507,7 @@ For the exhaustive list of features and configuration options, check the xref:ka [NOTE] ==== -In this guide we explore Smallrye Reactive Messaging framework to interact with Apache Kafka. +In this guide we explore how we can interact with Apache Kafka using the Quarkus Messaging extensions. Quarkus extension for Kafka also allows xref:kafka.adoc#kafka-bare-clients[using Kafka clients directly]. ==== diff --git a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc index 268b558c1434b..6a7766b8034fd 100644 --- a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc +++ b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc @@ -8,7 +8,7 @@ include::_attributes.adoc[] :categories: messaging :summary: Use Apache Kafka, Avro serialized records, and connect to a schema registry. :topics: messaging,kafka,apicurio,registry -:extensions: io.quarkus:quarkus-apicurio-registry-avro,io.quarkus:quarkus-smallrye-reactive-messaging-kafka +:extensions: io.quarkus:quarkus-apicurio-registry-avro,io.quarkus:quarkus-messaging-kafka This guide shows how your Quarkus application can use Apache Kafka, https://avro.apache.org/docs/current/[Avro] serialized records, and connect to a schema registry (such as the https://docs.confluent.io/platform/current/schema-registry/index.html[Confluent Schema Registry] or https://www.apicur.io/registry/[Apicurio Registry]). @@ -49,7 +49,7 @@ The solution is located in the `kafka-avro-schema-quickstart` link:{quickstarts- First, we need a new project. Create a new project with the following command: :create-app-artifact-id: kafka-avro-schema-quickstart -:create-app-extensions: rest-jackson,smallrye-reactive-messaging-kafka,apicurio-registry-avro +:create-app-extensions: rest-jackson,messaging-kafka,apicurio-registry-avro include::{includes}/devtools/create-app.adoc[] [TIP] @@ -247,7 +247,7 @@ See xref:kafka-dev-services.adoc[Dev Services for Kafka] and xref:apicurio-regis [TIP] ==== You might have noticed that we didn't configure the schema registry URL anywhere. -This is because Dev Services for Apicurio Registry configures all Kafka channels in SmallRye Reactive Messaging to use the automatically started registry instance. +This is because Dev Services for Apicurio Registry configures all Kafka channels in Quarkus Messaging to use the automatically started registry instance. Apicurio Registry, in addition to its native API, also exposes an endpoint that is API-compatible with Confluent Schema Registry. Therefore, this automatic configuration works both for Apicurio Registry serde and Confluent Schema Registry serde. diff --git a/docs/src/main/asciidoc/kafka-schema-registry-json-schema.adoc b/docs/src/main/asciidoc/kafka-schema-registry-json-schema.adoc index 88c164eabb646..63d540d191a59 100644 --- a/docs/src/main/asciidoc/kafka-schema-registry-json-schema.adoc +++ b/docs/src/main/asciidoc/kafka-schema-registry-json-schema.adoc @@ -8,7 +8,7 @@ include::_attributes.adoc[] :categories: messaging :summary: Use Apache Kafka, Json Schema serialized records, and connect to a schema registry. :topics: messaging,kafka,apicurio,registry -:extensions: io.quarkus:quarkus-apicurio-registry-json-schema,io.quarkus:quarkus-smallrye-reactive-messaging-kafka +:extensions: io.quarkus:quarkus-apicurio-registry-json-schema,io.quarkus:quarkus-messaging-kafka This guide shows how your Quarkus application can use Apache Kafka, https://json-schema.org/[JSON Schema] serialized records, and connect to a schema registry (such as the https://docs.confluent.io/platform/current/schema-registry/index.html[Confluent Schema Registry] or https://www.apicur.io/registry/[Apicurio Registry]). @@ -49,7 +49,7 @@ The solution is located in the `kafka-json-schema-quickstart` link:{quickstarts- First, we need a new project. Create a new project with the following command: :create-app-artifact-id: kafka-json-schema-quickstart -:create-app-extensions: rest-jackson,smallrye-reactive-messaging-kafka,apicurio-registry-json-schema +:create-app-extensions: rest-jackson,messaging-kafka,apicurio-registry-json-schema include::{includes}/devtools/create-app.adoc[] [TIP] @@ -167,7 +167,7 @@ To achieve this, edit the `application.properties` file, and add the following c mp.messaging.outgoing.movies.connector=smallrye-kafka # disable automatic detection of the serializers -quarkus.reactive-messaging.kafka.serializer-autodetection.enabled=false +quarkus.messaging.kafka.serializer-autodetection.enabled=false # Set the value serializer for the channel `movies` mp.messaging.outgoing.movies.value.serializer=io.apicurio.registry.serde.jsonschema.JsonSchemaKafkaSerializer @@ -275,7 +275,7 @@ See xref:kafka-dev-services.adoc[Dev Services for Kafka] and xref:apicurio-regis [TIP] ==== You might have noticed that we didn't configure the schema registry URL anywhere. -This is because Dev Services for Apicurio Registry configures all Kafka channels in SmallRye Reactive Messaging to use the automatically started registry instance. +This is because Dev Services for Apicurio Registry configures all Kafka channels in Quarkus Messaging to use the automatically started registry instance. Apicurio Registry, in addition to its native API, also exposes an endpoint that is API-compatible with Confluent Schema Registry. Therefore, this automatic configuration works both for Apicurio Registry serde and Confluent Schema Registry serde. diff --git a/docs/src/main/asciidoc/kafka-streams.adoc b/docs/src/main/asciidoc/kafka-streams.adoc index 2a9ed7cf5a7b9..db79bb2e9557e 100644 --- a/docs/src/main/asciidoc/kafka-streams.adoc +++ b/docs/src/main/asciidoc/kafka-streams.adoc @@ -87,10 +87,10 @@ include::{includes}/devtools/create-app.adoc[] This command generates a Maven project, importing the Reactive Messaging and Kafka connector extensions. -If you already have your Quarkus project configured, you can add the `smallrye-reactive-messaging-kafka` extension +If you already have your Quarkus project configured, you can add the `messaging-kafka` extension to your project by running the following command in your project base directory: -:add-extension-extensions: quarkus-smallrye-reactive-messaging-kafka +:add-extension-extensions: quarkus-messaging-kafka include::{includes}/devtools/extension-add.adoc[] This will add the following to your build file: @@ -100,14 +100,14 @@ This will add the following to your build file: ---- io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka ---- [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"] .build.gradle ---- -implementation("io.quarkus:quarkus-smallrye-reactive-messaging-kafka") +implementation("io.quarkus:quarkus-messaging-kafka") ---- === The Temperature Value Producer diff --git a/docs/src/main/asciidoc/kafka.adoc b/docs/src/main/asciidoc/kafka.adoc index d9e913df1c87b..60509c7c861b3 100644 --- a/docs/src/main/asciidoc/kafka.adoc +++ b/docs/src/main/asciidoc/kafka.adoc @@ -6,14 +6,14 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc = Apache Kafka Reference Guide include::_attributes.adoc[] :categories: messaging -:summary: This reference guide provides an in-depth look on Apache Kafka and Smallrye Reactive Messaging framework. +:summary: This reference guide provides an in-depth look on Apache Kafka and Quarkus Messaging extensions. :numbered: :sectnums: :sectnumlevels: 4 :topics: messaging,kafka,reactive-messaging -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-kafka +:extensions: io.quarkus:quarkus-messaging-kafka -This reference guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with Apache Kafka. +This reference guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with Apache Kafka. == Introduction @@ -35,12 +35,12 @@ Based on Eclipse MicroProfile Reactive Messaging specification 2.0, it proposes [NOTE] ==== This guide provides an in-depth look on Apache Kafka and SmallRye Reactive Messaging framework. -For a quick start take a look at xref:kafka-reactive-getting-started.adoc[Getting Started to SmallRye Reactive Messaging with Apache Kafka]. +For a quick start take a look at xref:kafka-getting-started.adoc[Getting Started to Quarkus Messaging with Apache Kafka]. ==== -You can add the `smallrye-reactive-messaging-kafka` extensions to your project by running the following command in your project base directory: +You can add the `messaging-kafka` extension to your project by running the following command in your project base directory: -:add-extension-extensions: smallrye-reactive-messaging-kafka +:add-extension-extensions: messaging-kafka include::{includes}/devtools/extension-add.adoc[] This will add the following to your build file: @@ -50,14 +50,14 @@ This will add the following to your build file: ---- io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka ---- [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"] .build.gradle ---- -implementation("io.quarkus:quarkus-smallrye-reactive-messaging-kafka") +implementation("io.quarkus:quarkus-messaging-kafka") ---- [NOTE] @@ -98,7 +98,7 @@ This auto-attachment can be disabled using: [source, properties] ---- -quarkus.reactive-messaging.auto-connector-attachment=false +quarkus.messaging.auto-connector-attachment=false ---- ==== @@ -1888,7 +1888,7 @@ This is described in a dedicated guide: xref:kafka-schema-registry-json-schema.a [[serialization-autodetection]] == Serializer/deserializer autodetection -When using SmallRye Reactive Messaging with Kafka (`io.quarkus:quarkus-smallrye-reactive-messaging-kafka`), Quarkus can often automatically detect the correct serializer and deserializer class. +When using Quarkus Messaging with Kafka (`io.quarkus:quarkus-messaging-kafka`), Quarkus can often automatically detect the correct serializer and deserializer class. This autodetection is based on declarations of `@Incoming` and `@Outgoing` methods, as well as injected ``@Channel``s. For example, if you declare @@ -1953,7 +1953,7 @@ The full set of types supported by the serializer/deserializer autodetection is: If a serializer/deserializer is set by configuration, it won't be replaced by the autodetection. -In case you have any issues with serializer autodetection, you can switch it off completely by setting `quarkus.reactive-messaging.kafka.serializer-autodetection.enabled=false`. +In case you have any issues with serializer autodetection, you can switch it off completely by setting `quarkus.messaging.kafka.serializer-autodetection.enabled=false`. If you find you need to do this, please file a bug in the link:https://github.com/quarkusio/quarkus/issues[Quarkus issue tracker] so we can fix whatever problem you have. [[serialization-generation]] @@ -1969,7 +1969,7 @@ This generation can be disabled using: [source, properties] ---- -quarkus.reactive-messaging.kafka.serializer-generation.enabled=false +quarkus.messaging.kafka.serializer-generation.enabled=false ---- IMPORTANT: Generation does not support collections such as `List`. @@ -3380,6 +3380,6 @@ The configuration properties necessary to access the Kafka and Schema Registry i == Going further This guide has shown how you can interact with Kafka using Quarkus. -It utilizes SmallRye Reactive Messaging to build data streaming applications. +It utilizes Quarkus Messaging to build data streaming applications. If you want to go further, check the documentation of https://smallrye.io/smallrye-reactive-messaging[SmallRye Reactive Messaging], the implementation used in Quarkus. diff --git a/docs/src/main/asciidoc/kotlin.adoc b/docs/src/main/asciidoc/kotlin.adoc index 4ba737b70e8da..eb2710ebd3347 100644 --- a/docs/src/main/asciidoc/kotlin.adoc +++ b/docs/src/main/asciidoc/kotlin.adoc @@ -492,7 +492,7 @@ The following extensions provide support for Kotlin Coroutines by allowing the u |`quarkus-rest-client` |Support is provided for REST Client interface methods -|`quarkus-smallrye-reactive-messaging` +|`quarkus-messaging` |Support is provided for Reactive messaging methods |`quarkus-scheduler` diff --git a/docs/src/main/asciidoc/messaging-virtual-threads.adoc b/docs/src/main/asciidoc/messaging-virtual-threads.adoc index 1569da634f025..afe842986ef53 100644 --- a/docs/src/main/asciidoc/messaging-virtual-threads.adoc +++ b/docs/src/main/asciidoc/messaging-virtual-threads.adoc @@ -7,7 +7,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc include::_attributes.adoc[] :categories: messaging :topics: messaging,kafka,reactive-messaging,virtual-threads -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-kafka +:extensions: io.quarkus:quarkus-messaging-kafka :runonvthread: https://javadoc.io/doc/io.smallrye.common/smallrye-common-annotation/latest/io/smallrye/common/annotation/RunOnVirtualThread.html :rm_blocking_annotation: https://javadoc.io/doc/io.smallrye.reactive/smallrye-reactive-messaging-api/latest/io/smallrye/reactive/messaging/annotations/Blocking.html :rm_blocking_docs: http://smallrye.io/smallrye-reactive-messaging/4.8.0/concepts/blocking/ @@ -47,14 +47,14 @@ First, make sure to have a reactive messaging extension dependency to your build ---- io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka ---- [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"] .build.gradle ---- -implementation("io.quarkus:quarkus-smallrye-reactive-messaging-kafka") +implementation("io.quarkus:quarkus-messaging-kafka") ---- You also need to make sure that you are using Java 19 or later (we recommend 21+), this can be enforced in your `pom.xml` file with the following: diff --git a/docs/src/main/asciidoc/opentelemetry.adoc b/docs/src/main/asciidoc/opentelemetry.adoc index e202ca612b444..2a621b0c5c14f 100644 --- a/docs/src/main/asciidoc/opentelemetry.adoc +++ b/docs/src/main/asciidoc/opentelemetry.adoc @@ -597,9 +597,9 @@ public void tracedWork() { } ---- -=== SmallRye Reactive Messaging - Kafka +=== Quarkus Messaging - Kafka -When using the SmallRye Reactive Messaging extension for Kafka, +When using the Quarkus Messaging extension for Kafka, we are able to propagate the span into the Kafka Record with: [source,java] @@ -645,7 +645,7 @@ Additional exporters will be available in the Quarkiverse https://github.com/qua * https://quarkus.io/guides/resteasy-client[`quarkus-resteasy-client`] * https://quarkus.io/guides/scheduler[`quarkus-scheduler`] * https://quarkus.io/guides/smallrye-graphql[`quarkus-smallrye-graphql`] -* https://quarkus.io/extensions/io.quarkus/quarkus-smallrye-reactive-messaging[`quarkus-smallrye-reactive-messaging`] +* https://quarkus.io/extensions/io.quarkus/quarkus-messaging[`quarkus-messaging`] ** AMQP 1.0 ** RabbitMQ ** Kafka diff --git a/docs/src/main/asciidoc/pulsar-dev-services.adoc b/docs/src/main/asciidoc/pulsar-dev-services.adoc index f1f8743bceadb..6f45c5b4a4677 100644 --- a/docs/src/main/asciidoc/pulsar-dev-services.adoc +++ b/docs/src/main/asciidoc/pulsar-dev-services.adoc @@ -7,9 +7,9 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc include::_attributes.adoc[] :categories: messaging :topics: messaging,reactive-messaging,pulsar,dev-services,testing,dev-mode -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-pulsar +:extensions: io.quarkus:quarkus-messaging-pulsar -With Quarkus Smallrye Reactive Messaging Pulsar extension (`quarkus-smallrye-reactive-messaging-pulsar`) +With Quarkus Messaging Pulsar extension (`quarkus-messaging-pulsar`) Dev Services for Pulsar automatically starts a Pulsar broker in dev mode and when running tests. So, you don't have to start a broker manually. The application is configured automatically. diff --git a/docs/src/main/asciidoc/pulsar-getting-started.adoc b/docs/src/main/asciidoc/pulsar-getting-started.adoc index e4aa51ed2485f..fad78b33259ca 100644 --- a/docs/src/main/asciidoc/pulsar-getting-started.adoc +++ b/docs/src/main/asciidoc/pulsar-getting-started.adoc @@ -3,14 +3,14 @@ This guide is maintained in the main Quarkus repository and pull requests should be submitted there: https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc //// -= Getting Started to SmallRye Reactive Messaging with Apache Pulsar += Getting Started to Quarkus Messaging with Apache Pulsar include::_attributes.adoc[] :categories: messaging :topics: messaging,reactive-messaging,pulsar -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-pulsar -:summary: This guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with Apache Pulsar. +:extensions: io.quarkus:quarkus-messaging-pulsar +:summary: This guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with Apache Pulsar. -This guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with Apache Pulsar. +This guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with Apache Pulsar. == Prerequisites @@ -52,7 +52,7 @@ First, we need to create two projects: the _producer_ and the _processor_. To create the _producer_ project, in a terminal run: :create-app-artifact-id: pulsar-quickstart-producer -:create-app-extensions: rest-jackson,smallrye-reactive-messaging-pulsar +:create-app-extensions: rest-jackson,messaging-pulsar :create-app-post-command: include::{includes}/devtools/create-app.adoc[] @@ -64,7 +64,7 @@ This command creates the project structure and selects two Quarkus extensions we To create the _processor_ project, from the same directory, run: :create-app-artifact-id: pulsar-quickstart-processor -:create-app-extensions: smallrye-reactive-messaging-pulsar +:create-app-extensions: messaging-pulsar :create-app-post-command: include::{includes}/devtools/create-app.adoc[] @@ -509,6 +509,6 @@ For the exhaustive list of features and configuration options, check the xref:pu [NOTE] ==== -In this guide we explore Smallrye Reactive Messaging framework to interact with Apache Pulsar. +In this guide we explore how to interact with Apache Pulsar using the Quarkus Messaging extensions. xref:pulsar.adoc#configuring-pulsar-clients[using Pulsar clients directly]. ==== diff --git a/docs/src/main/asciidoc/pulsar.adoc b/docs/src/main/asciidoc/pulsar.adoc index f1888dc09a1d8..5ebbe6c71f993 100644 --- a/docs/src/main/asciidoc/pulsar.adoc +++ b/docs/src/main/asciidoc/pulsar.adoc @@ -6,14 +6,14 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc = Apache Pulsar Reference Guide include::_attributes.adoc[] :categories: messaging -:summary: This reference guide provides an in-depth look on Apache Pulsar and Smallrye Reactive Messaging framework. +:summary: This reference guide provides an in-depth look on Apache Pulsar and the Quarkus Messaging extensions. :numbered: :sectnums: :sectnumlevels: 4 :topics: messaging,reactive-messaging,pulsar -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-pulsar +:extensions: io.quarkus:quarkus-messaging-pulsar -This reference guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with Apache Pulsar. +This reference guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with Apache Pulsar. == Introduction @@ -41,12 +41,12 @@ Based on Eclipse MicroProfile Reactive Messaging specification 3.0, it proposes [NOTE] ==== This guide provides an in-depth look on Apache Pulsar and SmallRye Reactive Messaging framework. -For a quick start take a look at xref:pulsar-getting-started.adoc[Getting Started to SmallRye Reactive Messaging with Apache Pulsar]. +For a quick start take a look at xref:pulsar-getting-started.adoc[Getting Started to Quarkus Messaging with Apache Pulsar]. ==== -You can add the `smallrye-reactive-messaging-pulsar` extensions to your project by running the following command in your project base directory: +You can add the `messaging-pulsar` extensions to your project by running the following command in your project base directory: -:add-extension-extensions: smallrye-reactive-messaging-pulsar +:add-extension-extensions: messaging-pulsar include::{includes}/devtools/extension-add.adoc[] This will add the following to your build file: @@ -56,14 +56,14 @@ This will add the following to your build file: ---- io.quarkus - quarkus-smallrye-reactive-messaging-pulsar + quarkus-messaging-pulsar ---- [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"] .build.gradle ---- -implementation("io.quarkus:quarkus-smallrye-reactive-messaging-pulsar") +implementation("io.quarkus:quarkus-messaging-pulsar") ---- [NOTE] @@ -71,9 +71,9 @@ implementation("io.quarkus:quarkus-smallrye-reactive-messaging-pulsar") The extension includes `pulsar-clients-original` version 3.0.0 as a transitive dependency and is compatible with Pulsar brokers version 2.10.x. ==== -== Configuring Smallrye Pulsar Connector +== Configuring SmallRye Pulsar Connector -Because Smallrye Reactive Messaging framework supports different messaging backends like Apache Kafka, Apache Pulsar, AMQP, Apache Camel, JMS, MQTT, etc., it employs a generic vocabulary: +Because SmallRye Reactive Messaging framework supports different messaging backends like Apache Kafka, Apache Pulsar, AMQP, Apache Camel, JMS, MQTT, etc., it employs a generic vocabulary: - Applications send and receive *messages*. https://javadoc.io/doc/io.smallrye.reactive/smallrye-reactive-messaging-api/latest/org/eclipse/microprofile/reactive/messaging/Message.html[`Message`] wraps a _payload_ and can be extended with some _metadata_. This should not be confused with a Pulsar https://javadoc.io/doc/org.apache.pulsar/pulsar-client-api/latest/org/apache/pulsar/client/api/Message.html[`Message`], which consists of value, key @@ -113,7 +113,7 @@ This auto-attachment can be disabled using: [source, properties] ---- -quarkus.reactive-messaging.auto-connector-attachment=false +quarkus.messaging.auto-connector-attachment=false ---- ==== @@ -883,7 +883,7 @@ If no schema information is provided incoming channels will use `Schema.AUTO_CON === Auto Schema Discovery -When using SmallRye Reactive Messaging Pulsar (`io.quarkus:quarkus-smallrye-reactive-messaging-pulsar`), Quarkus can often automatically detect the correct Pulsar Schema to configure. +When using Quarkus Messaging Pulsar (`io.quarkus:quarkus-messaging-pulsar`), Quarkus can often automatically detect the correct Pulsar Schema to configure. This autodetection is based on declarations of `@Incoming` and `@Outgoing` methods, as well as injected ``@Channel``s. For example, if you declare @@ -955,7 +955,7 @@ a Schema will be generated using the Jackson `ObjectMapper`, without enforcing a If a `schema` is set by configuration, it won't be replaced by the auto-detection. -In case you have any issues with serializer auto-detection, you can switch it off completely by setting `quarkus.reactive-messaging.pulsar.serializer-autodetection.enabled=false`. +In case you have any issues with serializer auto-detection, you can switch it off completely by setting `quarkus.messaging.pulsar.serializer-autodetection.enabled=false`. If you find you need to do this, please file a bug in the link:https://github.com/quarkusio/quarkus/issues[Quarkus issue tracker] so we can fix whatever problem you have. [[pulsar-dev-services]] @@ -1311,6 +1311,6 @@ Configuration properties not configurable in configuration files (non-serializab == Going further This guide has shown how you can interact with Pulsar using Quarkus. -It utilizes SmallRye Reactive Messaging to build data streaming applications. +It utilizes Quarkus Messaging to build data streaming applications. If you want to go further, check the documentation of https://smallrye.io/smallrye-reactive-messaging[SmallRye Reactive Messaging], the implementation used in Quarkus. diff --git a/docs/src/main/asciidoc/rabbitmq-dev-services.adoc b/docs/src/main/asciidoc/rabbitmq-dev-services.adoc index cf416e7ba075c..7a6fd2870814a 100644 --- a/docs/src/main/asciidoc/rabbitmq-dev-services.adoc +++ b/docs/src/main/asciidoc/rabbitmq-dev-services.adoc @@ -7,7 +7,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc include::_attributes.adoc[] :categories: messaging :topics: messaging,reactive-messaging,rabbitmq,dev-services,testing,dev-mode -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-rabbitmq +:extensions: io.quarkus:quarkus-messaging-rabbitmq Dev Services for RabbitMQ automatically starts a RabbitMQ broker in dev mode and when running tests. So, you don't have to start a broker manually. diff --git a/docs/src/main/asciidoc/rabbitmq-reference.adoc b/docs/src/main/asciidoc/rabbitmq-reference.adoc index f8d2bda05b14e..a4bf77788ea9e 100644 --- a/docs/src/main/asciidoc/rabbitmq-reference.adoc +++ b/docs/src/main/asciidoc/rabbitmq-reference.adoc @@ -8,7 +8,7 @@ include::_attributes.adoc[] :extension-status: preview :categories: messaging :topics: messaging,reactive-messaging,rabbitmq,dev-services,testing,dev-mode -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-rabbitmq +:extensions: io.quarkus:quarkus-messaging-rabbitmq This guide is the companion from the xref:rabbitmq.adoc[Getting Started with RabbitMQ]. It explains in more details the configuration and usage of the RabbitMQ connector for reactive messaging. @@ -27,13 +27,13 @@ include::{includes}/extension-status.adoc[] == RabbitMQ connector extension -To use the connector, you need to add the `quarkus-smallrye-reactive-messaging-rabbitmq` extension. +To use the connector, you need to add the `quarkus-messaging-rabbitmq` extension. You can add the extension to your project using: [source, bash] ---- -> ./mvnw quarkus:add-extensions -Dextensions="quarkus-smallrye-reactive-messaging-rabbitmq" +> ./mvnw quarkus:add-extensions -Dextensions="quarkus-messaging-rabbitmq" ---- Or just add the following dependency to your project: @@ -42,7 +42,7 @@ Or just add the following dependency to your project: ---- io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq + quarkus-messaging-rabbitmq ---- diff --git a/docs/src/main/asciidoc/rabbitmq.adoc b/docs/src/main/asciidoc/rabbitmq.adoc index 5a8d023ef2cd8..7e271f83876c1 100644 --- a/docs/src/main/asciidoc/rabbitmq.adoc +++ b/docs/src/main/asciidoc/rabbitmq.adoc @@ -3,14 +3,14 @@ This guide is maintained in the main Quarkus repository and pull requests should be submitted there: https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc //// -= Getting Started to SmallRye Reactive Messaging with RabbitMQ += Getting Started to Quarkus Messaging with RabbitMQ :extension-status: preview include::_attributes.adoc[] :categories: messaging :topics: messaging,reactive-messaging,rabbitmq -:extensions: io.quarkus:quarkus-smallrye-reactive-messaging-rabbitmq +:extensions: io.quarkus:quarkus-messaging-rabbitmq -This guide demonstrates how your Quarkus application can utilize SmallRye Reactive Messaging to interact with RabbitMQ. +This guide demonstrates how your Quarkus application can utilize Quarkus Messaging to interact with RabbitMQ. include::{includes}/extension-status.adoc[] @@ -54,7 +54,7 @@ First, we need to create two projects: the _producer_ and the _processor_. To create the _producer_ project, in a terminal run: :create-app-artifact-id: rabbitmq-quickstart-producer -:create-app-extensions: smallrye-reactive-messaging-rabbitmq,rest-jackson +:create-app-extensions: messaging-rabbitmq,rest-jackson :create-app-post-command: include::{includes}/devtools/create-app.adoc[] @@ -65,10 +65,10 @@ This command creates the project structure and select the two Quarkus extensions [TIP] ==== -If you already have your Quarkus project configured, you can add the `smallrye-reactive-messaging-rabbitmq` extension +If you already have your Quarkus project configured, you can add the `messaging-rabbitmq` extension to your project by running the following command in your project base directory: -:add-extension-extensions: smallrye-reactive-messaging-rabbitmq +:add-extension-extensions: messaging-rabbitmq include::{includes}/devtools/extension-add.adoc[] This will add the following to your `pom.xml`: @@ -78,21 +78,21 @@ This will add the following to your `pom.xml`: ---- io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq + quarkus-messaging-rabbitmq ---- [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"] .build.gradle ---- -implementation("io.quarkus:quarkus-smallrye-reactive-messaging-rabbitmq") +implementation("io.quarkus:quarkus-messaging-rabbitmq") ---- ==== To create the _processor_ project, from the same directory, run: :create-app-artifact-id: rabbitmq-quickstart-processor -:create-app-extensions: smallrye-reactive-messaging-rabbitmq +:create-app-extensions: messaging-rabbitmq :create-app-post-command: include::{includes}/devtools/create-app.adoc[] diff --git a/docs/src/main/asciidoc/telemetry-micrometer.adoc b/docs/src/main/asciidoc/telemetry-micrometer.adoc index 22bcce923ddea..e88295d9afb9f 100644 --- a/docs/src/main/asciidoc/telemetry-micrometer.adoc +++ b/docs/src/main/asciidoc/telemetry-micrometer.adoc @@ -751,7 +751,7 @@ Refer to the xref:./management-interface-reference.adoc[management interface ref * https://quarkus.io/guides/resteasy-client[`quarkus-resteasy-client`] * https://quarkus.io/guides/scheduler[`quarkus-scheduler`] * https://quarkus.io/guides/smallrye-graphql[`quarkus-smallrye-graphql`] -* https://quarkus.io/extensions/io.quarkus/quarkus-smallrye-reactive-messaging[`quarkus-smallrye-reactive-messaging`] +* https://quarkus.io/extensions/io.quarkus/quarkus-messaging[`quarkus-messaging`] ** AMQP 1.0 ** RabbitMQ ** Kafka diff --git a/docs/src/main/asciidoc/vertx-reference.adoc b/docs/src/main/asciidoc/vertx-reference.adoc index 88f5105834800..70f8cbf3e3f4e 100644 --- a/docs/src/main/asciidoc/vertx-reference.adoc +++ b/docs/src/main/asciidoc/vertx-reference.adoc @@ -83,8 +83,8 @@ Check the associated documentation to learn how to use them. |Documentation |AMQP Client -|`io.quarkus:quarkus-smallrye-reactive-messaging-amqp` (extension) -|xref:amqp.adoc[Getting Started to SmallRye Reactive Messaging with AMQP] +|`io.quarkus:quarkus-messaging-amqp` (extension) +|xref:amqp.adoc[Getting Started to Quarkus Messaging with AMQP] |Circuit Breaker |`io.smallrye.reactive:smallrye-mutiny-vertx-circuit-breaker` (external dependency) @@ -99,7 +99,7 @@ Check the associated documentation to learn how to use them. |xref:reactive-sql-clients.adoc[Reactive SQL Clients] |Kafka Client -|`io.quarkus:quarkus-smallrye-reactive-messaging-kafka` (extension) +|`io.quarkus:quarkus-messaging-kafka` (extension) |xref:kafka.adoc[Apache Kafka Reference Guide] |Mail Client @@ -107,7 +107,7 @@ Check the associated documentation to learn how to use them. |xref:mailer.adoc[Sending emails using SMTP] |MQTT Client -|`io.quarkus:quarkus-smallrye-reactive-messaging-mqtt` (extension) +|`io.quarkus:quarkus-messaging-mqtt` (extension) |No guide yet |MS SQL Client diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml index a00664a9560ab..acd03f1762e5d 100644 --- a/extensions/opentelemetry/runtime/pom.xml +++ b/extensions/opentelemetry/runtime/pom.xml @@ -58,7 +58,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging true diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml b/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml index ecd53ab12ed09..69691de56ac95 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-amqp-parent + quarkus-messaging-amqp-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-amqp-deployment - Quarkus - SmallRye Reactive Messaging - AMQP 1.0 - Deployment + quarkus-messaging-amqp-deployment + Quarkus - Messaging - AMQP 1.0 - Deployment @@ -20,11 +20,11 @@ io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment io.quarkus - quarkus-smallrye-reactive-messaging-amqp + quarkus-messaging-amqp io.quarkus diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java index adc0cc2555bd7..4797f9cf9907d 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java @@ -210,7 +210,7 @@ private RunningDevService getRunningService(String containerId, Closeable closea configMap.put(AMQP_MAPPED_PORT_PROP, String.valueOf(mappedPort)); configMap.put(AMQP_USER_PROP, DEFAULT_USER); configMap.put(AMQP_PASSWORD_PROP, DEFAULT_PASSWORD); - return new RunningDevService(Feature.SMALLRYE_REACTIVE_MESSAGING_AMQP.getName(), containerId, closeable, configMap); + return new RunningDevService(Feature.MESSAGING_AMQP.getName(), containerId, closeable, configMap); } private boolean hasAmqpChannelWithoutHostAndPort() { diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/SmallRyeReactiveMessagingAmqpProcessor.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/SmallRyeReactiveMessagingAmqpProcessor.java index d8ea700cff28b..e833218bad8ef 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/SmallRyeReactiveMessagingAmqpProcessor.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/SmallRyeReactiveMessagingAmqpProcessor.java @@ -8,7 +8,7 @@ public class SmallRyeReactiveMessagingAmqpProcessor { @BuildStep FeatureBuildItem feature() { - return new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_MESSAGING_AMQP); + return new FeatureBuildItem(Feature.MESSAGING_AMQP); } } diff --git a/extensions/smallrye-reactive-messaging-amqp/pom.xml b/extensions/smallrye-reactive-messaging-amqp/pom.xml index 8c0d42c64e5e7..fe6e93aaad2af 100644 --- a/extensions/smallrye-reactive-messaging-amqp/pom.xml +++ b/extensions/smallrye-reactive-messaging-amqp/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - quarkus-smallrye-reactive-messaging-amqp-parent - Quarkus - SmallRye Reactive Messaging - AMQP 1.0 + quarkus-messaging-amqp-parent + Quarkus - Messaging - AMQP 1.0 pom diff --git a/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml b/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml index 419590811addb..539547dcc75aa 100644 --- a/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-amqp-parent + quarkus-messaging-amqp-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-amqp - Quarkus - SmallRye Reactive Messaging - AMQP 1.0 - Runtime + quarkus-messaging-amqp + Quarkus - Messaging - AMQP 1.0 - Runtime Connect to AMQP with Reactive Messaging @@ -24,7 +24,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkus diff --git a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml index dd55665d3d076..83e46fbf4a358 100644 --- a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,6 +1,6 @@ --- artifact: ${project.groupId}:${project.artifactId}:${project.version} -name: "SmallRye Reactive Messaging - AMQP Connector" +name: "Messaging - AMQP Connector" metadata: short-name: "amqp" keywords: @@ -12,10 +12,10 @@ metadata: status: "stable" config: - "mp.messaging." - - "quarkus.reactive-messaging." + - "quarkus.messaging." - "quarkus.amqp." codestart: - name: "reactive-messaging" + name: "messaging" languages: - "java" artifact: "io.quarkus:quarkus-project-core-extension-codestarts" diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml index dd31c1e8c2109..ee98dc61ef876 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-parent + quarkus-messaging-kafka-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-kafka-deployment - Quarkus - SmallRye Reactive Messaging - Kafka - Deployment + quarkus-messaging-kafka-deployment + Quarkus - Messaging - Kafka - Deployment @@ -20,7 +20,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment io.quarkus @@ -32,7 +32,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/ReactiveMessagingKafkaBuildTimeConfig.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/ReactiveMessagingKafkaBuildTimeConfig.java index 38fc4535612b0..512684e84111b 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/ReactiveMessagingKafkaBuildTimeConfig.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/ReactiveMessagingKafkaBuildTimeConfig.java @@ -4,7 +4,7 @@ import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; -@ConfigRoot(name = "reactive-messaging.kafka", phase = ConfigPhase.BUILD_TIME) +@ConfigRoot(name = "messaging.kafka", phase = ConfigPhase.BUILD_TIME) public class ReactiveMessagingKafkaBuildTimeConfig { /** * Whether or not Kafka serializer/deserializer auto-detection is enabled. diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java index 7a042db169703..df4f15d53c438 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java @@ -64,7 +64,7 @@ public class SmallRyeReactiveMessagingKafkaProcessor { @BuildStep FeatureBuildItem feature() { - return new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_MESSAGING_KAFKA); + return new FeatureBuildItem(Feature.MESSAGING_KAFKA); } @BuildStep diff --git a/extensions/smallrye-reactive-messaging-kafka/pom.xml b/extensions/smallrye-reactive-messaging-kafka/pom.xml index d8acb1fcd1a42..e8e835ebfff33 100644 --- a/extensions/smallrye-reactive-messaging-kafka/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - quarkus-smallrye-reactive-messaging-kafka-parent - Quarkus - SmallRye Reactive Messaging - Kafka + quarkus-messaging-kafka-parent + Quarkus - Messaging - Kafka pom diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml b/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml index 3d13beb2ab886..1850842ce57dd 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-parent + quarkus-messaging-kafka-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-kafka - Quarkus - SmallRye Reactive Messaging - Kafka - Runtime + quarkus-messaging-kafka + Quarkus - Messaging - Kafka - Runtime Connect to Kafka with Reactive Messaging @@ -49,7 +49,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.smallrye.reactive diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/ReactiveMessagingKafkaConfig.java b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/ReactiveMessagingKafkaConfig.java index 8278f33d0c1e3..6865cb3c79e0d 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/ReactiveMessagingKafkaConfig.java +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/ReactiveMessagingKafkaConfig.java @@ -3,7 +3,7 @@ import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigRoot; -@ConfigRoot(name = "reactive-messaging.kafka") +@ConfigRoot(name = "messaging.kafka") public class ReactiveMessagingKafkaConfig { /** diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 16c2f38660922..c2b45b5d7739d 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,21 +1,21 @@ --- artifact: ${project.groupId}:${project.artifactId}:${project.version} -name: "SmallRye Reactive Messaging - Kafka Connector" +name: "Messaging - Kafka Connector" metadata: short-name: "kafka" keywords: - "kafka" - "reactive-kafka" - guide: "https://quarkus.io/guides/kafka-reactive-getting-started" + guide: "https://quarkus.io/guides/kafka-getting-started" categories: - "messaging" status: "stable" config: - "mp.messaging." - - "quarkus.reactive-messaging." + - "quarkus.messaging." - "quarkus.kafka." codestart: - name: "reactive-messaging" + name: "messaging" languages: - "java" artifact: "io.quarkus:quarkus-project-core-extension-codestarts" diff --git a/extensions/smallrye-reactive-messaging-mqtt/deployment/pom.xml b/extensions/smallrye-reactive-messaging-mqtt/deployment/pom.xml index cb14241889710..9c5788bf52222 100644 --- a/extensions/smallrye-reactive-messaging-mqtt/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging-mqtt/deployment/pom.xml @@ -6,16 +6,16 @@ io.quarkus - quarkus-smallrye-reactive-messaging-mqtt-parent + quarkus-messaging-mqtt-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-mqtt-deployment - Quarkus - SmallRye Reactive Messaging - MQTT - Deployment + quarkus-messaging-mqtt-deployment + Quarkus - Messaging - MQTT - Deployment io.quarkus - quarkus-smallrye-reactive-messaging-mqtt + quarkus-messaging-mqtt io.quarkus @@ -23,7 +23,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment io.quarkus diff --git a/extensions/smallrye-reactive-messaging-mqtt/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/mqtt/deployment/MqttDevServicesProcessor.java b/extensions/smallrye-reactive-messaging-mqtt/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/mqtt/deployment/MqttDevServicesProcessor.java index 51b6d4d516e7f..1fdc9fafa53cd 100644 --- a/extensions/smallrye-reactive-messaging-mqtt/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/mqtt/deployment/MqttDevServicesProcessor.java +++ b/extensions/smallrye-reactive-messaging-mqtt/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/mqtt/deployment/MqttDevServicesProcessor.java @@ -193,7 +193,7 @@ private RunningDevService getRunningDevService( Map configMap = new HashMap<>(); configMap.put("mp.messaging.connector.smallrye-mqtt.host", host); configMap.put("mp.messaging.connector.smallrye-mqtt.port", String.valueOf(port)); - return new RunningDevService(Feature.SMALLRYE_REACTIVE_MESSAGING_MQTT.getName(), + return new RunningDevService(Feature.MESSAGING_MQTT.getName(), containerId, closeable, configMap); } diff --git a/extensions/smallrye-reactive-messaging-mqtt/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/mqtt/deployment/SmallRyeReactiveMessagingMqttProcessor.java b/extensions/smallrye-reactive-messaging-mqtt/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/mqtt/deployment/SmallRyeReactiveMessagingMqttProcessor.java index 6c6004e8d9d21..7241ee579c0db 100644 --- a/extensions/smallrye-reactive-messaging-mqtt/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/mqtt/deployment/SmallRyeReactiveMessagingMqttProcessor.java +++ b/extensions/smallrye-reactive-messaging-mqtt/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/mqtt/deployment/SmallRyeReactiveMessagingMqttProcessor.java @@ -7,6 +7,6 @@ public class SmallRyeReactiveMessagingMqttProcessor { @BuildStep FeatureBuildItem feature() { - return new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_MESSAGING_MQTT); + return new FeatureBuildItem(Feature.MESSAGING_MQTT); } } diff --git a/extensions/smallrye-reactive-messaging-mqtt/pom.xml b/extensions/smallrye-reactive-messaging-mqtt/pom.xml index 48478275fa7e3..e988d4bd752b9 100644 --- a/extensions/smallrye-reactive-messaging-mqtt/pom.xml +++ b/extensions/smallrye-reactive-messaging-mqtt/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - quarkus-smallrye-reactive-messaging-mqtt-parent - Quarkus - SmallRye Reactive Messaging - MQTT + quarkus-messaging-mqtt-parent + Quarkus - Messaging - MQTT pom diff --git a/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml b/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml index c06b0407059e2..0864f10731380 100644 --- a/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-mqtt-parent + quarkus-messaging-mqtt-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-mqtt - Quarkus - SmallRye Reactive Messaging - MQTT - Runtime + quarkus-messaging-mqtt + Quarkus - Messaging - MQTT - Runtime Connect to MQTT with Reactive Messaging @@ -24,7 +24,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkus diff --git a/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.yaml index dd61940bd732c..fc68d838bdf4c 100644 --- a/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/smallrye-reactive-messaging-mqtt/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,6 +1,6 @@ --- artifact: ${project.groupId}:${project.artifactId}:${project.version} -name: "SmallRye Reactive Messaging - MQTT Connector" +name: "Messaging - MQTT Connector" metadata: keywords: - "mqtt" @@ -10,4 +10,4 @@ metadata: status: "preview" config: - "mp.messaging." - - "quarkus.reactive-messaging." + - "quarkus.messaging." diff --git a/extensions/smallrye-reactive-messaging-pulsar/deployment/pom.xml b/extensions/smallrye-reactive-messaging-pulsar/deployment/pom.xml index 8647639a16569..1b459de02cf68 100644 --- a/extensions/smallrye-reactive-messaging-pulsar/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging-pulsar/deployment/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-pulsar-parent + quarkus-messaging-pulsar-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-pulsar-deployment - Quarkus - SmallRye Reactive Messaging - Pulsar - Deployment + quarkus-messaging-pulsar-deployment + Quarkus - Messaging - Pulsar - Deployment @@ -24,11 +24,11 @@ io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment io.quarkus - quarkus-smallrye-reactive-messaging-pulsar + quarkus-messaging-pulsar io.quarkus diff --git a/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/PulsarDevServicesProcessor.java b/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/PulsarDevServicesProcessor.java index 6e4ff1fa51a45..f4d7dbc302eae 100644 --- a/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/PulsarDevServicesProcessor.java +++ b/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/PulsarDevServicesProcessor.java @@ -203,7 +203,7 @@ private RunningDevService getRunningService(String containerId, Closeable closea Map configMap = new HashMap<>(); configMap.put(PULSAR_CLIENT_SERVICE_URL, pulsarBrokerUrl); configMap.put(PULSAR_ADMIN_SERVICE_URL, httpServiceUrl); - return new RunningDevService(Feature.SMALLRYE_REACTIVE_MESSAGING_PULSAR.getName(), containerId, closeable, configMap); + return new RunningDevService(Feature.MESSAGING_PULSAR.getName(), containerId, closeable, configMap); } private boolean hasPulsarChannelWithoutHostAndPort() { diff --git a/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/ReactiveMessagingPulsarBuildTimeConfig.java b/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/ReactiveMessagingPulsarBuildTimeConfig.java index 34cde49902c8f..ac819771b046a 100644 --- a/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/ReactiveMessagingPulsarBuildTimeConfig.java +++ b/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/ReactiveMessagingPulsarBuildTimeConfig.java @@ -4,7 +4,7 @@ import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; -@ConfigRoot(name = "reactive-messaging.pulsar", phase = ConfigPhase.BUILD_TIME) +@ConfigRoot(name = "messaging.pulsar", phase = ConfigPhase.BUILD_TIME) public class ReactiveMessagingPulsarBuildTimeConfig { /** * Whether or not Pulsar Schema auto-detection is enabled. diff --git a/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/SmallRyeReactiveMessagingPulsarProcessor.java b/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/SmallRyeReactiveMessagingPulsarProcessor.java index a636a9d373b34..26269416f743c 100644 --- a/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/SmallRyeReactiveMessagingPulsarProcessor.java +++ b/extensions/smallrye-reactive-messaging-pulsar/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/pulsar/deployment/SmallRyeReactiveMessagingPulsarProcessor.java @@ -37,7 +37,7 @@ public class SmallRyeReactiveMessagingPulsarProcessor { @BuildStep FeatureBuildItem feature() { - return new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_MESSAGING_PULSAR); + return new FeatureBuildItem(Feature.MESSAGING_PULSAR); } @BuildStep @@ -135,7 +135,7 @@ public NativeImageConfigBuildItem pulsarRuntimeInitialized( CombinedIndexBuildItem combinedIndex, BuildProducer reflectiveClass, BuildProducer nativeSslSupport) { - nativeSslSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.SMALLRYE_REACTIVE_MESSAGING_PULSAR)); + nativeSslSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.MESSAGING_PULSAR)); reflectiveClass.produce(ReflectiveClassBuildItem .builder(ClientConfigurationData.class.getName(), ProducerConfigurationData.class.getName(), diff --git a/extensions/smallrye-reactive-messaging-pulsar/pom.xml b/extensions/smallrye-reactive-messaging-pulsar/pom.xml index 227cb9f1b1969..0798762c5965b 100644 --- a/extensions/smallrye-reactive-messaging-pulsar/pom.xml +++ b/extensions/smallrye-reactive-messaging-pulsar/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - quarkus-smallrye-reactive-messaging-pulsar-parent - Quarkus - SmallRye Reactive Messaging - Pulsar + quarkus-messaging-pulsar-parent + Quarkus - Messaging - Pulsar pom diff --git a/extensions/smallrye-reactive-messaging-pulsar/runtime/pom.xml b/extensions/smallrye-reactive-messaging-pulsar/runtime/pom.xml index 7578fe5d422fb..5be481317263d 100644 --- a/extensions/smallrye-reactive-messaging-pulsar/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-pulsar/runtime/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-pulsar-parent + quarkus-messaging-pulsar-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-pulsar - Quarkus - SmallRye Reactive Messaging - Pulsar - Runtime + quarkus-messaging-pulsar + Quarkus - Messaging - Pulsar - Runtime Connect to Apache Pulsar with Reactive Messaging @@ -93,7 +93,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkus diff --git a/extensions/smallrye-reactive-messaging-pulsar/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-pulsar/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 23f8476a9bea2..bf6085c792b62 100644 --- a/extensions/smallrye-reactive-messaging-pulsar/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/smallrye-reactive-messaging-pulsar/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,6 +1,6 @@ --- artifact: ${project.groupId}:${project.artifactId}:${project.version} -name: "SmallRye Reactive Messaging - Pulsar Connector" +name: "Messaging - Pulsar Connector" metadata: short-name: "pulsar" keywords: @@ -12,10 +12,10 @@ metadata: status: "preview" config: - "mp.messaging." - - "quarkus.reactive-messaging." + - "quarkus.messaging." - "quarkus.pulsar." codestart: - name: "reactive-messaging" + name: "messaging" languages: - "java" artifact: "io.quarkus:quarkus-project-core-extension-codestarts" diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/pom.xml b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/pom.xml index 90c7c2904e4d5..2ad48b27c23fb 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq-parent + quarkus-messaging-rabbitmq-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-rabbitmq-deployment - Quarkus - SmallRye Reactive Messaging - RabbitMQ 1.0 - Deployment + quarkus-messaging-rabbitmq-deployment + Quarkus - Messaging - RabbitMQ 1.0 - Deployment @@ -20,11 +20,11 @@ io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq + quarkus-messaging-rabbitmq io.quarkus diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java index 2ab5dc2afb125..c396889739d77 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java @@ -215,7 +215,7 @@ private RunningDevService getRunningDevService(String containerId, Closeable clo configMap.put(RABBITMQ_HTTP_PORT_PROP, String.valueOf(httpPort)); configMap.put(RABBITMQ_USERNAME_PROP, username); configMap.put(RABBITMQ_PASSWORD_PROP, password); - return new RunningDevService(Feature.SMALLRYE_REACTIVE_MESSAGING_RABBITMQ.getName(), + return new RunningDevService(Feature.MESSAGING_RABBITMQ.getName(), containerId, closeable, configMap); } diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/SmallRyeReactiveMessagingRabbitMQProcessor.java b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/SmallRyeReactiveMessagingRabbitMQProcessor.java index b0b54ffa49700..6ef67b097a462 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/SmallRyeReactiveMessagingRabbitMQProcessor.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/SmallRyeReactiveMessagingRabbitMQProcessor.java @@ -23,7 +23,7 @@ public class SmallRyeReactiveMessagingRabbitMQProcessor { @BuildStep FeatureBuildItem feature() { - return new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_MESSAGING_RABBITMQ); + return new FeatureBuildItem(Feature.MESSAGING_RABBITMQ); } @BuildStep diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/pom.xml b/extensions/smallrye-reactive-messaging-rabbitmq/pom.xml index e3086478f915c..deaab0b51968c 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/pom.xml +++ b/extensions/smallrye-reactive-messaging-rabbitmq/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - quarkus-smallrye-reactive-messaging-rabbitmq-parent - Quarkus - SmallRye Reactive Messaging - RabbitMQ 1.0 + quarkus-messaging-rabbitmq-parent + Quarkus - Messaging - RabbitMQ 1.0 pom diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/pom.xml b/extensions/smallrye-reactive-messaging-rabbitmq/runtime/pom.xml index 26e4513e46ae9..2bd2c55c6a3d4 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime/pom.xml @@ -6,12 +6,12 @@ io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq-parent + quarkus-messaging-rabbitmq-parent 999-SNAPSHOT - quarkus-smallrye-reactive-messaging-rabbitmq - Quarkus - SmallRye Reactive Messaging - RabbitMQ 1.0 - Runtime + quarkus-messaging-rabbitmq + Quarkus - Messaging - RabbitMQ 1.0 - Runtime Connect to RabbitMQ with Reactive Messaging @@ -24,7 +24,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkus diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/resources/META-INF/quarkus-extension.yaml index d5ecb45397d65..b1b74cc60eecd 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,6 +1,6 @@ --- artifact: ${project.groupId}:${project.artifactId}:${project.version} -name: "SmallRye Reactive Messaging - RabbitMQ Connector" +name: "Messaging - RabbitMQ Connector" metadata: short-name: "rabbitmq" keywords: @@ -12,5 +12,5 @@ metadata: status: "experimental" config: - "mp.messaging." - - "quarkus.reactive-messaging." + - "quarkus.messaging." - "quarkus.rabbitmq." diff --git a/extensions/smallrye-reactive-messaging/deployment/pom.xml b/extensions/smallrye-reactive-messaging/deployment/pom.xml index c99b6e63e260d..2de388adb375a 100644 --- a/extensions/smallrye-reactive-messaging/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging/deployment/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-smallrye-reactive-messaging-parent + quarkus-messaging-parent io.quarkus 999-SNAPSHOT 4.0.0 - quarkus-smallrye-reactive-messaging-deployment - Quarkus - SmallRye Reactive Messaging - Deployment + quarkus-messaging-deployment + Quarkus - Messaging - Deployment @@ -24,7 +24,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkus diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingBuildTimeConfig.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingBuildTimeConfig.java index 57eb0d4667824..a88551ef62393 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingBuildTimeConfig.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingBuildTimeConfig.java @@ -4,7 +4,7 @@ import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; -@ConfigRoot(name = "reactive-messaging", phase = ConfigPhase.BUILD_TIME) +@ConfigRoot(name = "messaging", phase = ConfigPhase.BUILD_TIME) public class ReactiveMessagingBuildTimeConfig { /** * Whether a health check is published in case the smallrye-health extension is present. diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java index b5134c2c1ca48..44e65ce0f8ef8 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java @@ -103,7 +103,7 @@ public static String getChannelPropertyKey(String channelName, String propertyNa @BuildStep FeatureBuildItem feature() { - return new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_MESSAGING); + return new FeatureBuildItem(Feature.MESSAGING); } @BuildStep diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentIncomingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentIncomingTest.java index dd059d54a748d..1ad9f20b029ae 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentIncomingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentIncomingTest.java @@ -31,7 +31,7 @@ public class DisabledConnectorAttachmentIncomingTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(MyDummyConnector.class, MySink.class)) - .overrideConfigKey("quarkus.reactive-messaging.auto-connector-attachment", "false"); + .overrideConfigKey("quarkus.messaging.auto-connector-attachment", "false"); @Inject MySink sink; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentOutgoingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentOutgoingTest.java index 0167d67092acd..a7b78b19c995b 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentOutgoingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentOutgoingTest.java @@ -30,7 +30,7 @@ public class DisabledConnectorAttachmentOutgoingTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(MyDummyConnector.class, MySource.class)) - .overrideConfigKey("quarkus.reactive-messaging.auto-connector-attachment", "false"); + .overrideConfigKey("quarkus.messaging.auto-connector-attachment", "false"); @Inject @Connector("dummy") diff --git a/extensions/smallrye-reactive-messaging/kotlin/pom.xml b/extensions/smallrye-reactive-messaging/kotlin/pom.xml index 4eb2850b6ab46..1261dc7af1a7d 100644 --- a/extensions/smallrye-reactive-messaging/kotlin/pom.xml +++ b/extensions/smallrye-reactive-messaging/kotlin/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> io.quarkus - quarkus-smallrye-reactive-messaging-parent + quarkus-messaging-parent 999-SNAPSHOT 4.0.0 - quarkus-smallrye-reactive-messaging-kotlin - Quarkus - SmallRye Reactive Messaging - Kotlin + quarkus-messaging-kotlin + Quarkus - Messaging - Kotlin diff --git a/extensions/smallrye-reactive-messaging/pom.xml b/extensions/smallrye-reactive-messaging/pom.xml index be34c59f8373d..d1ddd056a965b 100644 --- a/extensions/smallrye-reactive-messaging/pom.xml +++ b/extensions/smallrye-reactive-messaging/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - quarkus-smallrye-reactive-messaging-parent - Quarkus - SmallRye Reactive Messaging + quarkus-messaging-parent + Quarkus - Messaging pom diff --git a/extensions/smallrye-reactive-messaging/runtime/pom.xml b/extensions/smallrye-reactive-messaging/runtime/pom.xml index 30cc9bd512573..7555ee75d41ef 100644 --- a/extensions/smallrye-reactive-messaging/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging/runtime/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-smallrye-reactive-messaging-parent + quarkus-messaging-parent io.quarkus 999-SNAPSHOT 4.0.0 - quarkus-smallrye-reactive-messaging - Quarkus - SmallRye Reactive Messaging - Runtime + quarkus-messaging + Quarkus - Messaging - Runtime Produce and consume messages and implement event driven and data streaming applications @@ -22,7 +22,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kotlin + quarkus-messaging-kotlin io.quarkus @@ -90,6 +90,7 @@ io.quarkus.smallrye.reactive.messaging + io.quarkus.messaging diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigFallbackInterceptor.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigFallbackInterceptor.java new file mode 100644 index 0000000000000..bb71885af9560 --- /dev/null +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigFallbackInterceptor.java @@ -0,0 +1,25 @@ +package io.quarkus.smallrye.reactivemessaging.runtime; + +import io.smallrye.config.FallbackConfigSourceInterceptor; + +/** + * @deprecated maps the old config to the new config, should be removed at some point + */ +@Deprecated(forRemoval = true, since = "3.9") +public class ReactiveMessagingConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { + + private static final String OLD_PREFIX = "quarkus.reactive-messaging."; + private static final String NEW_PREFIX = "quarkus.messaging."; + + public ReactiveMessagingConfigFallbackInterceptor() { + super(ReactiveMessagingConfigFallbackInterceptor::rename); + } + + private static String rename(String originalName) { + if (!originalName.startsWith(NEW_PREFIX)) { + return originalName; + } + + return originalName.replaceFirst(NEW_PREFIX, OLD_PREFIX); + } +} diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigRelocateInterceptor.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigRelocateInterceptor.java new file mode 100644 index 0000000000000..be598ee9b1338 --- /dev/null +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigRelocateInterceptor.java @@ -0,0 +1,25 @@ +package io.quarkus.smallrye.reactivemessaging.runtime; + +import io.smallrye.config.RelocateConfigSourceInterceptor; + +/** + * @deprecated maps the old config to the new config, should be removed at some point + */ +@Deprecated(forRemoval = true, since = "3.9") +public class ReactiveMessagingConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { + + private static final String OLD_PREFIX = "quarkus.reactive-messaging."; + private static final String NEW_PREFIX = "quarkus.messaging."; + + public ReactiveMessagingConfigRelocateInterceptor() { + super(ReactiveMessagingConfigRelocateInterceptor::rename); + } + + private static String rename(String originalName) { + if (!originalName.startsWith(OLD_PREFIX)) { + return originalName; + } + + return originalName.replaceFirst(OLD_PREFIX, NEW_PREFIX); + } +} diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java index 45f27c1f39a34..d621e14a685f7 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java @@ -4,7 +4,7 @@ import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; -@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED) +@ConfigRoot(name = "messaging", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED) public class ReactiveMessagingConfiguration { /** diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 8c09c53a75aad..0dabfc88cf139 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,14 +1,15 @@ --- artifact: ${project.groupId}:${project.artifactId}:${project.version} -name: "SmallRye Reactive Messaging" +name: "Messaging" metadata: keywords: - - "smallrye-reactive-messaging" + - "messaging" - "reactive-messaging" - "reactive" - guide: "https://quarkus.io/guides/reactive-messaging" categories: - "messaging" status: "stable" config: + - "quarkus.messaging." + - "quarkus.smallrye-reactive-messaging." - "mp.messaging." diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor new file mode 100644 index 0000000000000..65b423bffffe4 --- /dev/null +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor @@ -0,0 +1,2 @@ +io.quarkus.smallrye.reactivemessaging.runtime.ReactiveMessagingConfigRelocateInterceptor +io.quarkus.smallrye.reactivemessaging.runtime.ReactiveMessagingConfigFallbackInterceptor \ No newline at end of file diff --git a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json index 1ee6e7f002a23..973f32cb1d933 100644 --- a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json +++ b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json @@ -1023,7 +1023,7 @@ "guide" : "https://quarkus.io/guides/kafka-reactive-getting-started", "categories" : [ "messaging" ], "status" : "stable", - "config" : [ "mp.messaging.", "quarkus.reactive-messaging.", "quarkus.kafka." ], + "config" : [ "mp.messaging.", "quarkus.messaging.", "quarkus.kafka." ], "built-with-quarkus-core" : "999-SNAPSHOT", "extension-dependencies" : [ "io.quarkus:quarkus-kafka-client", "io.quarkus:quarkus-arc", "io.quarkus:quarkus-core", "io.quarkus:quarkus-caffeine", "io.quarkus:quarkus-jackson", "io.quarkus:quarkus-smallrye-reactive-messaging", "io.quarkus:quarkus-mutiny-reactive-streams-operators", "io.quarkus:quarkus-mutiny", "io.quarkus:quarkus-smallrye-context-propagation", "io.quarkus:quarkus-vertx", "io.quarkus:quarkus-netty" ] }, @@ -1038,7 +1038,7 @@ "guide" : "https://quarkus.io/guides/amqp", "categories" : [ "messaging" ], "status" : "stable", - "config" : [ "mp.messaging.", "quarkus.reactive-messaging.", "quarkus.amqp." ], + "config" : [ "mp.messaging.", "quarkus.messaging.", "quarkus.amqp." ], "built-with-quarkus-core" : "999-SNAPSHOT", "extension-dependencies" : [ "io.quarkus:quarkus-mutiny-reactive-streams-operators", "io.quarkus:quarkus-mutiny", "io.quarkus:quarkus-core", "io.quarkus:quarkus-smallrye-context-propagation", "io.quarkus:quarkus-smallrye-reactive-messaging", "io.quarkus:quarkus-arc", "io.quarkus:quarkus-vertx", "io.quarkus:quarkus-netty", "io.quarkus:quarkus-jackson" ] }, @@ -1051,7 +1051,7 @@ "keywords" : [ "mqtt", "reactive-mqtt" ], "categories" : [ "messaging" ], "status" : "preview", - "config" : [ "mp.messaging.", "quarkus.reactive-messaging." ], + "config" : [ "mp.messaging.", "quarkus.messaging." ], "built-with-quarkus-core" : "999-SNAPSHOT", "extension-dependencies" : [ "io.quarkus:quarkus-mutiny-reactive-streams-operators", "io.quarkus:quarkus-mutiny", "io.quarkus:quarkus-core", "io.quarkus:quarkus-smallrye-context-propagation", "io.quarkus:quarkus-smallrye-reactive-messaging", "io.quarkus:quarkus-arc", "io.quarkus:quarkus-vertx", "io.quarkus:quarkus-netty", "io.quarkus:quarkus-jackson" ] }, diff --git a/integration-tests/devmode/pom.xml b/integration-tests/devmode/pom.xml index 5963045aa0889..fd04d7eb2ac6b 100644 --- a/integration-tests/devmode/pom.xml +++ b/integration-tests/devmode/pom.xml @@ -51,7 +51,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment test diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIReactiveMessagingJsonRPCTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIReactiveMessagingJsonRPCTest.java index c96ccd7b1ffc7..29ca6f0e3b7b5 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIReactiveMessagingJsonRPCTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIReactiveMessagingJsonRPCTest.java @@ -24,7 +24,7 @@ public class DevUIReactiveMessagingJsonRPCTest extends DevUIJsonRPCTest { "application.properties")); public DevUIReactiveMessagingJsonRPCTest() { - super("io.quarkus.quarkus-smallrye-reactive-messaging"); + super("io.quarkus.quarkus-messaging"); } @Test diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java index 7d70784549ed7..2e867f5aa6c60 100644 --- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java +++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartBuildIT.java @@ -41,7 +41,7 @@ class QuarkusCodestartBuildIT extends PlatformAwareTestBase { "picocli-codestart", "hibernate-orm-codestart", "hibernate-orm-rest-data-codestart", - "reactive-messaging-codestart"); + "messaging-codestart"); @BeforeAll static void setUp() throws IOException { diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/ReactiveMessagingCodestartIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/ReactiveMessagingCodestartIT.java index 1385a1cfdb71a..4637ba783c67c 100644 --- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/ReactiveMessagingCodestartIT.java +++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/ReactiveMessagingCodestartIT.java @@ -14,27 +14,27 @@ public class ReactiveMessagingCodestartIT { @RegisterExtension public static QuarkusCodestartTest kafkaCodestartTest = QuarkusCodestartTest.builder() - .extension(ArtifactKey.fromString("io.quarkus:quarkus-smallrye-reactive-messaging-kafka")) + .extension(ArtifactKey.fromString("io.quarkus:quarkus-messaging-kafka")) .languages(JAVA) .build(); @RegisterExtension public static QuarkusCodestartTest amqpCodestartTest = QuarkusCodestartTest.builder() - .extension(ArtifactKey.fromString("io.quarkus:quarkus-smallrye-reactive-messaging-amqp")) + .extension(ArtifactKey.fromString("io.quarkus:quarkus-messaging-amqp")) .languages(JAVA) .build(); @Test void testKafkaContent() throws Throwable { - kafkaCodestartTest.checkGeneratedSource("org.acme.MyReactiveMessagingApplication"); - kafkaCodestartTest.checkGeneratedTestSource("org.acme.MyReactiveMessagingApplicationTest"); + kafkaCodestartTest.checkGeneratedSource("org.acme.MyMessagingApplication"); + kafkaCodestartTest.checkGeneratedTestSource("org.acme.MyMessagingApplicationTest"); kafkaCodestartTest.assertThatGeneratedFileMatchSnapshot(JAVA, "src/main/resources/application.properties"); } @Test void testAMQPContent() throws Throwable { - amqpCodestartTest.checkGeneratedSource("org.acme.MyReactiveMessagingApplication"); - amqpCodestartTest.checkGeneratedTestSource("org.acme.MyReactiveMessagingApplicationTest"); + amqpCodestartTest.checkGeneratedSource("org.acme.MyMessagingApplication"); + amqpCodestartTest.checkGeneratedTestSource("org.acme.MyMessagingApplicationTest"); amqpCodestartTest.assertThatGeneratedFileMatchSnapshot(JAVA, "src/main/resources/application.properties"); } diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java index f6443c8d53829..382a4ba52e60e 100644 --- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java +++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java @@ -76,17 +76,17 @@ void testRegexpMatches() throws Exception { Assertions.assertTrue(result2.getBooleanValue(RemoveExtensions.OUTCOME_UPDATED)); final T project = readProject(); - hasNoDependency(project, "quarkus-smallrye-reactive-messaging"); + hasNoDependency(project, "quarkus-messaging"); hasNoDependency(project, "quarkus-smallrye-reactive-streams-operators"); hasNoDependency(project, "quarkus-smallrye-opentracing"); hasNoDependency(project, "quarkus-smallrye-metrics"); - hasNoDependency(project, "quarkus-smallrye-reactive-messaging-kafka"); + hasNoDependency(project, "quarkus-messaging-kafka"); hasNoDependency(project, "quarkus-smallrye-health"); hasNoDependency(project, "quarkus-smallrye-openapi"); hasNoDependency(project, "quarkus-smallrye-jwt"); hasNoDependency(project, "quarkus-smallrye-context-propagation"); hasNoDependency(project, "quarkus-smallrye-reactive-type-converters"); - hasNoDependency(project, "quarkus-smallrye-reactive-messaging-amqp"); + hasNoDependency(project, "quarkus-messaging-amqp"); hasNoDependency(project, "quarkus-smallrye-fault-tolerance"); } diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyMessagingApplication.java similarity index 91% rename from integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java rename to integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyMessagingApplication.java index 1b6e4b05161cf..c32aef46fa8ee 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyMessagingApplication.java @@ -9,7 +9,7 @@ import java.util.stream.Stream; @ApplicationScoped -public class MyReactiveMessagingApplication { +public class MyMessagingApplication { @Inject @Channel("words-out") @@ -20,7 +20,7 @@ public class MyReactiveMessagingApplication { * Messages are sent to the broker. **/ void onStart(@Observes StartupEvent ev) { - Stream.of("Hello", "with", "SmallRye", "reactive", "message").forEach(string -> emitter.send(string)); + Stream.of("Hello", "with", "Quarkus", "Messaging", "message").forEach(string -> emitter.send(string)); } /** diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyMessagingApplicationTest.java similarity index 87% rename from integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java rename to integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyMessagingApplicationTest.java index 6f0a5ac2895ca..2141299f2a62d 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyMessagingApplicationTest.java @@ -12,10 +12,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest -class MyReactiveMessagingApplicationTest { +class MyMessagingApplicationTest { @Inject - MyReactiveMessagingApplication application; + MyMessagingApplication application; @Test void test() { diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyMessagingApplication.java similarity index 91% rename from integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java rename to integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyMessagingApplication.java index 1b6e4b05161cf..c32aef46fa8ee 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyMessagingApplication.java @@ -9,7 +9,7 @@ import java.util.stream.Stream; @ApplicationScoped -public class MyReactiveMessagingApplication { +public class MyMessagingApplication { @Inject @Channel("words-out") @@ -20,7 +20,7 @@ public class MyReactiveMessagingApplication { * Messages are sent to the broker. **/ void onStart(@Observes StartupEvent ev) { - Stream.of("Hello", "with", "SmallRye", "reactive", "message").forEach(string -> emitter.send(string)); + Stream.of("Hello", "with", "Quarkus", "Messaging", "message").forEach(string -> emitter.send(string)); } /** diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyMessagingApplicationTest.java similarity index 87% rename from integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java rename to integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyMessagingApplicationTest.java index 6f0a5ac2895ca..2141299f2a62d 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyMessagingApplicationTest.java @@ -12,10 +12,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest -class MyReactiveMessagingApplicationTest { +class MyMessagingApplicationTest { @Inject - MyReactiveMessagingApplication application; + MyMessagingApplication application; @Test void test() { diff --git a/integration-tests/kafka-oauth-keycloak/pom.xml b/integration-tests/kafka-oauth-keycloak/pom.xml index 07ed528a2d238..91314691c89ca 100644 --- a/integration-tests/kafka-oauth-keycloak/pom.xml +++ b/integration-tests/kafka-oauth-keycloak/pom.xml @@ -36,7 +36,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka @@ -98,7 +98,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/integration-tests/kafka-sasl-elytron/pom.xml b/integration-tests/kafka-sasl-elytron/pom.xml index 925ea06b60a6e..0aa1c18ec473b 100644 --- a/integration-tests/kafka-sasl-elytron/pom.xml +++ b/integration-tests/kafka-sasl-elytron/pom.xml @@ -36,7 +36,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka @@ -89,7 +89,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml b/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml index 5ae7b23635e79..fefc9e6d1d859 100644 --- a/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml +++ b/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml @@ -29,7 +29,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus @@ -131,7 +131,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/integration-tests/opentelemetry-reactive-messaging/pom.xml b/integration-tests/opentelemetry-reactive-messaging/pom.xml index bbe33f7c0078f..b6b2ea69c2eea 100644 --- a/integration-tests/opentelemetry-reactive-messaging/pom.xml +++ b/integration-tests/opentelemetry-reactive-messaging/pom.xml @@ -32,7 +32,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka @@ -105,7 +105,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/integration-tests/reactive-messaging-amqp/pom.xml b/integration-tests/reactive-messaging-amqp/pom.xml index 2ccd4e67e7cf8..5792ae53b0bdd 100644 --- a/integration-tests/reactive-messaging-amqp/pom.xml +++ b/integration-tests/reactive-messaging-amqp/pom.xml @@ -36,7 +36,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-amqp + quarkus-messaging-amqp @@ -108,7 +108,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-amqp-deployment + quarkus-messaging-amqp-deployment ${project.version} pom test diff --git a/integration-tests/reactive-messaging-hibernate-orm/pom.xml b/integration-tests/reactive-messaging-hibernate-orm/pom.xml index 4b3e79776b129..f5409927470a1 100644 --- a/integration-tests/reactive-messaging-hibernate-orm/pom.xml +++ b/integration-tests/reactive-messaging-hibernate-orm/pom.xml @@ -54,7 +54,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka @@ -160,7 +160,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/integration-tests/reactive-messaging-hibernate-reactive/pom.xml b/integration-tests/reactive-messaging-hibernate-reactive/pom.xml index 559de521da6f7..029a927dce98f 100644 --- a/integration-tests/reactive-messaging-hibernate-reactive/pom.xml +++ b/integration-tests/reactive-messaging-hibernate-reactive/pom.xml @@ -54,7 +54,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka @@ -165,7 +165,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/integration-tests/reactive-messaging-kafka/pom.xml b/integration-tests/reactive-messaging-kafka/pom.xml index 5227f16834072..42729bca10004 100644 --- a/integration-tests/reactive-messaging-kafka/pom.xml +++ b/integration-tests/reactive-messaging-kafka/pom.xml @@ -60,7 +60,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka @@ -169,7 +169,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/integration-tests/reactive-messaging-mqtt/pom.xml b/integration-tests/reactive-messaging-mqtt/pom.xml index 9ed9dafea96ff..c23a2b353df1f 100644 --- a/integration-tests/reactive-messaging-mqtt/pom.xml +++ b/integration-tests/reactive-messaging-mqtt/pom.xml @@ -45,7 +45,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-mqtt + quarkus-messaging-mqtt @@ -128,7 +128,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-mqtt-deployment + quarkus-messaging-mqtt-deployment ${project.version} pom test diff --git a/integration-tests/reactive-messaging-pulsar/pom.xml b/integration-tests/reactive-messaging-pulsar/pom.xml index 22bc4d58ff1c3..98cf5bdf5dc7d 100644 --- a/integration-tests/reactive-messaging-pulsar/pom.xml +++ b/integration-tests/reactive-messaging-pulsar/pom.xml @@ -51,7 +51,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-pulsar + quarkus-messaging-pulsar @@ -158,7 +158,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-pulsar-deployment + quarkus-messaging-pulsar-deployment ${project.version} pom test diff --git a/integration-tests/reactive-messaging-rabbitmq-dyn/pom.xml b/integration-tests/reactive-messaging-rabbitmq-dyn/pom.xml index b299f4bbe8bc8..817b1f1ed3dfb 100644 --- a/integration-tests/reactive-messaging-rabbitmq-dyn/pom.xml +++ b/integration-tests/reactive-messaging-rabbitmq-dyn/pom.xml @@ -45,7 +45,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq + quarkus-messaging-rabbitmq @@ -138,7 +138,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq-deployment + quarkus-messaging-rabbitmq-deployment ${project.version} pom test diff --git a/integration-tests/reactive-messaging-rabbitmq/pom.xml b/integration-tests/reactive-messaging-rabbitmq/pom.xml index 888f22ed73fee..802395ed095f6 100644 --- a/integration-tests/reactive-messaging-rabbitmq/pom.xml +++ b/integration-tests/reactive-messaging-rabbitmq/pom.xml @@ -45,7 +45,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq + quarkus-messaging-rabbitmq @@ -128,7 +128,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-rabbitmq-deployment + quarkus-messaging-rabbitmq-deployment ${project.version} pom test diff --git a/integration-tests/resteasy-reactive-kotlin/standard/pom.xml b/integration-tests/resteasy-reactive-kotlin/standard/pom.xml index c18476ddf4217..b20e5a1f5192f 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/pom.xml +++ b/integration-tests/resteasy-reactive-kotlin/standard/pom.xml @@ -25,7 +25,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus @@ -136,7 +136,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/integration-tests/virtual-threads/amqp-virtual-threads/pom.xml b/integration-tests/virtual-threads/amqp-virtual-threads/pom.xml index 53fdd40390082..c3968ff328807 100644 --- a/integration-tests/virtual-threads/amqp-virtual-threads/pom.xml +++ b/integration-tests/virtual-threads/amqp-virtual-threads/pom.xml @@ -20,7 +20,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-amqp + quarkus-messaging-amqp io.quarkus @@ -76,7 +76,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-amqp-deployment + quarkus-messaging-amqp-deployment ${project.version} pom test diff --git a/integration-tests/virtual-threads/jms-virtual-threads/pom.xml b/integration-tests/virtual-threads/jms-virtual-threads/pom.xml index 84be917923ea1..c817ca48aecc6 100644 --- a/integration-tests/virtual-threads/jms-virtual-threads/pom.xml +++ b/integration-tests/virtual-threads/jms-virtual-threads/pom.xml @@ -31,7 +31,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.smallrye.reactive @@ -100,7 +100,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment ${project.version} pom test diff --git a/integration-tests/virtual-threads/kafka-virtual-threads/pom.xml b/integration-tests/virtual-threads/kafka-virtual-threads/pom.xml index e727557b025d1..8817ad721acfc 100644 --- a/integration-tests/virtual-threads/kafka-virtual-threads/pom.xml +++ b/integration-tests/virtual-threads/kafka-virtual-threads/pom.xml @@ -20,7 +20,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus @@ -75,7 +75,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-messaging-kafka-deployment ${project.version} pom test diff --git a/relocations/generaterelocations.java b/relocations/generaterelocations.java index c24b8a238a69d..8c8042e5b01f1 100755 --- a/relocations/generaterelocations.java +++ b/relocations/generaterelocations.java @@ -128,6 +128,22 @@ public class generaterelocations implements Runnable { "3.9"); RELOCATIONS.put("quarkus-spring-web-resteasy-classic", springWebRESTEasyClassicRelocation); RELOCATIONS.put("quarkus-spring-web-resteasy-classic-deployment", springWebRESTEasyClassicRelocation); + + Function smallryeReactiveMessagingRelocation = a -> Relocation.ofArtifactId(a, a.replace("smallrye-reactive-messaging", "messaging"), + "3.9"); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-kotlin", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-deployment", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-kafka", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-kafka-deployment", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-pulsar", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-pulsar-deployment", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-amqp", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-amqp-deployment", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-mqtt", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-mqtt-deployment", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-rabbitmq", smallryeReactiveMessagingRelocation); + RELOCATIONS.put("quarkus-smallrye-reactive-messaging-rabbitmq-deployment", smallryeReactiveMessagingRelocation); } private static final String RELOCATION_POM_TEMPLATE = "\n" + // diff --git a/relocations/pom.xml b/relocations/pom.xml index 1073d83681ebb..5f147f47c930a 100644 --- a/relocations/pom.xml +++ b/relocations/pom.xml @@ -87,6 +87,19 @@ quarkus-spring-web-resteasy-reactive-deployment quarkus-spring-web-resteasy-classic quarkus-spring-web-resteasy-classic-deployment + quarkus-smallrye-reactive-messaging + quarkus-smallrye-reactive-messaging-amqp + quarkus-smallrye-reactive-messaging-amqp-deployment + quarkus-smallrye-reactive-messaging-deployment + quarkus-smallrye-reactive-messaging-kafka + quarkus-smallrye-reactive-messaging-kafka-deployment + quarkus-smallrye-reactive-messaging-kotlin + quarkus-smallrye-reactive-messaging-mqtt + quarkus-smallrye-reactive-messaging-mqtt-deployment + quarkus-smallrye-reactive-messaging-pulsar + quarkus-smallrye-reactive-messaging-pulsar-deployment + quarkus-smallrye-reactive-messaging-rabbitmq + quarkus-smallrye-reactive-messaging-rabbitmq-deployment diff --git a/relocations/quarkus-smallrye-reactive-messaging-amqp-deployment/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-amqp-deployment/pom.xml new file mode 100644 index 0000000000000..1d5a8bbc879a2 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-amqp-deployment/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-amqp-deployment + + + + io.quarkus + quarkus-messaging-amqp-deployment + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-amqp/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-amqp/pom.xml new file mode 100644 index 0000000000000..aeb0a21571297 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-amqp/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-amqp + + + + io.quarkus + quarkus-messaging-amqp + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-deployment/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-deployment/pom.xml new file mode 100644 index 0000000000000..7966bbccc8326 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-deployment/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-deployment + + + + io.quarkus + quarkus-messaging-deployment + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-kafka-deployment/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-kafka-deployment/pom.xml new file mode 100644 index 0000000000000..de58d4631e3cf --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-kafka-deployment/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-kafka-deployment + + + + io.quarkus + quarkus-messaging-kafka-deployment + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-kafka/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-kafka/pom.xml new file mode 100644 index 0000000000000..9187fedb03780 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-kafka/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-kafka + + + + io.quarkus + quarkus-messaging-kafka + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-kotlin/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-kotlin/pom.xml new file mode 100644 index 0000000000000..d1ada216bb5c2 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-kotlin/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-kotlin + + + + io.quarkus + quarkus-messaging-kotlin + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-mqtt-deployment/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-mqtt-deployment/pom.xml new file mode 100644 index 0000000000000..b492288ca7ec7 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-mqtt-deployment/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-mqtt-deployment + + + + io.quarkus + quarkus-messaging-mqtt-deployment + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-mqtt/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-mqtt/pom.xml new file mode 100644 index 0000000000000..0d4a43301e3fe --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-mqtt/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-mqtt + + + + io.quarkus + quarkus-messaging-mqtt + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-pulsar-deployment/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-pulsar-deployment/pom.xml new file mode 100644 index 0000000000000..8f02a50a641ea --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-pulsar-deployment/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-pulsar-deployment + + + + io.quarkus + quarkus-messaging-pulsar-deployment + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-pulsar/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-pulsar/pom.xml new file mode 100644 index 0000000000000..f0f6fdc543187 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-pulsar/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-pulsar + + + + io.quarkus + quarkus-messaging-pulsar + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-rabbitmq-deployment/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-rabbitmq-deployment/pom.xml new file mode 100644 index 0000000000000..1288bd735d115 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-rabbitmq-deployment/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-rabbitmq-deployment + + + + io.quarkus + quarkus-messaging-rabbitmq-deployment + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging-rabbitmq/pom.xml b/relocations/quarkus-smallrye-reactive-messaging-rabbitmq/pom.xml new file mode 100644 index 0000000000000..f426264b898d0 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging-rabbitmq/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging-rabbitmq + + + + io.quarkus + quarkus-messaging-rabbitmq + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/relocations/quarkus-smallrye-reactive-messaging/pom.xml b/relocations/quarkus-smallrye-reactive-messaging/pom.xml new file mode 100644 index 0000000000000..fcd55ab27c6a2 --- /dev/null +++ b/relocations/quarkus-smallrye-reactive-messaging/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-relocations-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-reactive-messaging + + + + io.quarkus + quarkus-messaging + ${project.version} + Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.9 for more information. + + + \ No newline at end of file diff --git a/tcks/microprofile-reactive-messaging/pom.xml b/tcks/microprofile-reactive-messaging/pom.xml index 3f114a2c1c5ec..323501fc0b3bd 100644 --- a/tcks/microprofile-reactive-messaging/pom.xml +++ b/tcks/microprofile-reactive-messaging/pom.xml @@ -27,7 +27,7 @@ false true - true + true @@ -57,7 +57,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging org.eclipse.microprofile.reactive.messaging @@ -68,7 +68,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-deployment + quarkus-messaging-deployment ${project.version} pom test