From 306107fcab54ecebd6c47dca92d7b95e68186f79 Mon Sep 17 00:00:00 2001 From: Amit Pandey Date: Tue, 30 Jan 2024 19:30:17 +0530 Subject: [PATCH] JAVA-30676 :- Upgrade messagingmodules/rabbitmq to latest Spring Cloud version. (#15750) --- messaging-modules/rabbitmq/pom.xml | 2 +- .../baeldung/benchmark/ConnectionPerChannelPublisher.java | 5 ----- .../com/baeldung/benchmark/SharedConnectionPublisher.java | 3 --- .../com/baeldung/benchmark/SingleConnectionPublisherNio.java | 3 --- .../benchmark/ConnectionPerChannelPublisherLiveTest.java | 3 ++- .../benchmark/SingleConnectionPublisherLiveTest.java | 5 +++-- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/messaging-modules/rabbitmq/pom.xml b/messaging-modules/rabbitmq/pom.xml index 2ea2700c4a..d4bdae414a 100644 --- a/messaging-modules/rabbitmq/pom.xml +++ b/messaging-modules/rabbitmq/pom.xml @@ -41,7 +41,7 @@ - 2020.0.3 + 2023.0.0 true diff --git a/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/ConnectionPerChannelPublisher.java b/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/ConnectionPerChannelPublisher.java index 1692066bef..61d5dab8a2 100644 --- a/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/ConnectionPerChannelPublisher.java +++ b/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/ConnectionPerChannelPublisher.java @@ -1,15 +1,12 @@ package com.baeldung.benchmark; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.LongSummaryStatistics; -import java.util.Random; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -18,8 +15,6 @@ import java.util.stream.IntStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.baeldung.benchmark.Worker.WorkerResult; -import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; diff --git a/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/SharedConnectionPublisher.java b/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/SharedConnectionPublisher.java index 7b44ccb9ea..5e5eb3ef08 100644 --- a/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/SharedConnectionPublisher.java +++ b/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/SharedConnectionPublisher.java @@ -8,13 +8,10 @@ import java.util.Random; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import org.slf4j.Logger; diff --git a/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/SingleConnectionPublisherNio.java b/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/SingleConnectionPublisherNio.java index cd4fe28ce9..bbfbff83b3 100644 --- a/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/SingleConnectionPublisherNio.java +++ b/messaging-modules/rabbitmq/src/main/java/com/baeldung/benchmark/SingleConnectionPublisherNio.java @@ -8,13 +8,10 @@ import java.util.Random; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import org.slf4j.Logger; diff --git a/messaging-modules/rabbitmq/src/test/java/com/baeldung/benchmark/ConnectionPerChannelPublisherLiveTest.java b/messaging-modules/rabbitmq/src/test/java/com/baeldung/benchmark/ConnectionPerChannelPublisherLiveTest.java index 0309912e91..7776e789cb 100644 --- a/messaging-modules/rabbitmq/src/test/java/com/baeldung/benchmark/ConnectionPerChannelPublisherLiveTest.java +++ b/messaging-modules/rabbitmq/src/test/java/com/baeldung/benchmark/ConnectionPerChannelPublisherLiveTest.java @@ -2,6 +2,7 @@ package com.baeldung.benchmark; import java.util.Arrays; +import java.util.stream.Stream; import org.junit.jupiter.api.Test; class ConnectionPerChannelPublisherLiveTest { @@ -9,7 +10,7 @@ class ConnectionPerChannelPublisherLiveTest { @Test void whenConnectionPerChannel_thenRunBenchmark() throws Exception { // host, workerCount, iterations, payloadSize - Arrays.asList(1,5,10,20,50,100,150).stream() + Stream.of(1,5,10,20,50,100,150) .forEach(workers -> { ConnectionPerChannelPublisher.main(new String[]{"192.168.99.100", Integer.toString(workers), "1000", "4096"}); }); diff --git a/messaging-modules/rabbitmq/src/test/java/com/baeldung/benchmark/SingleConnectionPublisherLiveTest.java b/messaging-modules/rabbitmq/src/test/java/com/baeldung/benchmark/SingleConnectionPublisherLiveTest.java index 6c03f90fb0..edd0690d07 100644 --- a/messaging-modules/rabbitmq/src/test/java/com/baeldung/benchmark/SingleConnectionPublisherLiveTest.java +++ b/messaging-modules/rabbitmq/src/test/java/com/baeldung/benchmark/SingleConnectionPublisherLiveTest.java @@ -2,6 +2,7 @@ package com.baeldung.benchmark; import java.util.Arrays; +import java.util.stream.Stream; import org.junit.jupiter.api.Test; class SingleConnectionPublisherLiveTest { @@ -9,9 +10,9 @@ class SingleConnectionPublisherLiveTest { @Test void whenSingleChannel_thenRunBenchmark() throws Exception { // host, workerCount, iterations, payloadSize - Arrays.asList(1,5,10,20,50,100,150).stream() + Stream.of(1,5,10,20,50,100,150) .forEach(workers -> { - SingleConnectionPublisher.main(new String[]{"192.168.99.100", Integer.toString(workers), "1000", "4096"}); + SingleConnectionPublisher.main(new String[]{"192.168.99.100", Integer.toString(workers), "1000", "4096"}); }); }