Skip to content

Commit

Permalink
Merge pull request #30 from SolaceCoEExt/fix-issues
Browse files Browse the repository at this point in the history
Changed maven artifact coordinates and package names to com.solace.quarkus
  • Loading branch information
SravanThotakura05 authored Jan 24, 2024
2 parents c348e75 + 7fecd65 commit cc377ea
Show file tree
Hide file tree
Showing 79 changed files with 278 additions and 193 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace-parent</artifactId>
<version>999-SNAPSHOT</version>
</parent>
Expand All @@ -19,7 +19,7 @@
<artifactId>quarkus-smallrye-health-spi</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace.deployment;
package com.solace.quarkus.deployment;

import java.util.Map;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace.deployment;
package com.solace.quarkus.deployment;

import static io.quarkus.runtime.LaunchMode.DEVELOPMENT;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace.deployment;
package com.solace.quarkus.deployment;

import io.quarkus.builder.item.SimpleBuildItem;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace.deployment;
package com.solace.quarkus.deployment;

import java.util.Optional;
import java.util.function.Function;
Expand All @@ -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;
Expand Down Expand Up @@ -97,7 +97,7 @@ void configureNativeCompilation(BuildProducer<RuntimeInitializedClassBuildItem>

@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());
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace.test;
package com.solace.quarkus.deployment.test;

import java.io.IOException;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace.test;
package com.solace.quarkus.deployment.test;

import static org.assertj.core.api.Assertions.assertThat;

Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace.test;
package com.solace.quarkus.deployment.test;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
@@ -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`

|===
Original file line number Diff line number Diff line change
Expand Up @@ -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+++[]
Expand All @@ -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]`
Expand Down Expand Up @@ -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`

|===
8 changes: 7 additions & 1 deletion docs/modules/ROOT/pages/includes/quarkus-solace.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,13 @@ a| [[quarkus-solace_quarkus.solace-extra]]`link:#quarkus-solace_quarkus.solace-e

[.description]
--
Any extra parameters to pass to the Solace client
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+++[]
Expand Down
13 changes: 8 additions & 5 deletions docs/modules/ROOT/pages/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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+]
----
<dependency>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace</artifactId>
<version>{project-version}</version>
</dependency>
Expand All @@ -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]]
Expand All @@ -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]
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]
4 changes: 2 additions & 2 deletions docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace-parent</artifactId>
<version>999-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
Expand All @@ -16,7 +16,7 @@
<dependencies>
<!-- Make sure the doc is built after the other artifacts -->
<dependency>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace-deployment</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace-parent</artifactId>
<version>999-SNAPSHOT</version>
</parent>
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/solace-client-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace-integration-tests-parent</artifactId>
<version>999-SNAPSHOT</version>
</parent>
Expand All @@ -18,7 +18,7 @@
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace;
package com.solace.quarkus;

import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace;
package com.solace.quarkus;

import jakarta.enterprise.context.ApplicationScoped;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace;
package com.solace.quarkus;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace;
package com.solace.quarkus;

import io.quarkus.test.junit.QuarkusIntegrationTest;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkiverse.solace;
package com.solace.quarkus;

import static org.awaitility.Awaitility.await;

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<artifactId>quarkiverse-parent</artifactId>
<version>15</version>
</parent>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace-parent</artifactId>
<version>999-SNAPSHOT</version>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pubsub-plus-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.quarkiverse.solace</groupId>
<groupId>com.solace.quarkus</groupId>
<artifactId>quarkus-solace-parent</artifactId>
<version>999-SNAPSHOT</version>
</parent>
Expand Down
Loading

0 comments on commit cc377ea

Please sign in to comment.