Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Vert.x 4.5.1 #2427

Merged
merged 3 commits into from
Jan 2, 2024
Merged

Bump to Vert.x 4.5.1 #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3817935
Bump to Vert.x 4.5.1
cescoffier Dec 20, 2023
6be6aa9
Do not execute on the context after shutdown
cescoffier Dec 20, 2023
80162bf
Update Vert.x Mutiny Binding to version 3.8.0
cescoffier Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<vertx.version>4.4.5</vertx.version>
<vertx.version>4.5.1</vertx.version>
<rxjava.version>2.2.21</rxjava.version>
<cloudevent.version>1.1.0</cloudevent.version>
<weld.version>5.1.2.Final</weld.version>
Expand Down Expand Up @@ -93,7 +93,7 @@
<opentelemetry.version>1.31.0-alpha</opentelemetry.version>
<opentelemetry-semconv.version>1.21.0-alpha</opentelemetry-semconv.version>

<smallrye-vertx-mutiny-clients.version>3.6.0</smallrye-vertx-mutiny-clients.version>
<smallrye-vertx-mutiny-clients.version>3.8.0</smallrye-vertx-mutiny-clients.version>
<smallrye-reactive-converters.version>3.0.0</smallrye-reactive-converters.version>
<mutiny-zero.version>1.0.0</mutiny-zero.version>

Expand Down
26 changes: 9 additions & 17 deletions ...-messaging-kafka/src/main/java/io/smallrye/reactive/messaging/kafka/impl/KafkaSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@
import static io.smallrye.reactive.messaging.kafka.impl.RebalanceListeners.findMatchingListener;

import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

Expand All @@ -32,13 +25,7 @@
import io.smallrye.mutiny.Multi;
import io.smallrye.mutiny.Uni;
import io.smallrye.reactive.messaging.health.HealthReport;
import io.smallrye.reactive.messaging.kafka.DeserializationFailureHandler;
import io.smallrye.reactive.messaging.kafka.IncomingKafkaRecord;
import io.smallrye.reactive.messaging.kafka.IncomingKafkaRecordBatch;
import io.smallrye.reactive.messaging.kafka.KafkaCDIEvents;
import io.smallrye.reactive.messaging.kafka.KafkaConnectorIncomingConfiguration;
import io.smallrye.reactive.messaging.kafka.KafkaConsumerRebalanceListener;
import io.smallrye.reactive.messaging.kafka.KafkaRecord;
import io.smallrye.reactive.messaging.kafka.*;
import io.smallrye.reactive.messaging.kafka.commit.ContextHolder;
import io.smallrye.reactive.messaging.kafka.commit.KafkaCommitHandler;
import io.smallrye.reactive.messaging.kafka.fault.KafkaDeadLetterQueue;
Expand All @@ -47,7 +34,7 @@
import io.smallrye.reactive.messaging.kafka.health.KafkaSourceHealth;
import io.smallrye.reactive.messaging.kafka.tracing.KafkaOpenTelemetryInstrumenter;
import io.smallrye.reactive.messaging.kafka.tracing.KafkaTrace;
import io.vertx.core.impl.EventLoopContext;
import io.vertx.core.impl.ContextInternal;
import io.vertx.core.impl.VertxInternal;
import io.vertx.mutiny.core.Vertx;

Expand All @@ -74,7 +61,12 @@ public class KafkaSource<K, V> {
private final Instance<DeserializationFailureHandler<?>> deserializationFailureHandlers;
private final Instance<KafkaConsumerRebalanceListener> consumerRebalanceListeners;
private final ReactiveKafkaConsumer<K, V> client;
private final EventLoopContext context;

/**
* This field stores the event loop context.
* Using {@code ContextInternal} to distinguish it from the {@code Context} used by the user.
*/
private final ContextInternal context;

private final KafkaOpenTelemetryInstrumenter kafkaInstrumenter;

Expand Down
4 changes: 1 addition & 3 deletions .../src/test/java/io/smallrye/reactive/messaging/kafka/commit/RedisCheckpointStateStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import io.vertx.mutiny.redis.client.Request;
import io.vertx.mutiny.redis.client.Response;
import io.vertx.redis.client.RedisOptions;
import io.vertx.redis.client.RedisOptionsConverter;

public class RedisCheckpointStateStore implements CheckpointStateStore {

Expand Down Expand Up @@ -83,8 +82,7 @@ public CheckpointStateStore create(KafkaConnectorIncomingConfiguration config, V

JsonObject entries = JsonHelper.asJsonObject(config.config(),
KafkaCommitHandler.Strategy.CHECKPOINT + "." + STATE_STORE_NAME + ".");
RedisOptions options = new RedisOptions();
RedisOptionsConverter.fromJson(entries, options);
RedisOptions options = new RedisOptions(entries);
Redis redis = Redis.createClient(vertx, options);

ProcessingStateCodec stateCodec = CDIUtils.getInstanceById(stateCodecFactory, config.getChannel(), () -> {
Expand Down
7 changes: 6 additions & 1 deletion ...src/main/java/io/smallrye/reactive/messaging/mqtt/session/impl/MqttClientSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.RejectedExecutionException;
import java.util.stream.Collectors;

import io.netty.handler.codec.mqtt.MqttQoS;
Expand Down Expand Up @@ -97,7 +98,11 @@ public Future<Void> start() {
@Override
public Future<Void> stop() {
Promise<Void> promise = Promise.promise();
this.vertx.runOnContext(x -> doStop(promise));
try {
this.vertx.runOnContext(x -> doStop(promise));
} catch (RejectedExecutionException e) {
// Vert.x has been shutdown, ignore it.
}
return promise.future();
}

Expand Down
20 changes: 8 additions & 12 deletions ...ing-pulsar/src/main/java/io/smallrye/reactive/messaging/pulsar/PulsarIncomingChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;

import org.apache.pulsar.client.api.BatchReceivePolicy;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.ConsumerBuilder;
import org.apache.pulsar.client.api.DeadLetterPolicy;
import org.apache.pulsar.client.api.KeySharedPolicy;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.RedeliveryBackoff;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.client.api.*;
import org.apache.pulsar.client.api.schema.KeyValueSchema;
import org.apache.pulsar.client.impl.MultiplierRedeliveryBackoff;
import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
Expand All @@ -40,7 +31,7 @@
import io.smallrye.reactive.messaging.pulsar.tracing.PulsarTrace;
import io.smallrye.reactive.messaging.pulsar.tracing.PulsarTraceTextMapGetter;
import io.smallrye.reactive.messaging.tracing.TracingUtils;
import io.vertx.core.impl.EventLoopContext;
import io.vertx.core.impl.ContextInternal;
import io.vertx.core.impl.VertxInternal;
import io.vertx.mutiny.core.Vertx;

Expand All @@ -51,7 +42,12 @@ public class PulsarIncomingChannel<T> {
private final String channel;
private final PulsarAckHandler ackHandler;
private final PulsarFailureHandler failureHandler;
private final EventLoopContext context;

/**
* This field captures the event loop context.
* Using {@code ContextInternal} to distinguish it from {@code io.vertx.core.Context}.
*/
private final ContextInternal context;
private final AtomicBoolean closed = new AtomicBoolean(false);

private final List<Throwable> failures = new ArrayList<>();
Expand Down
Loading