diff --git a/.github/project.yml b/.github/project.yml index dad974ad..859817b6 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,4 +1,4 @@ release: - current-version: "1.13.2" + current-version: "1.13.3" next-version: "1.14.0-SNAPSHOT" diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc index 5ccde4b6..7d605e20 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 1.13.2 +:project-version: 1.13.3 :examples-dir: ./../examples/ \ No newline at end of file diff --git a/runtime/src/main/java/io/quarkiverse/reactive/messaging/nats/jetstream/JetStreamConnector.java b/runtime/src/main/java/io/quarkiverse/reactive/messaging/nats/jetstream/JetStreamConnector.java index 3a4a3339..feeddb8d 100644 --- a/runtime/src/main/java/io/quarkiverse/reactive/messaging/nats/jetstream/JetStreamConnector.java +++ b/runtime/src/main/java/io/quarkiverse/reactive/messaging/nats/jetstream/JetStreamConnector.java @@ -19,10 +19,9 @@ import org.eclipse.microprofile.reactive.messaging.spi.Connector; import io.quarkiverse.reactive.messaging.nats.NatsConfiguration; -import io.quarkiverse.reactive.messaging.nats.jetstream.client.*; +import io.quarkiverse.reactive.messaging.nats.jetstream.client.ConnectionFactory; import io.quarkiverse.reactive.messaging.nats.jetstream.client.configuration.ConnectionConfiguration; import io.quarkiverse.reactive.messaging.nats.jetstream.client.configuration.ConsumerType; -import io.quarkiverse.reactive.messaging.nats.jetstream.client.message.MessageFactory; import io.quarkiverse.reactive.messaging.nats.jetstream.processors.MessageProcessor; import io.quarkiverse.reactive.messaging.nats.jetstream.processors.publisher.*; import io.quarkiverse.reactive.messaging.nats.jetstream.processors.subscriber.MessageSubscriberConfiguration; @@ -32,8 +31,6 @@ import io.smallrye.reactive.messaging.connector.OutboundConnector; import io.smallrye.reactive.messaging.health.HealthReport; import io.smallrye.reactive.messaging.health.HealthReporter; -import io.smallrye.reactive.messaging.providers.connectors.ExecutionHolder; -import io.vertx.mutiny.core.Vertx; @ApplicationScoped @Connector(JetStreamConnector.CONNECTOR_NAME) @@ -81,21 +78,15 @@ public class JetStreamConnector implements InboundConnector, OutboundConnector, public static final String CONNECTOR_NAME = "quarkus-jetstream"; private final List processors; - private final ExecutionHolder executionHolder; private final NatsConfiguration natsConfiguration; private final ConnectionFactory connectionFactory; - private final MessageFactory messageFactory; @Inject public JetStreamConnector( - ExecutionHolder executionHolder, NatsConfiguration natsConfiguration, - ConnectionFactory connectionFactory, - MessageFactory messageFactory) { + ConnectionFactory connectionFactory) { this.processors = new CopyOnWriteArrayList<>(); - this.executionHolder = executionHolder; this.natsConfiguration = natsConfiguration; - this.messageFactory = messageFactory; this.connectionFactory = connectionFactory; } @@ -143,10 +134,6 @@ public void terminate( this.processors.forEach(MessageProcessor::close); } - public Vertx getVertx() { - return executionHolder.vertx(); - } - private MessagePublisherProcessor createMessagePublisherProcessor(JetStreamConnectorIncomingConfiguration configuration) { final var connectionConfiguration = ConnectionConfiguration.of(natsConfiguration); final var type = ConsumerType.valueOf(configuration.getPublisherType()); diff --git a/runtime/src/main/java/io/quarkiverse/reactive/messaging/nats/jetstream/graal/Target_EdDSAEngine.java b/runtime/src/main/java/io/quarkiverse/reactive/messaging/nats/jetstream/graal/Target_EdDSAEngine.java index 36b63a0b..9c74f470 100644 --- a/runtime/src/main/java/io/quarkiverse/reactive/messaging/nats/jetstream/graal/Target_EdDSAEngine.java +++ b/runtime/src/main/java/io/quarkiverse/reactive/messaging/nats/jetstream/graal/Target_EdDSAEngine.java @@ -1,7 +1,10 @@ package io.quarkiverse.reactive.messaging.nats.jetstream.graal; import java.io.ByteArrayOutputStream; -import java.security.*; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; import java.security.spec.InvalidKeySpecException; import java.security.spec.X509EncodedKeySpec;