Skip to content

Commit

Permalink
Merge pull request #2543 from jponge/mutiny-2.6.0-with-jctools
Browse files Browse the repository at this point in the history
Upgrade to Mutiny 2.6.0 with JCTools
  • Loading branch information
ozangunalp authored Mar 25, 2024
2 parents c2da647 + 58e962a commit a659e58
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

<micrometer.version>1.12.4</micrometer.version>

<mutiny.version>2.5.5</mutiny.version>
<mutiny.version>2.6.0</mutiny.version>
<artemis.version>2.32.0</artemis.version>
<commons-io.version>2.15.1</commons-io.version>

Expand All @@ -93,9 +93,9 @@
<opentelemetry.version>1.31.0-alpha</opentelemetry.version>
<opentelemetry-semconv.version>1.21.0-alpha</opentelemetry-semconv.version>

<smallrye-vertx-mutiny-clients.version>3.8.0</smallrye-vertx-mutiny-clients.version>
<smallrye-vertx-mutiny-clients.version>3.12.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>
<mutiny-zero.version>1.1.0</mutiny-zero.version>

<testcontainers.version>1.19.7</testcontainers.version>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.eclipse.microprofile.reactive.messaging.Outgoing;

import io.smallrye.mutiny.helpers.queues.Queues;
import io.smallrye.mutiny.infrastructure.Infrastructure;
import io.smallrye.reactive.messaging.*;
import io.smallrye.reactive.messaging.EmitterConfiguration;
import io.smallrye.reactive.messaging.PublisherDecorator;
Expand Down Expand Up @@ -114,12 +114,12 @@ private int getWorkerMaxConcurrency(MediatorConfiguration configuration) {
String poolName = configuration.getWorkerPoolName();
// if the poll name is null we are on the default worker pool, set the default concurrent requests
if (poolName == null) {
return Queues.BUFFER_S;
return Infrastructure.getBufferSizeS();
}
String concurrencyConfigKey = WORKER_CONFIG_PREFIX + "." + poolName + "." + WORKER_CONCURRENCY;
Optional<Integer> concurrency = configInstance.get().getOptionalValue(concurrencyConfigKey, Integer.class);
// Fallback to the default concurrent requests if setting is not found
return concurrency.orElse(Queues.BUFFER_S);
return concurrency.orElse(Infrastructure.getBufferSizeS());
}

public Map<String, Integer> getIncomingConcurrency(MediatorConfiguration configuration) {
Expand Down

0 comments on commit a659e58

Please sign in to comment.