From d1786dc4c528fc9b547f4283772a45e128371466 Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:28:18 +0530 Subject: [PATCH 1/3] Changed maven artifact coordinates and package names to com.solace.quarkus --- README.md | 2 +- deployment/pom.xml | 4 +- .../deployment/DevServicesConfig.java | 2 +- .../DevServicesSolaceProcessor.java | 2 +- .../quarkus}/deployment/SolaceBuildItem.java | 2 +- .../deployment/SolaceBuildTimeConfig.java | 2 +- .../quarkus}/deployment/SolaceProcessor.java | 12 ++-- .../deployment}/test/SolaceContainer.java | 2 +- .../test/SolaceCustomizerTest.java | 4 +- .../deployment}/test/SolaceDevModeTest.java | 2 +- .../test/SolaceHelloWorldPersistentTest.java | 2 +- .../test/SolaceHelloWorldTest.java | 2 +- .../deployment}/test/SolaceTestResource.java | 2 +- .../quarkus-solace-extension-common.adoc | 62 +++++++++++++++++++ .../quarkus-solace-extension-incoming.adoc | 6 +- .../ROOT/pages/includes/quarkus-solace.adoc | 51 --------------- docs/modules/ROOT/pages/index.adoc | 4 +- docs/pom.xml | 4 +- integration-tests/pom.xml | 2 +- .../solace-client-integration-tests/pom.xml | 4 +- .../solace/quarkus}/SolaceConsumer.java | 2 +- .../solace/quarkus}/SolaceCustomizer.java | 2 +- .../solace/quarkus}/SolaceResource.java | 2 +- .../solace/quarkus}/SolaceIT.java | 2 +- .../solace/quarkus}/SolaceTest.java | 2 +- pom.xml | 2 +- pubsub-plus-connector/pom.xml | 2 +- .../quarkus/messaging}/SolaceConnector.java | 16 +++-- .../converters/SolaceMessageConverter.java | 4 +- .../fault/OutboundErrorMessageMapper.java | 2 +- .../messaging}/fault/SolaceDiscard.java | 8 +-- .../messaging}/fault/SolaceErrorTopic.java | 7 +-- .../SolaceErrorTopicPublisherHandler.java | 6 +- .../quarkus/messaging}/fault/SolaceFail.java | 8 +-- .../fault/SolaceFailureHandler.java | 9 ++- .../messaging}/fault/SolaceIgnoreFailure.java | 7 ++- .../messaging}/i18n/SolaceExceptions.java | 2 +- .../messaging}/i18n/SolaceLogging.java | 4 +- ...ncomingMessagesUnsignedCounterBarrier.java | 4 +- .../messaging}/incoming/SettleMetadata.java | 2 +- .../messaging}/incoming/SolaceAckHandler.java | 2 +- .../incoming/SolaceInboundMessage.java | 6 +- .../incoming/SolaceInboundMetadata.java | 2 +- .../incoming/SolaceIncomingChannel.java | 16 ++--- ...utgoingMessagesUnsignedCounterBarrier.java | 4 +- .../messaging}/outgoing/SenderProcessor.java | 4 +- .../outgoing/SolaceOutboundMessage.java | 2 +- .../outgoing/SolaceOutboundMetadata.java | 2 +- .../outgoing/SolaceOutgoingChannel.java | 6 +- .../messaging}/SolaceConsumerTest.java | 14 ++--- .../messaging}/SolaceProcessorTest.java | 4 +- .../messaging}/SolacePublisherTest.java | 8 +-- .../base/MessagingServiceProvider.java | 2 +- .../messaging}/base/SolaceBaseTest.java | 2 +- .../base/SolaceBrokerExtension.java | 2 +- .../messaging}/base/SolaceContainer.java | 2 +- .../quarkus/messaging}/base/WeldTestBase.java | 7 ++- .../health/SolaceConsumerHealthTest.java | 6 +- .../health/SolacePublisherHealthCheck.java | 4 +- .../locals/LocalPropagationAckTest.java | 6 +- .../locals/LocalPropagationTest.java | 6 +- .../logging/SolaceTestAppender.java | 2 +- .../perf/EndToEndPerformanceTest.java | 6 +- .../perf/SolaceConsumerPerformanceTest.java | 6 +- .../perf/SolacePublisherPerformanceTest.java | 4 +- runtime/pom.xml | 2 +- .../MessagingServiceClientCustomizer.java | 2 +- .../solace/quarkus}/runtime/SolaceConfig.java | 2 +- .../quarkus}/runtime/SolaceRecorder.java | 4 +- .../observability/SolaceHealthCheck.java | 2 +- .../observability/SolaceMetricBinder.java | 2 +- samples/hello-connector-solace/pom.xml | 6 +- .../quarkus}/samples/HelloConsumer.java | 7 ++- .../solace/quarkus}/samples/Person.java | 2 +- .../quarkus}/samples/PublisherResource.java | 5 +- samples/hello-solace/pom.xml | 4 +- .../quarkus}/samples/HelloConsumer.java | 2 +- .../quarkus}/samples/PublisherResource.java | 2 +- 78 files changed, 222 insertions(+), 211 deletions(-) rename deployment/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/deployment/DevServicesConfig.java (98%) rename deployment/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/deployment/DevServicesSolaceProcessor.java (99%) rename deployment/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/deployment/SolaceBuildItem.java (82%) rename deployment/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/deployment/SolaceBuildTimeConfig.java (97%) rename deployment/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/deployment/SolaceProcessor.java (90%) rename deployment/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/deployment}/test/SolaceContainer.java (99%) rename deployment/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/deployment}/test/SolaceCustomizerTest.java (94%) rename deployment/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/deployment}/test/SolaceDevModeTest.java (95%) rename deployment/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/deployment}/test/SolaceHelloWorldPersistentTest.java (98%) rename deployment/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/deployment}/test/SolaceHelloWorldTest.java (98%) rename deployment/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/deployment}/test/SolaceTestResource.java (95%) create mode 100644 docs/modules/ROOT/pages/includes/quarkus-solace-extension-common.adoc rename integration-tests/solace-client-integration-tests/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/SolaceConsumer.java (98%) rename integration-tests/solace-client-integration-tests/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/SolaceCustomizer.java (91%) rename integration-tests/solace-client-integration-tests/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/SolaceResource.java (98%) rename integration-tests/solace-client-integration-tests/src/test/java/{io/quarkiverse/solace => com/solace/quarkus}/SolaceIT.java (79%) rename integration-tests/solace-client-integration-tests/src/test/java/{io/quarkiverse/solace => com/solace/quarkus}/SolaceTest.java (98%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/SolaceConnector.java (95%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/converters/SolaceMessageConverter.java (88%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/fault/OutboundErrorMessageMapper.java (95%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/fault/SolaceDiscard.java (86%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/fault/SolaceErrorTopic.java (93%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/fault/SolaceErrorTopicPublisherHandler.java (93%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/fault/SolaceFail.java (86%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/fault/SolaceFailureHandler.java (84%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/fault/SolaceIgnoreFailure.java (78%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/i18n/SolaceExceptions.java (96%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/i18n/SolaceLogging.java (95%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/incoming/IncomingMessagesUnsignedCounterBarrier.java (97%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/incoming/SettleMetadata.java (94%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/incoming/SolaceAckHandler.java (93%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/incoming/SolaceInboundMessage.java (97%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/incoming/SolaceInboundMetadata.java (98%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/incoming/SolaceIncomingChannel.java (97%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/outgoing/OutgoingMessagesUnsignedCounterBarrier.java (97%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/outgoing/SenderProcessor.java (96%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/outgoing/SolaceOutboundMessage.java (97%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/outgoing/SolaceOutboundMetadata.java (99%) rename pubsub-plus-connector/src/main/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/outgoing/SolaceOutgoingChannel.java (98%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/SolaceConsumerTest.java (97%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/SolaceProcessorTest.java (97%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/SolacePublisherTest.java (97%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/base/MessagingServiceProvider.java (89%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/base/SolaceBaseTest.java (98%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/base/SolaceBrokerExtension.java (99%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/base/SolaceContainer.java (99%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/base/WeldTestBase.java (96%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/health/SolaceConsumerHealthTest.java (96%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/health/SolacePublisherHealthCheck.java (97%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/locals/LocalPropagationAckTest.java (96%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/locals/LocalPropagationTest.java (99%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/logging/SolaceTestAppender.java (92%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/perf/EndToEndPerformanceTest.java (99%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/perf/SolaceConsumerPerformanceTest.java (94%) rename pubsub-plus-connector/src/test/java/{io/quarkiverse/solace => com/solace/quarkus/messaging}/perf/SolacePublisherPerformanceTest.java (98%) rename runtime/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/MessagingServiceClientCustomizer.java (97%) rename runtime/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/runtime/SolaceConfig.java (93%) rename runtime/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/runtime/SolaceRecorder.java (96%) rename runtime/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/runtime/observability/SolaceHealthCheck.java (92%) rename runtime/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/runtime/observability/SolaceMetricBinder.java (93%) rename samples/hello-connector-solace/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/samples/HelloConsumer.java (94%) rename samples/hello-connector-solace/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/samples/Person.java (83%) rename samples/hello-connector-solace/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/samples/PublisherResource.java (92%) rename samples/hello-solace/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/samples/HelloConsumer.java (96%) rename samples/hello-solace/src/main/java/{io/quarkiverse/solace => com/solace/quarkus}/samples/PublisherResource.java (95%) diff --git a/README.md b/README.md index ecdc46e..5e54ade 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Quarkus Solace -[![Version](https://img.shields.io/maven-central/v/io.quarkiverse.solace/quarkus-solace?logo=apache-maven&style=flat-square)](https://search.maven.org/artifact/io.quarkiverse.solace/quarkus-solace) +[![Version](https://img.shields.io/maven-central/v/com.solace.quarkus/quarkus-solace?logo=apache-maven&style=flat-square)](https://search.maven.org/artifact/com.solace.quarkus/quarkus-solace) ## About Solace Quarkus Extension diff --git a/deployment/pom.xml b/deployment/pom.xml index 73e26d4..573e55a 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-parent 999-SNAPSHOT @@ -19,7 +19,7 @@ quarkus-smallrye-health-spi - io.quarkiverse.solace + com.solace.quarkus quarkus-solace ${project.version} diff --git a/deployment/src/main/java/io/quarkiverse/solace/deployment/DevServicesConfig.java b/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesConfig.java similarity index 98% rename from deployment/src/main/java/io/quarkiverse/solace/deployment/DevServicesConfig.java rename to deployment/src/main/java/com/solace/quarkus/deployment/DevServicesConfig.java index 1ef9c64..9d40b20 100644 --- a/deployment/src/main/java/io/quarkiverse/solace/deployment/DevServicesConfig.java +++ b/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesConfig.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.deployment; +package com.solace.quarkus.deployment; import java.util.Map; import java.util.Optional; diff --git a/deployment/src/main/java/io/quarkiverse/solace/deployment/DevServicesSolaceProcessor.java b/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java similarity index 99% rename from deployment/src/main/java/io/quarkiverse/solace/deployment/DevServicesSolaceProcessor.java rename to deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java index 5a5547a..0ea8489 100644 --- a/deployment/src/main/java/io/quarkiverse/solace/deployment/DevServicesSolaceProcessor.java +++ b/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.deployment; +package com.solace.quarkus.deployment; import static io.quarkus.runtime.LaunchMode.DEVELOPMENT; diff --git a/deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceBuildItem.java b/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildItem.java similarity index 82% rename from deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceBuildItem.java rename to deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildItem.java index 16b209e..39ef04c 100644 --- a/deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceBuildItem.java +++ b/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildItem.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.deployment; +package com.solace.quarkus.deployment; import io.quarkus.builder.item.SimpleBuildItem; diff --git a/deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceBuildTimeConfig.java b/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildTimeConfig.java similarity index 97% rename from deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceBuildTimeConfig.java rename to deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildTimeConfig.java index 33d3a97..642b3ff 100644 --- a/deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceBuildTimeConfig.java +++ b/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildTimeConfig.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.deployment; +package com.solace.quarkus.deployment; import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigPhase; diff --git a/deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceProcessor.java b/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java similarity index 90% rename from deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceProcessor.java rename to deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java index c6da302..4b7d02b 100644 --- a/deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceProcessor.java +++ b/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.deployment; +package com.solace.quarkus.deployment; import java.util.Optional; import java.util.function.Function; @@ -9,12 +9,12 @@ import org.jboss.jandex.*; import com.solace.messaging.MessagingService; +import com.solace.quarkus.MessagingServiceClientCustomizer; +import com.solace.quarkus.runtime.SolaceConfig; +import com.solace.quarkus.runtime.SolaceRecorder; +import com.solace.quarkus.runtime.observability.SolaceMetricBinder; import com.solacesystems.jcsmp.JCSMPFactory; -import io.quarkiverse.solace.MessagingServiceClientCustomizer; -import io.quarkiverse.solace.runtime.SolaceConfig; -import io.quarkiverse.solace.runtime.SolaceRecorder; -import io.quarkiverse.solace.runtime.observability.SolaceMetricBinder; import io.quarkus.arc.SyntheticCreationalContext; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem; @@ -97,7 +97,7 @@ void configureNativeCompilation(BuildProducer @BuildStep HealthBuildItem addHealthCheck(SolaceBuildTimeConfig buildTimeConfig) { - return new HealthBuildItem("io.quarkiverse.solace.runtime.observability.SolaceHealthCheck", + return new HealthBuildItem("com.solace.quarkus.runtime.observability.SolaceHealthCheck", buildTimeConfig.health().enabled()); } diff --git a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceContainer.java b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceContainer.java similarity index 99% rename from deployment/src/test/java/io/quarkiverse/solace/test/SolaceContainer.java rename to deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceContainer.java index 79637cd..7853299 100644 --- a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceContainer.java +++ b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceContainer.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.test; +package com.solace.quarkus.deployment.test; import java.io.IOException; import java.time.Duration; diff --git a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceCustomizerTest.java b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceCustomizerTest.java similarity index 94% rename from deployment/src/test/java/io/quarkiverse/solace/test/SolaceCustomizerTest.java rename to deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceCustomizerTest.java index 5379cc3..84a3282 100644 --- a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceCustomizerTest.java +++ b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceCustomizerTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.test; +package com.solace.quarkus.deployment.test; import static org.assertj.core.api.Assertions.assertThat; @@ -16,8 +16,8 @@ import com.solace.messaging.MessagingServiceClientBuilder; import com.solace.messaging.config.RetryStrategy; import com.solace.messaging.publisher.DirectMessagePublisher; +import com.solace.quarkus.MessagingServiceClientCustomizer; -import io.quarkiverse.solace.MessagingServiceClientCustomizer; import io.quarkus.test.QuarkusUnitTest; public class SolaceCustomizerTest { diff --git a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceDevModeTest.java b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java similarity index 95% rename from deployment/src/test/java/io/quarkiverse/solace/test/SolaceDevModeTest.java rename to deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java index 97d545c..2edc0f9 100644 --- a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceDevModeTest.java +++ b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.test; +package com.solace.quarkus.deployment.test; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceHelloWorldPersistentTest.java b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldPersistentTest.java similarity index 98% rename from deployment/src/test/java/io/quarkiverse/solace/test/SolaceHelloWorldPersistentTest.java rename to deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldPersistentTest.java index f2a0ede..471819b 100644 --- a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceHelloWorldPersistentTest.java +++ b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldPersistentTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.test; +package com.solace.quarkus.deployment.test; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; diff --git a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceHelloWorldTest.java b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldTest.java similarity index 98% rename from deployment/src/test/java/io/quarkiverse/solace/test/SolaceHelloWorldTest.java rename to deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldTest.java index c6f6e2d..e41a4ac 100644 --- a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceHelloWorldTest.java +++ b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.test; +package com.solace.quarkus.deployment.test; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; diff --git a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceTestResource.java b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceTestResource.java similarity index 95% rename from deployment/src/test/java/io/quarkiverse/solace/test/SolaceTestResource.java rename to deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceTestResource.java index 4825369..ece0a62 100644 --- a/deployment/src/test/java/io/quarkiverse/solace/test/SolaceTestResource.java +++ b/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceTestResource.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.test; +package com.solace.quarkus.deployment.test; import java.util.Map; diff --git a/docs/modules/ROOT/pages/includes/quarkus-solace-extension-common.adoc b/docs/modules/ROOT/pages/includes/quarkus-solace-extension-common.adoc new file mode 100644 index 0000000..481c091 --- /dev/null +++ b/docs/modules/ROOT/pages/includes/quarkus-solace-extension-common.adoc @@ -0,0 +1,62 @@ + +:summaryTableId: quarkus-solace-extension-common +Common configuration for Solace Quarkus Extension Incoming and Outgoing channels +[.configuration-reference.searchable, cols="80,.^10,.^10"] +|=== + +h|[[quarkus-solace_configuration_common]]link:#quarkus-solace_configuration_common[Configuration property] + +h|Type +h|Default + +a| [[quarkus-solace_quarkus.client.lazy.start]]`link:#quarkus-solace_quarkus.client.lazy.start[client.lazy.start]` + + +[.description] +-- +Whether the receiver or publisher is started at initialization or lazily at subscription time. + +// ifdef::add-copy-button-to-env-var[] +// Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_METRICS_ENABLED+++[] +// endif::add-copy-button-to-env-var[] +// ifndef::add-copy-button-to-env-var[] +// Environment variable: `+++QUARKUS_SOLACE_METRICS_ENABLED+++` +// endif::add-copy-button-to-env-var[] +--|boolean +| `false` + + +a| [[quarkus-solace_quarkus.client.graceful-shutdown]]`link:#quarkus-solace_quarkus.client.graceful-shutdown[client.graceful-shutdown]` + + +[.description] +-- +Whether to shutdown client gracefully. + +// ifdef::add-copy-button-to-env-var[] +// Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_HEALTH_ENABLED+++[] +// endif::add-copy-button-to-env-var[] +// ifndef::add-copy-button-to-env-var[] +// Environment variable: `+++QUARKUS_SOLACE_HEALTH_ENABLED+++` +// endif::add-copy-button-to-env-var[] +--|boolean +|`true` + + +a| [[quarkus-solace_quarkus.client.graceful-shutdown.wait-timeout]]`link:#quarkus-solace_quarkus.client.graceful-shutdown.wait-timeout[client.graceful-shutdown.wait-timeout]` + + +[.description] +-- +Timeout in milliseconds to wait for messages to finish processing before shutdown. + +// ifdef::add-copy-button-to-env-var[] +// Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_DEVSERVICES_ENABLED+++[] +// endif::add-copy-button-to-env-var[] +// ifndef::add-copy-button-to-env-var[] +// Environment variable: `+++QUARKUS_SOLACE_DEVSERVICES_ENABLED+++` +// endif::add-copy-button-to-env-var[] +--|long +|`10000` + +|=== \ No newline at end of file diff --git a/docs/modules/ROOT/pages/includes/quarkus-solace-extension-incoming.adoc b/docs/modules/ROOT/pages/includes/quarkus-solace-extension-incoming.adoc index e5489f0..084c5e1 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-solace-extension-incoming.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-solace-extension-incoming.adoc @@ -31,7 +31,7 @@ a| [[quarkus-solace_quarkus.consumer.queue.type]]`link:#quarkus-solace_quarkus.c [.description] -- -The queue type of receiver. +The queue type of receiver. Supported values `durable-exclusive`, `durable-non-exclusive`, `non-durable-exclusive` // ifdef::add-copy-button-to-env-var[] // Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_HEALTH_ENABLED+++[] @@ -40,7 +40,7 @@ The queue type of receiver. // Environment variable: `+++QUARKUS_SOLACE_HEALTH_ENABLED+++` // endif::add-copy-button-to-env-var[] --|string -|`durable-non-exclusive` +|`durable-exclusive` a| [[quarkus-solace_quarkus.consumer.queue.missing-resource-creation-strategy]]`link:#quarkus-solace_quarkus.consumer.queue.missing-resource-creation-strategy[consumer.queue.missing-resource-creation-strategy]` @@ -263,6 +263,6 @@ Whether to enable negative acknowledgments on failed messages. Nacks are support // Environment variable: `+++QUARKUS_SOLACE+++` // endif::add-copy-button-to-env-var[] --|`boolean` -| `true` +| `false` |=== \ No newline at end of file diff --git a/docs/modules/ROOT/pages/includes/quarkus-solace.adoc b/docs/modules/ROOT/pages/includes/quarkus-solace.adoc index 5b625cd..a9d5393 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-solace.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-solace.adoc @@ -120,40 +120,6 @@ endif::add-copy-button-to-env-var[] |`solace` -a| [[quarkus-solace_quarkus.solace.host]]`link:#quarkus-solace_quarkus.solace.host[quarkus.solace.host]` - - -[.description] --- -The Solace host (hostname:port) - -ifdef::add-copy-button-to-env-var[] -Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_HOST+++[] -endif::add-copy-button-to-env-var[] -ifndef::add-copy-button-to-env-var[] -Environment variable: `+++QUARKUS_SOLACE_HOST+++` -endif::add-copy-button-to-env-var[] ---|string -|required icon:exclamation-circle[title=Configuration property is required] - - -a| [[quarkus-solace_quarkus.solace.vpn]]`link:#quarkus-solace_quarkus.solace.vpn[quarkus.solace.vpn]` - - -[.description] --- -The Solace VPN - -ifdef::add-copy-button-to-env-var[] -Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_VPN+++[] -endif::add-copy-button-to-env-var[] -ifndef::add-copy-button-to-env-var[] -Environment variable: `+++QUARKUS_SOLACE_VPN+++` -endif::add-copy-button-to-env-var[] ---|string -|required icon:exclamation-circle[title=Configuration property is required] - - a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.container-env-container-env]]`link:#quarkus-solace_quarkus.solace.devservices.container-env-container-env[quarkus.solace.devservices.container-env]` @@ -170,21 +136,4 @@ endif::add-copy-button-to-env-var[] --|`Map` | - -a| [[quarkus-solace_quarkus.solace-extra]]`link:#quarkus-solace_quarkus.solace-extra[quarkus.solace]` - - -[.description] --- -Any extra parameters to pass to the Solace client - -ifdef::add-copy-button-to-env-var[] -Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE+++[] -endif::add-copy-button-to-env-var[] -ifndef::add-copy-button-to-env-var[] -Environment variable: `+++QUARKUS_SOLACE+++` -endif::add-copy-button-to-env-var[] ---|`Map` -| - |=== \ No newline at end of file diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index cb7966d..9d5727b 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -7,14 +7,14 @@ TIP: Solace Quarkus Extension for integrating with Solace PubSub+ message broker == Installation -If you want to use this extension, you need to add the `io.quarkiverse.solace:quarkus-solace` extension first to your build file. +If you want to use this extension, you need to add the `com.solace.quarkus:quarkus-solace` extension first to your build file. For instance, with Maven, add the following dependency to your POM file: [source,xml,subs=attributes+] ---- - io.quarkiverse.solace + com.solace.quarkus quarkus-solace {project-version} diff --git a/docs/pom.xml b/docs/pom.xml index 1c6562f..5cc5ca2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-parent 999-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-deployment ${project.version} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index a0129fc..74e5515 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-parent 999-SNAPSHOT diff --git a/integration-tests/solace-client-integration-tests/pom.xml b/integration-tests/solace-client-integration-tests/pom.xml index 4ff8452..9849ef7 100644 --- a/integration-tests/solace-client-integration-tests/pom.xml +++ b/integration-tests/solace-client-integration-tests/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-integration-tests-parent 999-SNAPSHOT @@ -18,7 +18,7 @@ quarkus-resteasy-reactive-jackson - io.quarkiverse.solace + com.solace.quarkus quarkus-solace ${project.version} diff --git a/integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceConsumer.java b/integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceConsumer.java similarity index 98% rename from integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceConsumer.java rename to integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceConsumer.java index 43b28e2..78f04fd 100644 --- a/integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceConsumer.java +++ b/integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceConsumer.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceCustomizer.java b/integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceCustomizer.java similarity index 91% rename from integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceCustomizer.java rename to integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceCustomizer.java index 5f9e489..706952b 100644 --- a/integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceCustomizer.java +++ b/integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceCustomizer.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceResource.java b/integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceResource.java similarity index 98% rename from integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceResource.java rename to integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceResource.java index 4a390db..6fa3b47 100644 --- a/integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceResource.java +++ b/integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceResource.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus; import java.util.List; diff --git a/integration-tests/solace-client-integration-tests/src/test/java/io/quarkiverse/solace/SolaceIT.java b/integration-tests/solace-client-integration-tests/src/test/java/com/solace/quarkus/SolaceIT.java similarity index 79% rename from integration-tests/solace-client-integration-tests/src/test/java/io/quarkiverse/solace/SolaceIT.java rename to integration-tests/solace-client-integration-tests/src/test/java/com/solace/quarkus/SolaceIT.java index 6018baa..8a4c8ec 100644 --- a/integration-tests/solace-client-integration-tests/src/test/java/io/quarkiverse/solace/SolaceIT.java +++ b/integration-tests/solace-client-integration-tests/src/test/java/com/solace/quarkus/SolaceIT.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus; import io.quarkus.test.junit.QuarkusIntegrationTest; diff --git a/integration-tests/solace-client-integration-tests/src/test/java/io/quarkiverse/solace/SolaceTest.java b/integration-tests/solace-client-integration-tests/src/test/java/com/solace/quarkus/SolaceTest.java similarity index 98% rename from integration-tests/solace-client-integration-tests/src/test/java/io/quarkiverse/solace/SolaceTest.java rename to integration-tests/solace-client-integration-tests/src/test/java/com/solace/quarkus/SolaceTest.java index b5c659c..b804887 100644 --- a/integration-tests/solace-client-integration-tests/src/test/java/io/quarkiverse/solace/SolaceTest.java +++ b/integration-tests/solace-client-integration-tests/src/test/java/com/solace/quarkus/SolaceTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus; import static org.awaitility.Awaitility.await; diff --git a/pom.xml b/pom.xml index 8622bac..fe70300 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ quarkiverse-parent 15 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-parent 999-SNAPSHOT pom diff --git a/pubsub-plus-connector/pom.xml b/pubsub-plus-connector/pom.xml index 4c8d169..7de54fe 100644 --- a/pubsub-plus-connector/pom.xml +++ b/pubsub-plus-connector/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-parent 999-SNAPSHOT diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/SolaceConnector.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/SolaceConnector.java similarity index 95% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/SolaceConnector.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/SolaceConnector.java index 7f5baff..f9386cf 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/SolaceConnector.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/SolaceConnector.java @@ -1,8 +1,6 @@ -package io.quarkiverse.solace; +package com.solace.quarkus.messaging; -import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.INCOMING; -import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.INCOMING_AND_OUTGOING; -import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.OUTGOING; +import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.*; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -21,9 +19,9 @@ import org.eclipse.microprofile.reactive.messaging.spi.Connector; import com.solace.messaging.MessagingService; +import com.solace.quarkus.messaging.incoming.SolaceIncomingChannel; +import com.solace.quarkus.messaging.outgoing.SolaceOutgoingChannel; -import io.quarkiverse.solace.incoming.SolaceIncomingChannel; -import io.quarkiverse.solace.outgoing.SolaceOutgoingChannel; import io.smallrye.reactive.messaging.annotations.ConnectorAttribute; import io.smallrye.reactive.messaging.connector.InboundConnector; import io.smallrye.reactive.messaging.connector.OutboundConnector; @@ -40,13 +38,13 @@ @ConnectorAttribute(name = "client.lazy.start", type = "boolean", direction = INCOMING_AND_OUTGOING, description = "Whether the receiver or publisher is started at initialization or lazily at subscription time", defaultValue = "false") @ConnectorAttribute(name = "client.graceful-shutdown", type = "boolean", direction = INCOMING_AND_OUTGOING, description = "Whether to shutdown client gracefully", defaultValue = "true") @ConnectorAttribute(name = "client.graceful-shutdown.wait-timeout", type = "long", direction = INCOMING_AND_OUTGOING, description = "Timeout in milliseconds to wait for messages to finish processing before shutdown", defaultValue = "10000") -@ConnectorAttribute(name = "consumer.queue.name", type = "string", direction = INCOMING, description = "The queue name of receiver") -@ConnectorAttribute(name = "consumer.queue.type", type = "string", direction = INCOMING, description = "The queue type of receiver", defaultValue = "durable-non-exclusive") +@ConnectorAttribute(name = "consumer.queue.name", type = "string", direction = INCOMING, description = "The queue name of receiver.") +@ConnectorAttribute(name = "consumer.queue.type", type = "string", direction = INCOMING, description = "The queue type of receiver. Supported values `durable-exclusive`, `durable-non-exclusive`, `non-durable-exclusive`", defaultValue = "durable-exclusive") @ConnectorAttribute(name = "consumer.queue.missing-resource-creation-strategy", type = "string", direction = INCOMING, description = "Missing resource creation strategy", defaultValue = "do-not-create") @ConnectorAttribute(name = "consumer.queue.add-additional-subscriptions", type = "boolean", direction = INCOMING, description = "Whether to add configured subscriptions to queue. Will fail if permissions to configure subscriptions is not allowed on broker", defaultValue = "false") @ConnectorAttribute(name = "consumer.queue.subscriptions", type = "string", direction = INCOMING, description = "The comma separated list of subscriptions, the channel name if empty") @ConnectorAttribute(name = "consumer.queue.selector-query", type = "string", direction = INCOMING, description = "The receiver selector query") -@ConnectorAttribute(name = "consumer.queue.replay.strategy", type = "string", direction = INCOMING, description = "The receiver replay strategy") +@ConnectorAttribute(name = "consumer.queue.replay.strategy", type = "string", direction = INCOMING, description = "The receiver replay strategy. Supported values all-messages, time-based, replication-group-message-id") @ConnectorAttribute(name = "consumer.queue.replay.timebased-start-time", type = "string", direction = INCOMING, description = "The receiver replay timebased start time") @ConnectorAttribute(name = "consumer.queue.replay.replication-group-message-id", type = "string", direction = INCOMING, description = "The receiver replay replication group message id") @ConnectorAttribute(name = "consumer.queue.failure-strategy", type = "string", direction = INCOMING, description = "Specify the failure strategy to apply when a message consumed from Solace broker is nacked. Accepted values are `ignore` (default), `fail`, `discard`, `error_topic`.", defaultValue = "ignore") diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/converters/SolaceMessageConverter.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/converters/SolaceMessageConverter.java similarity index 88% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/converters/SolaceMessageConverter.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/converters/SolaceMessageConverter.java index c5eb946..b219d53 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/converters/SolaceMessageConverter.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/converters/SolaceMessageConverter.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.converters; +package com.solace.quarkus.messaging.converters; import java.lang.reflect.Type; @@ -7,8 +7,8 @@ import org.eclipse.microprofile.reactive.messaging.Message; import com.solace.messaging.receiver.InboundMessage; +import com.solace.quarkus.messaging.incoming.SolaceInboundMetadata; -import io.quarkiverse.solace.incoming.SolaceInboundMetadata; import io.smallrye.reactive.messaging.MessageConverter; import io.smallrye.reactive.messaging.providers.helpers.TypeUtils; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/OutboundErrorMessageMapper.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/OutboundErrorMessageMapper.java similarity index 95% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/OutboundErrorMessageMapper.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/OutboundErrorMessageMapper.java index d19a0d4..452b95a 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/OutboundErrorMessageMapper.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/OutboundErrorMessageMapper.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.fault; +package com.solace.quarkus.messaging.fault; import java.util.Properties; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceDiscard.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceDiscard.java similarity index 86% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceDiscard.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceDiscard.java index 2d22f2d..fdb9223 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceDiscard.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceDiscard.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.fault; +package com.solace.quarkus.messaging.fault; import java.util.concurrent.CompletionStage; @@ -6,10 +6,10 @@ import com.solace.messaging.config.MessageAcknowledgementConfiguration; import com.solace.messaging.receiver.AcknowledgementSupport; +import com.solace.quarkus.messaging.i18n.SolaceLogging; +import com.solace.quarkus.messaging.incoming.SettleMetadata; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; -import io.quarkiverse.solace.i18n.SolaceLogging; -import io.quarkiverse.solace.incoming.SettleMetadata; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; import io.smallrye.mutiny.Uni; public class SolaceDiscard implements SolaceFailureHandler { diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceErrorTopic.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopic.java similarity index 93% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceErrorTopic.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopic.java index ec1aaee..76352b4 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceErrorTopic.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopic.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.fault; +package com.solace.quarkus.messaging.fault; import java.time.Duration; import java.util.concurrent.CompletionStage; @@ -8,9 +8,8 @@ import com.solace.messaging.MessagingService; import com.solace.messaging.config.MessageAcknowledgementConfiguration; import com.solace.messaging.receiver.AcknowledgementSupport; - -import io.quarkiverse.solace.i18n.SolaceLogging; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; +import com.solace.quarkus.messaging.i18n.SolaceLogging; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; public class SolaceErrorTopic implements SolaceFailureHandler { private final String channel; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceErrorTopicPublisherHandler.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopicPublisherHandler.java similarity index 93% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceErrorTopicPublisherHandler.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopicPublisherHandler.java index c6fc0fa..a43c1d9 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceErrorTopicPublisherHandler.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopicPublisherHandler.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.fault; +package com.solace.quarkus.messaging.fault; import com.solace.messaging.MessagingService; import com.solace.messaging.PubSubPlusClientException; @@ -6,9 +6,9 @@ import com.solace.messaging.publisher.PersistentMessagePublisher; import com.solace.messaging.publisher.PersistentMessagePublisher.PublishReceipt; import com.solace.messaging.resources.Topic; +import com.solace.quarkus.messaging.i18n.SolaceLogging; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; -import io.quarkiverse.solace.i18n.SolaceLogging; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.subscription.UniEmitter; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceFail.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFail.java similarity index 86% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceFail.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFail.java index cd6888e..b0769e6 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceFail.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFail.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.fault; +package com.solace.quarkus.messaging.fault; import java.util.concurrent.CompletionStage; @@ -6,10 +6,10 @@ import com.solace.messaging.config.MessageAcknowledgementConfiguration; import com.solace.messaging.receiver.AcknowledgementSupport; +import com.solace.quarkus.messaging.i18n.SolaceLogging; +import com.solace.quarkus.messaging.incoming.SettleMetadata; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; -import io.quarkiverse.solace.i18n.SolaceLogging; -import io.quarkiverse.solace.incoming.SettleMetadata; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; import io.smallrye.mutiny.Uni; public class SolaceFail implements SolaceFailureHandler { diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceFailureHandler.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFailureHandler.java similarity index 84% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceFailureHandler.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFailureHandler.java index 15eff4f..58b7f18 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceFailureHandler.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFailureHandler.java @@ -1,12 +1,11 @@ -package io.quarkiverse.solace.fault; - -import static io.quarkiverse.solace.i18n.SolaceExceptions.ex; +package com.solace.quarkus.messaging.fault; import java.util.concurrent.CompletionStage; import org.eclipse.microprofile.reactive.messaging.Metadata; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; +import com.solace.quarkus.messaging.i18n.SolaceExceptions; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; public interface SolaceFailureHandler { @@ -43,7 +42,7 @@ public static Strategy from(String s) { return ERROR_TOPIC; } - throw ex.illegalArgumentUnknownFailureStrategy(s); + throw SolaceExceptions.ex.illegalArgumentUnknownFailureStrategy(s); } } diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceIgnoreFailure.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceIgnoreFailure.java similarity index 78% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceIgnoreFailure.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceIgnoreFailure.java index ffdcfb1..7b4d68c 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/fault/SolaceIgnoreFailure.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceIgnoreFailure.java @@ -1,11 +1,12 @@ -package io.quarkiverse.solace.fault; +package com.solace.quarkus.messaging.fault; import java.util.concurrent.CompletionStage; import org.eclipse.microprofile.reactive.messaging.Metadata; -import io.quarkiverse.solace.i18n.SolaceLogging; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; +import com.solace.quarkus.messaging.i18n.SolaceLogging; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; + import io.smallrye.mutiny.Uni; public class SolaceIgnoreFailure implements SolaceFailureHandler { diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/i18n/SolaceExceptions.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceExceptions.java similarity index 96% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/i18n/SolaceExceptions.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceExceptions.java index 3fe3b69..962e0f7 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/i18n/SolaceExceptions.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceExceptions.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.i18n; +package com.solace.quarkus.messaging.i18n; import org.jboss.logging.Messages; import org.jboss.logging.annotations.Message; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/i18n/SolaceLogging.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceLogging.java similarity index 95% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/i18n/SolaceLogging.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceLogging.java index 843b5f6..e769662 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/i18n/SolaceLogging.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceLogging.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.i18n; +package com.solace.quarkus.messaging.i18n; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; @@ -11,7 +11,7 @@ @MessageLogger(projectCode = "SRMSG", length = 5) public interface SolaceLogging extends BasicLogger { - SolaceLogging log = Logger.getMessageLogger(SolaceLogging.class, "io.quarkiverse.solace"); + SolaceLogging log = Logger.getMessageLogger(SolaceLogging.class, "com.solace.quarkus"); @Once @LogMessage(level = Logger.Level.INFO) diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/IncomingMessagesUnsignedCounterBarrier.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/IncomingMessagesUnsignedCounterBarrier.java similarity index 97% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/IncomingMessagesUnsignedCounterBarrier.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/IncomingMessagesUnsignedCounterBarrier.java index 53d9e57..c354ae4 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/IncomingMessagesUnsignedCounterBarrier.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/IncomingMessagesUnsignedCounterBarrier.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.incoming; +package com.solace.quarkus.messaging.incoming; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -6,7 +6,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import io.quarkiverse.solace.i18n.SolaceLogging; +import com.solace.quarkus.messaging.i18n.SolaceLogging; class IncomingMessagesUnsignedCounterBarrier { private final AtomicLong counter; // Treated as an unsigned long (i.e. range from 0 -> -1) diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SettleMetadata.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SettleMetadata.java similarity index 94% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SettleMetadata.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SettleMetadata.java index af6fa5d..0274888 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SettleMetadata.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SettleMetadata.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.incoming; +package com.solace.quarkus.messaging.incoming; import com.solace.messaging.config.MessageAcknowledgementConfiguration; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceAckHandler.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceAckHandler.java similarity index 93% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceAckHandler.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceAckHandler.java index 7a2089d..78b564e 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceAckHandler.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceAckHandler.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.incoming; +package com.solace.quarkus.messaging.incoming; import java.util.concurrent.CompletionStage; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceInboundMessage.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMessage.java similarity index 97% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceInboundMessage.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMessage.java index 8af05ba..646ce2c 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceInboundMessage.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMessage.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.incoming; +package com.solace.quarkus.messaging.incoming; import static io.smallrye.reactive.messaging.providers.locals.ContextAwareMessage.captureContextMetadata; @@ -8,10 +8,10 @@ import org.eclipse.microprofile.reactive.messaging.Metadata; import com.solace.messaging.receiver.InboundMessage; +import com.solace.quarkus.messaging.fault.SolaceFailureHandler; +import com.solace.quarkus.messaging.i18n.SolaceLogging; import io.netty.handler.codec.http.HttpHeaderValues; -import io.quarkiverse.solace.fault.SolaceFailureHandler; -import io.quarkiverse.solace.i18n.SolaceLogging; import io.smallrye.reactive.messaging.providers.MetadataInjectableMessage; import io.smallrye.reactive.messaging.providers.locals.ContextAwareMessage; import io.vertx.core.buffer.Buffer; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceInboundMetadata.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMetadata.java similarity index 98% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceInboundMetadata.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMetadata.java index 3ce1272..6c48c35 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceInboundMetadata.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMetadata.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.incoming; +package com.solace.quarkus.messaging.incoming; import java.io.Serializable; import java.util.Map; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceIncomingChannel.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java similarity index 97% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceIncomingChannel.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java index 7a5c88e..899c2ff 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/incoming/SolaceIncomingChannel.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java @@ -1,6 +1,6 @@ -package io.quarkiverse.solace.incoming; +package com.solace.quarkus.messaging.incoming; -import static io.quarkiverse.solace.i18n.SolaceExceptions.ex; +import static com.solace.quarkus.messaging.i18n.SolaceExceptions.ex; import java.time.Duration; import java.time.ZonedDateTime; @@ -27,10 +27,10 @@ import com.solace.messaging.receiver.PersistentMessageReceiver; import com.solace.messaging.resources.Queue; import com.solace.messaging.resources.TopicSubscription; +import com.solace.quarkus.messaging.SolaceConnectorIncomingConfiguration; +import com.solace.quarkus.messaging.fault.*; +import com.solace.quarkus.messaging.i18n.SolaceLogging; -import io.quarkiverse.solace.SolaceConnectorIncomingConfiguration; -import io.quarkiverse.solace.fault.*; -import io.quarkiverse.solace.i18n.SolaceLogging; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.smallrye.reactive.messaging.health.HealthReport; @@ -166,12 +166,12 @@ private static Queue getQueue(SolaceConnectorIncomingConfiguration ic) { switch (queueType) { case "durable-non-exclusive": return Queue.durableNonExclusiveQueue(ic.getConsumerQueueName().orElse(ic.getChannel())); - case "durable-exclusive": - return Queue.durableExclusiveQueue(ic.getConsumerQueueName().orElse(ic.getChannel())); - default: case "non-durable-exclusive": return ic.getConsumerQueueName().map(Queue::nonDurableExclusiveQueue) .orElseGet(Queue::nonDurableExclusiveQueue); + default: + case "durable-exclusive": + return Queue.durableExclusiveQueue(ic.getConsumerQueueName().orElse(ic.getChannel())); } } diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/OutgoingMessagesUnsignedCounterBarrier.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/OutgoingMessagesUnsignedCounterBarrier.java similarity index 97% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/OutgoingMessagesUnsignedCounterBarrier.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/OutgoingMessagesUnsignedCounterBarrier.java index e9f4f75..bb3de77 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/OutgoingMessagesUnsignedCounterBarrier.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/OutgoingMessagesUnsignedCounterBarrier.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.outgoing; +package com.solace.quarkus.messaging.outgoing; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -6,7 +6,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import io.quarkiverse.solace.i18n.SolaceLogging; +import com.solace.quarkus.messaging.i18n.SolaceLogging; class OutgoingMessagesUnsignedCounterBarrier { private final AtomicLong counter; // Treated as an unsigned long (i.e. range from 0 -> -1) diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SenderProcessor.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SenderProcessor.java similarity index 96% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SenderProcessor.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SenderProcessor.java index 8aebbef..bd32e0d 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SenderProcessor.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SenderProcessor.java @@ -1,6 +1,6 @@ -package io.quarkiverse.solace.outgoing; +package com.solace.quarkus.messaging.outgoing; -import static io.quarkiverse.solace.i18n.SolaceExceptions.ex; +import static com.solace.quarkus.messaging.i18n.SolaceExceptions.ex; import java.util.concurrent.Flow.Processor; import java.util.concurrent.Flow.Subscriber; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutboundMessage.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMessage.java similarity index 97% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutboundMessage.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMessage.java index 02f2057..db264d9 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutboundMessage.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMessage.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.outgoing; +package com.solace.quarkus.messaging.outgoing; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutboundMetadata.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMetadata.java similarity index 99% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutboundMetadata.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMetadata.java index 2b83a19..bfcb224 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutboundMetadata.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMetadata.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.outgoing; +package com.solace.quarkus.messaging.outgoing; import java.util.Map; diff --git a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutgoingChannel.java b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutgoingChannel.java similarity index 98% rename from pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutgoingChannel.java rename to pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutgoingChannel.java index a0367b2..36de3cc 100644 --- a/pubsub-plus-connector/src/main/java/io/quarkiverse/solace/outgoing/SolaceOutgoingChannel.java +++ b/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutgoingChannel.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.outgoing; +package com.solace.quarkus.messaging.outgoing; import java.util.ArrayList; import java.util.List; @@ -19,10 +19,10 @@ import com.solace.messaging.publisher.PersistentMessagePublisher.PublishReceipt; import com.solace.messaging.publisher.PublisherHealthCheck; import com.solace.messaging.resources.Topic; +import com.solace.quarkus.messaging.SolaceConnectorOutgoingConfiguration; +import com.solace.quarkus.messaging.i18n.SolaceLogging; import io.netty.handler.codec.http.HttpHeaderValues; -import io.quarkiverse.solace.SolaceConnectorOutgoingConfiguration; -import io.quarkiverse.solace.i18n.SolaceLogging; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.subscription.UniEmitter; import io.smallrye.reactive.messaging.OutgoingMessageMetadata; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolaceConsumerTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceConsumerTest.java similarity index 97% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolaceConsumerTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceConsumerTest.java index 43100dd..947d3e9 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolaceConsumerTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceConsumerTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus.messaging; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -24,19 +24,19 @@ import com.solace.messaging.publisher.PersistentMessagePublisher; import com.solace.messaging.receiver.InboundMessage; import com.solace.messaging.resources.Topic; +import com.solace.quarkus.messaging.base.SolaceContainer; +import com.solace.quarkus.messaging.base.WeldTestBase; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; +import com.solace.quarkus.messaging.incoming.SolaceIncomingChannel; +import com.solace.quarkus.messaging.logging.SolaceTestAppender; -import io.quarkiverse.solace.base.SolaceContainer; -import io.quarkiverse.solace.base.WeldTestBase; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; -import io.quarkiverse.solace.incoming.SolaceIncomingChannel; -import io.quarkiverse.solace.logging.SolaceTestAppender; import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.test.common.config.MapBasedConfig; import io.vertx.mutiny.core.Vertx; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class SolaceConsumerTest extends WeldTestBase { - private org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getLogger("io.quarkiverse.solace"); + private org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getLogger("com.solace.quarkus"); private SolaceTestAppender solaceTestAppender = new SolaceTestAppender(); private SolaceConsumerTest() { diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolaceProcessorTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceProcessorTest.java similarity index 97% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolaceProcessorTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceProcessorTest.java index a14fa64..a08872b 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolaceProcessorTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceProcessorTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus.messaging; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -19,8 +19,8 @@ import com.solace.messaging.resources.Queue; import com.solace.messaging.resources.Topic; import com.solace.messaging.resources.TopicSubscription; +import com.solace.quarkus.messaging.base.WeldTestBase; -import io.quarkiverse.solace.base.WeldTestBase; import io.smallrye.reactive.messaging.test.common.config.MapBasedConfig; public class SolaceProcessorTest extends WeldTestBase { diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolacePublisherTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolacePublisherTest.java similarity index 97% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolacePublisherTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolacePublisherTest.java index b07eca2..6a8c5f4 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/SolacePublisherTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolacePublisherTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus.messaging; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -18,10 +18,10 @@ import com.solace.messaging.receiver.PersistentMessageReceiver; import com.solace.messaging.resources.Queue; import com.solace.messaging.resources.TopicSubscription; +import com.solace.quarkus.messaging.base.WeldTestBase; +import com.solace.quarkus.messaging.outgoing.SolaceOutboundMetadata; +import com.solace.quarkus.messaging.outgoing.SolaceOutgoingChannel; -import io.quarkiverse.solace.base.WeldTestBase; -import io.quarkiverse.solace.outgoing.SolaceOutboundMetadata; -import io.quarkiverse.solace.outgoing.SolaceOutgoingChannel; import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.test.common.config.MapBasedConfig; import io.vertx.mutiny.core.Vertx; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/MessagingServiceProvider.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/MessagingServiceProvider.java similarity index 89% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/MessagingServiceProvider.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/MessagingServiceProvider.java index 1460286..3535734 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/MessagingServiceProvider.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/MessagingServiceProvider.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.base; +package com.solace.quarkus.messaging.base; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceBaseTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBaseTest.java similarity index 98% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceBaseTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBaseTest.java index 3ce5673..cae302d 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceBaseTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBaseTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.base; +package com.solace.quarkus.messaging.base; import java.lang.reflect.Method; import java.util.Properties; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceBrokerExtension.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBrokerExtension.java similarity index 99% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceBrokerExtension.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBrokerExtension.java index cf9993c..7b7d3be 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceBrokerExtension.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBrokerExtension.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.base; +package com.solace.quarkus.messaging.base; import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; import static org.testcontainers.shaded.org.awaitility.Awaitility.await; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceContainer.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceContainer.java similarity index 99% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceContainer.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceContainer.java index 88496c6..2211e3d 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/SolaceContainer.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceContainer.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.base; +package com.solace.quarkus.messaging.base; import java.io.IOException; import java.time.Duration; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/WeldTestBase.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java similarity index 96% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/WeldTestBase.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java index 6642470..69ae66f 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/base/WeldTestBase.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.base; +package com.solace.quarkus.messaging.base; import jakarta.enterprise.inject.spi.BeanManager; @@ -9,8 +9,9 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import io.quarkiverse.solace.SolaceConnector; -import io.quarkiverse.solace.converters.SolaceMessageConverter; +import com.solace.quarkus.messaging.SolaceConnector; +import com.solace.quarkus.messaging.converters.SolaceMessageConverter; + import io.smallrye.config.SmallRyeConfigProviderResolver; import io.smallrye.config.inject.ConfigExtension; import io.smallrye.reactive.messaging.providers.MediatorFactory; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/health/SolaceConsumerHealthTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolaceConsumerHealthTest.java similarity index 96% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/health/SolaceConsumerHealthTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolaceConsumerHealthTest.java index a702b08..cebe907 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/health/SolaceConsumerHealthTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolaceConsumerHealthTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.health; +package com.solace.quarkus.messaging.health; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -16,9 +16,9 @@ import com.solace.messaging.publisher.PersistentMessagePublisher; import com.solace.messaging.receiver.InboundMessage; import com.solace.messaging.resources.Topic; +import com.solace.quarkus.messaging.base.WeldTestBase; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; -import io.quarkiverse.solace.base.WeldTestBase; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; import io.smallrye.reactive.messaging.health.HealthReport; import io.smallrye.reactive.messaging.test.common.config.MapBasedConfig; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/health/SolacePublisherHealthCheck.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolacePublisherHealthCheck.java similarity index 97% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/health/SolacePublisherHealthCheck.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolacePublisherHealthCheck.java index 93d9a8d..559d49e 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/health/SolacePublisherHealthCheck.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolacePublisherHealthCheck.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.health; +package com.solace.quarkus.messaging.health; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -16,8 +16,8 @@ import com.solace.messaging.receiver.PersistentMessageReceiver; import com.solace.messaging.resources.Queue; import com.solace.messaging.resources.TopicSubscription; +import com.solace.quarkus.messaging.base.WeldTestBase; -import io.quarkiverse.solace.base.WeldTestBase; import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.health.HealthReport; import io.smallrye.reactive.messaging.test.common.config.MapBasedConfig; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/locals/LocalPropagationAckTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationAckTest.java similarity index 96% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/locals/LocalPropagationAckTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationAckTest.java index 4cb56f7..dbf8a3a 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/locals/LocalPropagationAckTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationAckTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.locals; +package com.solace.quarkus.messaging.locals; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -16,10 +16,10 @@ import com.solace.messaging.publisher.PersistentMessagePublisher; import com.solace.messaging.resources.Topic; +import com.solace.quarkus.messaging.SolaceConnector; +import com.solace.quarkus.messaging.base.WeldTestBase; import io.netty.handler.codec.http.HttpHeaderValues; -import io.quarkiverse.solace.SolaceConnector; -import io.quarkiverse.solace.base.WeldTestBase; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.smallrye.reactive.messaging.providers.locals.LocalContextMetadata; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/locals/LocalPropagationTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationTest.java similarity index 99% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/locals/LocalPropagationTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationTest.java index dfea61a..798e5bc 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/locals/LocalPropagationTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.locals; +package com.solace.quarkus.messaging.locals; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -22,10 +22,10 @@ import com.solace.messaging.publisher.PersistentMessagePublisher; import com.solace.messaging.resources.Topic; +import com.solace.quarkus.messaging.SolaceConnector; +import com.solace.quarkus.messaging.base.WeldTestBase; import io.netty.handler.codec.http.HttpHeaderValues; -import io.quarkiverse.solace.SolaceConnector; -import io.quarkiverse.solace.base.WeldTestBase; import io.smallrye.common.vertx.ContextLocals; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.infrastructure.Infrastructure; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/logging/SolaceTestAppender.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/logging/SolaceTestAppender.java similarity index 92% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/logging/SolaceTestAppender.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/logging/SolaceTestAppender.java index 0558689..061b080 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/logging/SolaceTestAppender.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/logging/SolaceTestAppender.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.logging; +package com.solace.quarkus.messaging.logging; import java.util.ArrayList; import java.util.List; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/EndToEndPerformanceTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/EndToEndPerformanceTest.java similarity index 99% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/EndToEndPerformanceTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/EndToEndPerformanceTest.java index e2c2ee4..a20ef6e 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/EndToEndPerformanceTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/EndToEndPerformanceTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.perf; +package com.solace.quarkus.messaging.perf; import static org.awaitility.Awaitility.await; @@ -20,9 +20,9 @@ import com.solace.messaging.resources.Queue; import com.solace.messaging.resources.Topic; import com.solace.messaging.resources.TopicSubscription; +import com.solace.quarkus.messaging.base.WeldTestBase; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; -import io.quarkiverse.solace.base.WeldTestBase; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.annotations.Blocking; import io.smallrye.reactive.messaging.test.common.config.MapBasedConfig; diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/SolaceConsumerPerformanceTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolaceConsumerPerformanceTest.java similarity index 94% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/SolaceConsumerPerformanceTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolaceConsumerPerformanceTest.java index d5da51d..22ce277 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/SolaceConsumerPerformanceTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolaceConsumerPerformanceTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.perf; +package com.solace.quarkus.messaging.perf; import static org.awaitility.Awaitility.await; @@ -15,9 +15,9 @@ import com.solace.messaging.publisher.PersistentMessagePublisher; import com.solace.messaging.resources.Topic; +import com.solace.quarkus.messaging.base.WeldTestBase; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; -import io.quarkiverse.solace.base.WeldTestBase; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; import io.smallrye.reactive.messaging.test.common.config.MapBasedConfig; public class SolaceConsumerPerformanceTest extends WeldTestBase { diff --git a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/SolacePublisherPerformanceTest.java b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolacePublisherPerformanceTest.java similarity index 98% rename from pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/SolacePublisherPerformanceTest.java rename to pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolacePublisherPerformanceTest.java index 4e35e6d..60e576b 100644 --- a/pubsub-plus-connector/src/test/java/io/quarkiverse/solace/perf/SolacePublisherPerformanceTest.java +++ b/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolacePublisherPerformanceTest.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.perf; +package com.solace.quarkus.messaging.perf; import static org.awaitility.Awaitility.await; @@ -16,8 +16,8 @@ import com.solace.messaging.receiver.PersistentMessageReceiver; import com.solace.messaging.resources.Queue; import com.solace.messaging.resources.TopicSubscription; +import com.solace.quarkus.messaging.base.WeldTestBase; -import io.quarkiverse.solace.base.WeldTestBase; import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.test.common.config.MapBasedConfig; diff --git a/runtime/pom.xml b/runtime/pom.xml index 890b1df..52a79e7 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-parent 999-SNAPSHOT diff --git a/runtime/src/main/java/io/quarkiverse/solace/MessagingServiceClientCustomizer.java b/runtime/src/main/java/com/solace/quarkus/MessagingServiceClientCustomizer.java similarity index 97% rename from runtime/src/main/java/io/quarkiverse/solace/MessagingServiceClientCustomizer.java rename to runtime/src/main/java/com/solace/quarkus/MessagingServiceClientCustomizer.java index 2caecff..b352bd2 100644 --- a/runtime/src/main/java/io/quarkiverse/solace/MessagingServiceClientCustomizer.java +++ b/runtime/src/main/java/com/solace/quarkus/MessagingServiceClientCustomizer.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace; +package com.solace.quarkus; import com.solace.messaging.MessagingServiceClientBuilder; diff --git a/runtime/src/main/java/io/quarkiverse/solace/runtime/SolaceConfig.java b/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java similarity index 93% rename from runtime/src/main/java/io/quarkiverse/solace/runtime/SolaceConfig.java rename to runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java index 4ab42e4..1572847 100644 --- a/runtime/src/main/java/io/quarkiverse/solace/runtime/SolaceConfig.java +++ b/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.runtime; +package com.solace.quarkus.runtime; import java.util.Map; diff --git a/runtime/src/main/java/io/quarkiverse/solace/runtime/SolaceRecorder.java b/runtime/src/main/java/com/solace/quarkus/runtime/SolaceRecorder.java similarity index 96% rename from runtime/src/main/java/io/quarkiverse/solace/runtime/SolaceRecorder.java rename to runtime/src/main/java/com/solace/quarkus/runtime/SolaceRecorder.java index 43ec4dd..01bcda6 100644 --- a/runtime/src/main/java/io/quarkiverse/solace/runtime/SolaceRecorder.java +++ b/runtime/src/main/java/com/solace/quarkus/runtime/SolaceRecorder.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.runtime; +package com.solace.quarkus.runtime; import java.util.Map; import java.util.Properties; @@ -11,8 +11,8 @@ import com.solace.messaging.MessagingServiceClientBuilder; import com.solace.messaging.config.SolaceProperties; import com.solace.messaging.config.profile.ConfigurationProfile; +import com.solace.quarkus.MessagingServiceClientCustomizer; -import io.quarkiverse.solace.MessagingServiceClientCustomizer; import io.quarkus.arc.SyntheticCreationalContext; import io.quarkus.runtime.ShutdownContext; import io.quarkus.runtime.annotations.Recorder; diff --git a/runtime/src/main/java/io/quarkiverse/solace/runtime/observability/SolaceHealthCheck.java b/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceHealthCheck.java similarity index 92% rename from runtime/src/main/java/io/quarkiverse/solace/runtime/observability/SolaceHealthCheck.java rename to runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceHealthCheck.java index ce475db..50ead2d 100644 --- a/runtime/src/main/java/io/quarkiverse/solace/runtime/observability/SolaceHealthCheck.java +++ b/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceHealthCheck.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.runtime.observability; +package com.solace.quarkus.runtime.observability; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/runtime/src/main/java/io/quarkiverse/solace/runtime/observability/SolaceMetricBinder.java b/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceMetricBinder.java similarity index 93% rename from runtime/src/main/java/io/quarkiverse/solace/runtime/observability/SolaceMetricBinder.java rename to runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceMetricBinder.java index 3f8e0f9..78ba755 100644 --- a/runtime/src/main/java/io/quarkiverse/solace/runtime/observability/SolaceMetricBinder.java +++ b/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceMetricBinder.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.runtime.observability; +package com.solace.quarkus.runtime.observability; import jakarta.enterprise.inject.spi.CDI; diff --git a/samples/hello-connector-solace/pom.xml b/samples/hello-connector-solace/pom.xml index b6a2708..3e9a7fc 100644 --- a/samples/hello-connector-solace/pom.xml +++ b/samples/hello-connector-solace/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-parent 999-SNAPSHOT ../../pom.xml @@ -16,7 +16,7 @@ quarkus-resteasy-reactive-jackson - io.quarkiverse.solace + com.solace.quarkus quarkus-solace ${project.version} @@ -29,7 +29,7 @@ quarkus-smallrye-health - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-messaging-connector ${project.version} diff --git a/samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/HelloConsumer.java b/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java similarity index 94% rename from samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/HelloConsumer.java rename to samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java index 63fb943..31fc3c9 100644 --- a/samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/HelloConsumer.java +++ b/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.samples; +package com.solace.quarkus.samples; import java.nio.charset.StandardCharsets; import java.util.concurrent.CompletableFuture; @@ -7,8 +7,9 @@ import org.eclipse.microprofile.reactive.messaging.*; -import io.quarkiverse.solace.incoming.SolaceInboundMessage; -import io.quarkiverse.solace.outgoing.SolaceOutboundMetadata; +import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; +import com.solace.quarkus.messaging.outgoing.SolaceOutboundMetadata; + import io.quarkus.logging.Log; @ApplicationScoped diff --git a/samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/Person.java b/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/Person.java similarity index 83% rename from samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/Person.java rename to samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/Person.java index 2c7838a..0ec9421 100644 --- a/samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/Person.java +++ b/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/Person.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.samples; +package com.solace.quarkus.samples; public class Person { diff --git a/samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/PublisherResource.java b/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/PublisherResource.java similarity index 92% rename from samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/PublisherResource.java rename to samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/PublisherResource.java index 687f0f2..3b9ebc8 100644 --- a/samples/hello-connector-solace/src/main/java/io/quarkiverse/solace/samples/PublisherResource.java +++ b/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/PublisherResource.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.samples; +package com.solace.quarkus.samples; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; @@ -7,7 +7,8 @@ import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.messaging.Metadata; -import io.quarkiverse.solace.outgoing.SolaceOutboundMetadata; +import com.solace.quarkus.messaging.outgoing.SolaceOutboundMetadata; + import io.smallrye.mutiny.Uni; import io.smallrye.reactive.messaging.MutinyEmitter; diff --git a/samples/hello-solace/pom.xml b/samples/hello-solace/pom.xml index d7df196..ea91be7 100644 --- a/samples/hello-solace/pom.xml +++ b/samples/hello-solace/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - io.quarkiverse.solace + com.solace.quarkus quarkus-solace-parent 999-SNAPSHOT ../../pom.xml @@ -16,7 +16,7 @@ quarkus-resteasy-reactive-jackson - io.quarkiverse.solace + com.solace.quarkus quarkus-solace ${project.version} diff --git a/samples/hello-solace/src/main/java/io/quarkiverse/solace/samples/HelloConsumer.java b/samples/hello-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java similarity index 96% rename from samples/hello-solace/src/main/java/io/quarkiverse/solace/samples/HelloConsumer.java rename to samples/hello-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java index 4d5010f..f47ff7f 100644 --- a/samples/hello-solace/src/main/java/io/quarkiverse/solace/samples/HelloConsumer.java +++ b/samples/hello-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.samples; +package com.solace.quarkus.samples; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Observes; diff --git a/samples/hello-solace/src/main/java/io/quarkiverse/solace/samples/PublisherResource.java b/samples/hello-solace/src/main/java/com/solace/quarkus/samples/PublisherResource.java similarity index 95% rename from samples/hello-solace/src/main/java/io/quarkiverse/solace/samples/PublisherResource.java rename to samples/hello-solace/src/main/java/com/solace/quarkus/samples/PublisherResource.java index 554c453..bcf9ea7 100644 --- a/samples/hello-solace/src/main/java/io/quarkiverse/solace/samples/PublisherResource.java +++ b/samples/hello-solace/src/main/java/com/solace/quarkus/samples/PublisherResource.java @@ -1,4 +1,4 @@ -package io.quarkiverse.solace.samples; +package com.solace.quarkus.samples; import jakarta.enterprise.event.Observes; import jakarta.ws.rs.POST; From e8179dc6ffcb81993b9631a83a0885ebb5222137 Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Wed, 24 Jan 2024 11:14:39 +0530 Subject: [PATCH 2/3] Included common configuration --- docs/modules/ROOT/pages/index.adoc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 9d5727b..b31bc50 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -23,8 +23,6 @@ For instance, with Maven, add the following dependency to your POM file: [[extension-configuration-reference]] == Extension Configuration Reference -TIP: Remove this section if you don't have Quarkus configuration properties in your extension. - include::includes/quarkus-solace.adoc[leveloffset=+1, opts=optional] [[extension-incoming-configuration-reference]] @@ -35,4 +33,9 @@ include::includes/quarkus-solace-extension-incoming.adoc[leveloffset=+1, opts=op [[extension-outgoing-configuration-reference]] == Outgoing Configuration Reference -include::includes/quarkus-solace-extension-outgoing.adoc[leveloffset=+1, opts=optional] \ No newline at end of file +include::includes/quarkus-solace-extension-outgoing.adoc[leveloffset=+1, opts=optional] + +[[extension-common-configuration-reference]] +== Common Configuration Reference + +include::includes/quarkus-solace-extension-common.adoc[leveloffset=+1, opts=optional] \ No newline at end of file From 7fecd65902edf5dfa2de4f1c993eca9fcd9c031d Mon Sep 17 00:00:00 2001 From: SravanThotakura05 <83568543+SravanThotakura05@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:23:47 +0530 Subject: [PATCH 3/3] Fixed docs to include solace connection configuration --- .../ROOT/pages/includes/quarkus-solace.adoc | 57 +++++++++++++++++++ .../solace/quarkus/runtime/SolaceConfig.java | 16 +++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/includes/quarkus-solace.adoc b/docs/modules/ROOT/pages/includes/quarkus-solace.adoc index a9d5393..b5eedf9 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-solace.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-solace.adoc @@ -120,6 +120,40 @@ endif::add-copy-button-to-env-var[] |`solace` +a| [[quarkus-solace_quarkus.solace.host]]`link:#quarkus-solace_quarkus.solace.host[quarkus.solace.host]` + + +[.description] +-- +The Solace host (hostname:port) + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_HOST+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_SOLACE_HOST+++` +endif::add-copy-button-to-env-var[] +--|string +|required icon:exclamation-circle[title=Configuration property is required] + + +a| [[quarkus-solace_quarkus.solace.vpn]]`link:#quarkus-solace_quarkus.solace.vpn[quarkus.solace.vpn]` + + +[.description] +-- +The Solace VPN + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_VPN+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_SOLACE_VPN+++` +endif::add-copy-button-to-env-var[] +--|string +|required icon:exclamation-circle[title=Configuration property is required] + + a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.container-env-container-env]]`link:#quarkus-solace_quarkus.solace.devservices.container-env-container-env[quarkus.solace.devservices.container-env]` @@ -136,4 +170,27 @@ endif::add-copy-button-to-env-var[] --|`Map` | + +a| [[quarkus-solace_quarkus.solace-extra]]`link:#quarkus-solace_quarkus.solace-extra[quarkus.solace]` + + +[.description] +-- +Any extra parameters to pass to the Solace client. + + + + + +Refer to link:https://docs.solace.com/API-Developer-Online-Ref-Documentation/pubsubplus-java/constant-values.html#com.solace.messaging.config.SolaceProperties.AuthenticationProperties.SCHEME[AuthenticationProperties] and link:https://docs.solace.com/API-Developer-Online-Ref-Documentation/pubsubplus-java/constant-values.html#com.solace.messaging.config.SolaceProperties.TransportLayerProperties.COMPRESSION_LEVEL[TransportLayerProperties] for more configuration options + + + + + +Example: To configure compression `quarkus.solace.transport.compression-level` + +ifdef::add-copy-button-to-env-var[] +Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE+++[] +endif::add-copy-button-to-env-var[] +ifndef::add-copy-button-to-env-var[] +Environment variable: `+++QUARKUS_SOLACE+++` +endif::add-copy-button-to-env-var[] +--|`Map` +| + |=== \ No newline at end of file diff --git a/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java b/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java index 1572847..27d9699 100644 --- a/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java +++ b/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java @@ -22,7 +22,21 @@ public interface SolaceConfig { String vpn(); /** - * Any extra parameters to pass to the Solace client + * Any extra parameters to pass to the Solace client. + *
+ *
+ *
+ * Refer to + * AuthenticationProperties + * and + * TransportLayerProperties + * for more configuration options + *
+ *
+ *
+ * Example: To configure compression `quarkus.solace.transport.compression-level` */ @WithParentName Map extra();