pFad - Phonifier reborn

From 5eecda8bde9bef29f99e7b71e6a4d9e8d9e2dfd7 Mon Sep 17 00:00:00 2001 From: pivotal-rabbitmq-ci Date: Mon, 5 Jul 2021 14:39:52 +0000 Subject: [PATCH 001/657] [maven-release-plugin] prepare release v5.13.0.RC2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f9c92a513d..f80f9aae72 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.13.0-SNAPSHOT + 5.13.0.RC2 jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git - HEAD + v5.13.0.RC2 From 790a5fe8dfc13172fe9f0530dce915ef5c8e8357 Mon Sep 17 00:00:00 2001 From: pivotal-rabbitmq-ci Date: Mon, 5 Jul 2021 14:39:57 +0000 Subject: [PATCH 002/657] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f80f9aae72..f9c92a513d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.13.0.RC2 + 5.13.0-SNAPSHOT jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git - v5.13.0.RC2 + HEAD From f5828f7b2fc70c35c89a6506ab935d9130fc71f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 5 Jul 2021 16:42:07 +0200 Subject: [PATCH 003/657] Set release version to 5.13.0.RC3 --- release-versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-versions.txt b/release-versions.txt index b350937ea3..b68df111be 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.13.0.RC2" +RELEASE_VERSION="5.13.0.RC3" DEVELOPMENT_VERSION="5.13.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From d46ff7db9291bd8f0be1498187f02892c7ac06ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 12 Jul 2021 14:23:42 +0200 Subject: [PATCH 004/657] Set release version to 5.13.0 --- release-versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-versions.txt b/release-versions.txt index b68df111be..717cff2f97 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.13.0.RC3" -DEVELOPMENT_VERSION="5.13.0-SNAPSHOT" +RELEASE_VERSION="5.13.0" +DEVELOPMENT_VERSION="5.14.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From 62c993f4af13e0cb7904e66695e333bd2433d1f2 Mon Sep 17 00:00:00 2001 From: pivotal-rabbitmq-ci Date: Mon, 12 Jul 2021 12:34:06 +0000 Subject: [PATCH 005/657] [maven-release-plugin] prepare release v5.13.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f9c92a513d..f00ac47285 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.13.0-SNAPSHOT + 5.13.0 jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git - HEAD + v5.13.0 From 51b5abe1e1cd586576eedccdfa21176976167487 Mon Sep 17 00:00:00 2001 From: pivotal-rabbitmq-ci Date: Mon, 12 Jul 2021 12:34:11 +0000 Subject: [PATCH 006/657] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f00ac47285..10cde42178 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.13.0 + 5.14.0-SNAPSHOT jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git - v5.13.0 + HEAD From c26edc05a01d4550c725ee2a20df8e55b5f1cb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 12 Jul 2021 14:47:27 +0200 Subject: [PATCH 007/657] Set release version to 5.14.0.RC1 --- release-versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-versions.txt b/release-versions.txt index 717cff2f97..19d9bee27b 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.13.0" +RELEASE_VERSION="5.14.0.RC1" DEVELOPMENT_VERSION="5.14.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From 9131c7811c11408cc5493d1773e0d86f15faae04 Mon Sep 17 00:00:00 2001 From: madun Date: Tue, 6 Jul 2021 20:34:12 +0800 Subject: [PATCH 008/657] =?UTF-8?q?style:=201=E3=80=81format=20two=20line?= =?UTF-8?q?=20align=202=E3=80=81add=20channelMax=20<=200=20condition,=20fr?= =?UTF-8?q?iendly=20tips?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit c80afcfb2f88fa6989ca2c3470fe1af62acbb938) --- .../java/com/rabbitmq/client/impl/ChannelManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/ChannelManager.java b/src/main/java/com/rabbitmq/client/impl/ChannelManager.java index 59f7bb3fee..0264adeb92 100644 --- a/src/main/java/com/rabbitmq/client/impl/ChannelManager.java +++ b/src/main/java/com/rabbitmq/client/impl/ChannelManager.java @@ -39,9 +39,9 @@ public class ChannelManager { /** Monitor for _channelMap and channelNumberAllocator */ private final Object monitor = new Object(); - /** Mapping from 1.._channelMax to {@link ChannelN} instance */ - private final Map _channelMap = new HashMap(); - private final IntAllocator channelNumberAllocator; + /** Mapping from 1.._channelMax to {@link ChannelN} instance */ + private final Map _channelMap = new HashMap(); + private final IntAllocator channelNumberAllocator; private final ConsumerWorkService workService; @@ -70,6 +70,8 @@ public ChannelManager(ConsumerWorkService workService, int channelMax, ThreadFac public ChannelManager(ConsumerWorkService workService, int channelMax, ThreadFactory threadFactory, MetricsCollector metricsCollector) { + if (channelMax < 0) + throw new IllegalStateException("create ChannelManager: 'channelMax' must be greater or equal to 0."); if (channelMax == 0) { // The framing encoding only allows for unsigned 16-bit integers // for the channel number From f52324aa06d64bc7ceed640724f268703a6c760e Mon Sep 17 00:00:00 2001 From: madun Date: Thu, 8 Jul 2021 09:15:21 +0800 Subject: [PATCH 009/657] =?UTF-8?q?style:=201=E3=80=81modify=20IllegalStat?= =?UTF-8?q?eException=20to=20IllegalArgumentException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0a4f08bddf61efbe0625d95e03eedf00b17d6b39) --- src/main/java/com/rabbitmq/client/impl/ChannelManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rabbitmq/client/impl/ChannelManager.java b/src/main/java/com/rabbitmq/client/impl/ChannelManager.java index 0264adeb92..fb0490eade 100644 --- a/src/main/java/com/rabbitmq/client/impl/ChannelManager.java +++ b/src/main/java/com/rabbitmq/client/impl/ChannelManager.java @@ -71,7 +71,7 @@ public ChannelManager(ConsumerWorkService workService, int channelMax, ThreadFac public ChannelManager(ConsumerWorkService workService, int channelMax, ThreadFactory threadFactory, MetricsCollector metricsCollector) { if (channelMax < 0) - throw new IllegalStateException("create ChannelManager: 'channelMax' must be greater or equal to 0."); + throw new IllegalArgumentException("create ChannelManager: 'channelMax' must be greater or equal to 0."); if (channelMax == 0) { // The framing encoding only allows for unsigned 16-bit integers // for the channel number From 5b6e4d3435fb27774a73ed7b16a90add5f1e355f Mon Sep 17 00:00:00 2001 From: madun Date: Fri, 9 Jul 2021 16:47:42 +0800 Subject: [PATCH 010/657] =?UTF-8?q?refactor:=201=E3=80=81optimize=20class?= =?UTF-8?q?=20code=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 430412d3c6439d4745adf1ae5617153ccaaf7d73) --- .../com/rabbitmq/client/impl/recovery/RecordedEntity.java | 2 +- .../com/rabbitmq/client/impl/recovery/RecordedExchange.java | 1 + .../rabbitmq/client/impl/recovery/RecordedNamedEntity.java | 5 ++++- .../com/rabbitmq/client/impl/recovery/RecordedQueue.java | 5 +++-- .../rabbitmq/client/impl/recovery/RecordedQueueBinding.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedEntity.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedEntity.java index a9fae4c3ae..a56f58b88a 100644 --- a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedEntity.java +++ b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedEntity.java @@ -20,7 +20,7 @@ /** * @since 3.3.0 */ -public class RecordedEntity { +public abstract class RecordedEntity { protected final AutorecoveringChannel channel; public RecordedEntity(AutorecoveringChannel channel) { diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedExchange.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedExchange.java index 7625b5a870..aaedcbbf58 100644 --- a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedExchange.java +++ b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedExchange.java @@ -31,6 +31,7 @@ public RecordedExchange(AutorecoveringChannel channel, String name) { super(channel, name); } + @Override public void recover() throws IOException { this.channel.getDelegate().exchangeDeclare(this.name, this.type, this.durable, this.autoDelete, this.arguments); } diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedNamedEntity.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedNamedEntity.java index 6ea8b6fa96..7b5a86a8f9 100644 --- a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedNamedEntity.java +++ b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedNamedEntity.java @@ -15,10 +15,11 @@ package com.rabbitmq.client.impl.recovery; +import java.io.IOException; /** * @since 3.3.0 */ -public class RecordedNamedEntity extends RecordedEntity { +public abstract class RecordedNamedEntity extends RecordedEntity { protected String name; public RecordedNamedEntity(AutorecoveringChannel channel, String name) { @@ -26,6 +27,8 @@ public RecordedNamedEntity(AutorecoveringChannel channel, String name) { this.name = name; } + public abstract void recover() throws IOException; + public String getName() { return name; } diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueue.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueue.java index 52caced2af..b41ecdc302 100644 --- a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueue.java +++ b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueue.java @@ -55,6 +55,7 @@ public boolean isServerNamed() { return this.serverNamed; } + @Override public void recover() throws IOException { this.name = this.channel.getDelegate().queueDeclare(this.getNameToUseForRecovery(), this.durable, @@ -71,7 +72,7 @@ public RecordedQueue durable(boolean value) { this.durable = value; return this; } - + public boolean isDurable() { return this.durable; } @@ -80,7 +81,7 @@ public RecordedQueue autoDelete(boolean value) { this.autoDelete = value; return this; } - + public boolean isAutoDelete() { return this.autoDelete; } diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java index 12ed3d48bb..37bbb14fe5 100644 --- a/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java +++ b/src/main/java/com/rabbitmq/client/impl/recovery/RecordedQueueBinding.java @@ -27,7 +27,7 @@ public RecordedQueueBinding(AutorecoveringChannel channel) { @Override public void recover() throws IOException { - this.channel.getDelegate().queueBind(this.getDestination(), this.getSource(), this.routingKey, this.arguments); + this.channel.getDelegate().queueBind(this.destination, this.source, this.routingKey, this.arguments); } @Override From 267c3553475f5284ec5ead6c34ae27893d3e819f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 26 Jul 2021 14:17:20 +0200 Subject: [PATCH 011/657] Disable global QoS temporarily Because of a regression in 3.9.x. References rabbitmq/rabbitmq-server#3230 (cherry picked from commit 559c4cb3e9803b2144e7900c13d26a0250da66cf) --- .../com/rabbitmq/client/test/functional/QosTests.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/java/com/rabbitmq/client/test/functional/QosTests.java b/src/test/java/com/rabbitmq/client/test/functional/QosTests.java index 276a363f4e..b347382f0d 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/QosTests.java +++ b/src/test/java/com/rabbitmq/client/test/functional/QosTests.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.concurrent.TimeoutException; +import org.junit.Ignore; import org.junit.Test; import com.rabbitmq.client.AMQP; @@ -119,6 +120,7 @@ public static List drain(QueueingConsumer c, int n) drain(c, 2); } + @Ignore @Test public void noAckObeysLimit() throws IOException { @@ -142,6 +144,7 @@ public static List drain(QueueingConsumer c, int n) drain(c2, 1); } + @Ignore @Test public void permutations() throws IOException { @@ -159,6 +162,7 @@ public static List drain(QueueingConsumer c, int n) } } + @Ignore @Test public void fairness() throws IOException { @@ -188,6 +192,7 @@ public static List drain(QueueingConsumer c, int n) } + @Ignore @Test public void singleChannelAndQueueFairness() throws IOException { @@ -237,6 +242,7 @@ public static List drain(QueueingConsumer c, int n) assertTrue(counts.get("c2").intValue() > 0); } + @Ignore @Test public void consumerLifecycle() throws IOException { @@ -258,6 +264,7 @@ public static List drain(QueueingConsumer c, int n) channel.queueDelete(queue); } + @Ignore @Test public void setLimitAfterConsume() throws IOException { @@ -282,6 +289,7 @@ public static List drain(QueueingConsumer c, int n) drain(c, 1); } + @Ignore @Test public void limitDecrease() throws IOException { @@ -302,6 +310,7 @@ public static List drain(QueueingConsumer c, int n) drain(c, 2); } + @Ignore @Test public void limitingMultipleChannels() throws IOException { @@ -338,6 +347,7 @@ public static List drain(QueueingConsumer c, int n) drain(c, 1); } + @Ignore @Test public void recoverReducesLimit() throws Exception { channel.basicQos(2, true); QueueingConsumer c = new QueueingConsumer(channel); From 73454cdbedc60b25788c4f61166b3859105afad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 28 Jul 2021 09:46:16 +0200 Subject: [PATCH 012/657] Bump dependencies References #699 (cherry picked from commit 5653e1cac355fee3cc6c8e1ce3bc82197b5ab7cb) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 10cde42178..b04e0943d1 100644 --- a/pom.xml +++ b/pom.xml @@ -54,10 +54,10 @@ UTF-8 UTF-8 - 1.7.31 - 4.2.2 - 1.7.1 - 2.12.3 + 1.7.32 + 4.2.3 + 1.7.2 + 2.12.4 1.2.3 4.13.2 3.11.2 From 1e5e40273e3e0fb43d44981a7a952b9f564c1046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 28 Jul 2021 09:46:56 +0200 Subject: [PATCH 013/657] Bump test dependencies (cherry picked from commit 281b679d3f076b9d2adbb8c8eeb983958eb1e3f4) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b04e0943d1..c290b479c3 100644 --- a/pom.xml +++ b/pom.xml @@ -58,11 +58,11 @@ 4.2.3 1.7.2 2.12.4 - 1.2.3 + 1.2.5 4.13.2 3.11.2 3.20.2 - 9.4.42.v20210604 + 9.4.43.v20210629 1.69 3.2.0 From 326e142eb6e89d4c0e5b94322d2aed81e4357659 Mon Sep 17 00:00:00 2001 From: yandryakov Date: Thu, 29 Jul 2021 16:07:02 +0300 Subject: [PATCH 014/657] support underflow handling without thread sleep (cherry picked from commit ba696986acad8aaee7365aa56e90ccef08bce4bc) --- .../nio/SocketChannelFrameHandlerState.java | 24 ++++++++++++++--- .../impl/nio/SslEngineFrameBuilder.java | 27 ++++++++++++------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java index 50f08a59f2..87c1d08928 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java @@ -26,6 +26,8 @@ import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; +import java.util.concurrent.atomic.AtomicBoolean; + /** * @@ -70,6 +72,8 @@ public class SocketChannelFrameHandlerState { final FrameBuilder frameBuilder; + private final AtomicBoolean isUnderflowHandlingEnabled = new AtomicBoolean(false); + public SocketChannelFrameHandlerState(SocketChannel channel, NioLoopContext nioLoopsState, NioParams nioParams, SSLEngine sslEngine) { this.channel = channel; this.readSelectorState = nioLoopsState.readSelectorState; @@ -105,7 +109,7 @@ public SocketChannelFrameHandlerState(SocketChannel channel, NioLoopContext nioL this.outputStream = new DataOutputStream( new SslEngineByteBufferOutputStream(sslEngine, plainOut, cipherOut, channel) ); - this.frameBuilder = new SslEngineFrameBuilder(sslEngine, plainIn, cipherIn, channel); + this.frameBuilder = new SslEngineFrameBuilder(sslEngine, plainIn, cipherIn, channel, isUnderflowHandlingEnabled); } } @@ -176,11 +180,14 @@ void endWriteSequence() { void prepareForReadSequence() throws IOException { if(ssl) { - cipherIn.clear(); - plainIn.clear(); + if (!isUnderflowHandlingEnabled.get()) { + cipherIn.clear(); + cipherIn.flip(); + } - cipherIn.flip(); + plainIn.clear(); plainIn.flip(); + } else { NioHelper.read(channel, plainIn); plainIn.flip(); @@ -189,6 +196,15 @@ void prepareForReadSequence() throws IOException { boolean continueReading() throws IOException { if(ssl) { + if (isUnderflowHandlingEnabled.get()) { + int bytesRead = NioHelper.read(channel, cipherIn); + if (bytesRead == 0) { + return false; + } else { + cipherIn.flip(); + return true; + } + } if (!plainIn.hasRemaining() && !cipherIn.hasRemaining()) { // need to try to read something cipherIn.clear(); diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java b/src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java index c2f1923874..34295fb36a 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java @@ -21,6 +21,8 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; +import java.util.concurrent.atomic.AtomicBoolean; + /** * Sub-class of {@link FrameBuilder} that unwraps crypted data from the network. @@ -32,20 +34,25 @@ public class SslEngineFrameBuilder extends FrameBuilder { private final ByteBuffer cipherBuffer; - public SslEngineFrameBuilder(SSLEngine sslEngine, ByteBuffer plainIn, ByteBuffer cipherIn, ReadableByteChannel channel) { + private final AtomicBoolean isUnderflowHandlingEnabled; + + public SslEngineFrameBuilder(SSLEngine sslEngine, ByteBuffer plainIn, ByteBuffer cipherIn, ReadableByteChannel channel, final AtomicBoolean isUnderflowHandlingEnabled) { super(channel, plainIn); this.sslEngine = sslEngine; this.cipherBuffer = cipherIn; + this.isUnderflowHandlingEnabled = isUnderflowHandlingEnabled; } @Override protected boolean somethingToRead() throws IOException { - if (applicationBuffer.hasRemaining()) { + if (applicationBuffer.hasRemaining() && !isUnderflowHandlingEnabled.get()) { return true; } else { applicationBuffer.clear(); - while (true) { + boolean underflowHandling = false; + + try { SSLEngineResult result = sslEngine.unwrap(cipherBuffer, applicationBuffer); switch (result.getStatus()) { case OK: @@ -59,18 +66,18 @@ protected boolean somethingToRead() throws IOException { throw new SSLException("buffer overflow in read"); case BUFFER_UNDERFLOW: cipherBuffer.compact(); - int read = NioHelper.read(channel, cipherBuffer); - if (read == 0) { - return false; - } - cipherBuffer.flip(); - break; + underflowHandling = true; + return false; case CLOSED: throw new SSLException("closed in read"); default: throw new IllegalStateException("Invalid SSL status: " + result.getStatus()); - } + } + } finally { + isUnderflowHandlingEnabled.set(underflowHandling); } + + return false; } } From c3d9e7532d8f2040ee71afc06a5e11c244988dae Mon Sep 17 00:00:00 2001 From: yandryakov Date: Thu, 29 Jul 2021 18:34:47 +0300 Subject: [PATCH 015/657] refactoring - make isUnderflowHandlingEnabled private property (cherry picked from commit 217a5e8c2a8e42748b6a33dadae9443ea7f7119a) --- .../com/rabbitmq/client/impl/nio/FrameBuilder.java | 5 +++++ .../impl/nio/SocketChannelFrameHandlerState.java | 9 +++------ .../client/impl/nio/SslEngineFrameBuilder.java | 14 ++++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/nio/FrameBuilder.java b/src/main/java/com/rabbitmq/client/impl/nio/FrameBuilder.java index 8352174360..813e328b9e 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/FrameBuilder.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/FrameBuilder.java @@ -200,4 +200,9 @@ private void handleProtocolVersionMismatch() throws IOException { } throw x; } + + //Indicates ssl underflow state - means that cipherBuffer should aggregate next chunks of bytes + public boolean isUnderflowHandlingEnabled() { + return false; + } } diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java index 87c1d08928..4f1e4dc885 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerState.java @@ -26,7 +26,6 @@ import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; -import java.util.concurrent.atomic.AtomicBoolean; /** @@ -72,8 +71,6 @@ public class SocketChannelFrameHandlerState { final FrameBuilder frameBuilder; - private final AtomicBoolean isUnderflowHandlingEnabled = new AtomicBoolean(false); - public SocketChannelFrameHandlerState(SocketChannel channel, NioLoopContext nioLoopsState, NioParams nioParams, SSLEngine sslEngine) { this.channel = channel; this.readSelectorState = nioLoopsState.readSelectorState; @@ -109,7 +106,7 @@ public SocketChannelFrameHandlerState(SocketChannel channel, NioLoopContext nioL this.outputStream = new DataOutputStream( new SslEngineByteBufferOutputStream(sslEngine, plainOut, cipherOut, channel) ); - this.frameBuilder = new SslEngineFrameBuilder(sslEngine, plainIn, cipherIn, channel, isUnderflowHandlingEnabled); + this.frameBuilder = new SslEngineFrameBuilder(sslEngine, plainIn, cipherIn, channel); } } @@ -180,7 +177,7 @@ void endWriteSequence() { void prepareForReadSequence() throws IOException { if(ssl) { - if (!isUnderflowHandlingEnabled.get()) { + if (!frameBuilder.isUnderflowHandlingEnabled()) { cipherIn.clear(); cipherIn.flip(); } @@ -196,7 +193,7 @@ void prepareForReadSequence() throws IOException { boolean continueReading() throws IOException { if(ssl) { - if (isUnderflowHandlingEnabled.get()) { + if (frameBuilder.isUnderflowHandlingEnabled()) { int bytesRead = NioHelper.read(channel, cipherIn); if (bytesRead == 0) { return false; diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java b/src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java index 34295fb36a..8b6ecaf8ab 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/SslEngineFrameBuilder.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -import java.util.concurrent.atomic.AtomicBoolean; /** @@ -34,18 +33,17 @@ public class SslEngineFrameBuilder extends FrameBuilder { private final ByteBuffer cipherBuffer; - private final AtomicBoolean isUnderflowHandlingEnabled; + private boolean isUnderflowHandlingEnabled = false; - public SslEngineFrameBuilder(SSLEngine sslEngine, ByteBuffer plainIn, ByteBuffer cipherIn, ReadableByteChannel channel, final AtomicBoolean isUnderflowHandlingEnabled) { + public SslEngineFrameBuilder(SSLEngine sslEngine, ByteBuffer plainIn, ByteBuffer cipherIn, ReadableByteChannel channel) { super(channel, plainIn); this.sslEngine = sslEngine; this.cipherBuffer = cipherIn; - this.isUnderflowHandlingEnabled = isUnderflowHandlingEnabled; } @Override protected boolean somethingToRead() throws IOException { - if (applicationBuffer.hasRemaining() && !isUnderflowHandlingEnabled.get()) { + if (applicationBuffer.hasRemaining() && !isUnderflowHandlingEnabled) { return true; } else { applicationBuffer.clear(); @@ -74,11 +72,15 @@ protected boolean somethingToRead() throws IOException { throw new IllegalStateException("Invalid SSL status: " + result.getStatus()); } } finally { - isUnderflowHandlingEnabled.set(underflowHandling); + isUnderflowHandlingEnabled = underflowHandling; } return false; } } + @Override + public boolean isUnderflowHandlingEnabled() { + return isUnderflowHandlingEnabled; + } } From 6d4c9f4b8ab9f8219b4938de8740145526f4a988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 30 Jul 2021 17:39:41 +0200 Subject: [PATCH 016/657] Re-enable QoS tests Now fix is in master and 3.9.x. (cherry picked from commit 12f9f75bdf973ed74082df5a0fc5d664610c1595) --- .../com/rabbitmq/client/test/functional/QosTests.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/functional/QosTests.java b/src/test/java/com/rabbitmq/client/test/functional/QosTests.java index b347382f0d..276a363f4e 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/QosTests.java +++ b/src/test/java/com/rabbitmq/client/test/functional/QosTests.java @@ -31,7 +31,6 @@ import java.util.Map; import java.util.concurrent.TimeoutException; -import org.junit.Ignore; import org.junit.Test; import com.rabbitmq.client.AMQP; @@ -120,7 +119,6 @@ public static List drain(QueueingConsumer c, int n) drain(c, 2); } - @Ignore @Test public void noAckObeysLimit() throws IOException { @@ -144,7 +142,6 @@ public static List drain(QueueingConsumer c, int n) drain(c2, 1); } - @Ignore @Test public void permutations() throws IOException { @@ -162,7 +159,6 @@ public static List drain(QueueingConsumer c, int n) } } - @Ignore @Test public void fairness() throws IOException { @@ -192,7 +188,6 @@ public static List drain(QueueingConsumer c, int n) } - @Ignore @Test public void singleChannelAndQueueFairness() throws IOException { @@ -242,7 +237,6 @@ public static List drain(QueueingConsumer c, int n) assertTrue(counts.get("c2").intValue() > 0); } - @Ignore @Test public void consumerLifecycle() throws IOException { @@ -264,7 +258,6 @@ public static List drain(QueueingConsumer c, int n) channel.queueDelete(queue); } - @Ignore @Test public void setLimitAfterConsume() throws IOException { @@ -289,7 +282,6 @@ public static List drain(QueueingConsumer c, int n) drain(c, 1); } - @Ignore @Test public void limitDecrease() throws IOException { @@ -310,7 +302,6 @@ public static List drain(QueueingConsumer c, int n) drain(c, 2); } - @Ignore @Test public void limitingMultipleChannels() throws IOException { @@ -347,7 +338,6 @@ public static List drain(QueueingConsumer c, int n) drain(c, 1); } - @Ignore @Test public void recoverReducesLimit() throws Exception { channel.basicQos(2, true); QueueingConsumer c = new QueueingConsumer(channel); From 34ccee73d2e208e997ff69f2a04e7a752a36fce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 30 Aug 2021 10:51:44 +0200 Subject: [PATCH 017/657] Bump dependencies References #699 (cherry picked from commit 2e098ffa521f29236a9c0ac3152bd534a9081bd2) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c290b479c3..40f2fced6f 100644 --- a/pom.xml +++ b/pom.xml @@ -56,8 +56,8 @@ 1.7.32 4.2.3 - 1.7.2 - 2.12.4 + 1.7.3 + 2.12.5 1.2.5 4.13.2 3.11.2 From 653d08b801c0dae5844709bf5adcf9d15371e320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 30 Aug 2021 10:52:51 +0200 Subject: [PATCH 018/657] Bump test dependencies (cherry picked from commit 1a11d9fef88e14776554839142b07454903e9a05) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40f2fced6f..9e611a7a91 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 2.12.5 1.2.5 4.13.2 - 3.11.2 + 3.12.4 3.20.2 9.4.43.v20210629 1.69 From 613927e0bf0da3c6624c7b3b7b799ec19f91545e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Tue, 28 Sep 2021 16:53:59 +0200 Subject: [PATCH 019/657] Bump Micrometer to 1.7.4 References #699 (cherry picked from commit c879d7a0404e49242623f101a1e861400602df9b) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e611a7a91..37174092df 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.32 4.2.3 - 1.7.3 + 1.7.4 2.12.5 1.2.5 4.13.2 From a43612fdd83d964165f22cefb6aa250e6f3de4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Tue, 28 Sep 2021 16:54:54 +0200 Subject: [PATCH 020/657] Bump test dependencies (cherry picked from commit 2da7a4acbf9a80b7e0e00e167a9992713f8bb88d) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 37174092df..09ee9df890 100644 --- a/pom.xml +++ b/pom.xml @@ -58,10 +58,10 @@ 4.2.3 1.7.4 2.12.5 - 1.2.5 + 1.2.6 4.13.2 3.12.4 - 3.20.2 + 3.21.0 9.4.43.v20210629 1.69 From 4fd4ec9ababf5367b97cc0f8ddff9a8af2f50129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 4 Oct 2021 09:20:51 +0200 Subject: [PATCH 021/657] Bump Maven to 3.8.3 (cherry picked from commit e01c208d21318371e755b91a072f47fb12981de2) --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 642d572ce9..a9f1ef87bb 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar From b123de5143c277b26b3e49904b89e1666dcfa2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Tue, 5 Oct 2021 14:45:46 +0200 Subject: [PATCH 022/657] Bump optional dependencies References #699 (cherry picked from commit 54fa481d31a552a05b60791347c973784b4a7ec9) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 09ee9df890..ea211df5c4 100644 --- a/pom.xml +++ b/pom.xml @@ -55,9 +55,9 @@ UTF-8 1.7.32 - 4.2.3 + 4.2.4 1.7.4 - 2.12.5 + 2.13.0 1.2.6 4.13.2 3.12.4 From aa3bf23a3d7de4abe6a5f7176f3009d7264e537c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Tue, 5 Oct 2021 14:46:10 +0200 Subject: [PATCH 023/657] Bump test dependency (cherry picked from commit 3e5e2789baf8c9172a48474fdfd712cde9c2128f) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea211df5c4..7959c57ff6 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 4.13.2 3.12.4 3.21.0 - 9.4.43.v20210629 + 9.4.44.v20210927 1.69 3.2.0 From 7d9565b4158209426299fd1acb63fe5516cc55c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 21 Oct 2021 09:30:52 +0200 Subject: [PATCH 024/657] Bump Micrometer to 1.7.5 References #699 (cherry picked from commit 4de6eb709330644e7707b3e0a9652b5f09c16c70) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7959c57ff6..de16922b29 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.32 4.2.4 - 1.7.4 + 1.7.5 2.13.0 1.2.6 4.13.2 From 2def01691f5593dcb5bf1e119b3c6e4f0bac29c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 21 Oct 2021 09:31:43 +0200 Subject: [PATCH 025/657] Bump Mockito to 4.0.0 (cherry picked from commit 15068a4d569e67a66cac7534270fe8e97761f741) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de16922b29..721405e4a5 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 2.13.0 1.2.6 4.13.2 - 3.12.4 + 4.0.0 3.21.0 9.4.44.v20210927 1.69 From d3e957f79291d2ff8123a7d942e38501580344ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 25 Oct 2021 10:01:04 +0200 Subject: [PATCH 026/657] Fix dead lettering flaky test It was using Thread.sleep() statements, which are not reliable, using polling for assertion instead. (cherry picked from commit ea8aa89fafbb96260a31b63898d93128ed23adea) --- .../com/rabbitmq/client/test/TestUtils.java | 25 +++++++++--- .../test/functional/DeadLetterExchange.java | 39 +++++++++++++++---- 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java index e16bca6f40..72e0b56cea 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtils.java @@ -56,9 +56,20 @@ public static ConnectionFactory connectionFactory() { return connectionFactory; } - public static void waitAtMost(Duration timeout, BooleanSupplier condition) { - if (condition.getAsBoolean()) { - return; + @FunctionalInterface + public interface CallableBooleanSupplier { + + boolean getAsBoolean() throws Exception; + + } + + public static void waitAtMost(Duration timeout, CallableBooleanSupplier condition) { + try { + if (condition.getAsBoolean()) { + return; + } + } catch (Exception e) { + throw new RuntimeException(e); } int waitTime = 100; int waitedTime = 0; @@ -70,8 +81,12 @@ public static void waitAtMost(Duration timeout, BooleanSupplier condition) { Thread.currentThread().interrupt(); throw new RuntimeException(e); } - if (condition.getAsBoolean()) { - return; + try { + if (condition.getAsBoolean()) { + return; + } + } catch (Exception e) { + throw new RuntimeException(e); } waitedTime += waitTime; } diff --git a/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java b/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java index 36c09add6a..d7244c7845 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java +++ b/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java @@ -19,12 +19,15 @@ import com.rabbitmq.client.AMQP.BasicProperties; import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; +import java.util.concurrent.atomic.AtomicReference; import org.junit.Test; import java.io.IOException; import java.util.*; import java.util.concurrent.*; +import static com.rabbitmq.client.test.TestUtils.waitAtMost; +import static java.time.Duration.ofSeconds; import static org.junit.Assert.*; public class DeadLetterExchange extends BrokerTestCase { @@ -403,9 +406,15 @@ public void handleDelivery(String consumerTag, Envelope envelope, channel.queueBind(DLQ, DLX, "test"); publishN(1); - sleep(200); - - GetResponse getResponse = channel.basicGet(DLQ, true); + AtomicReference responseRefeference = new AtomicReference<>(); + waitAtMost( + ofSeconds(1), + () -> { + GetResponse response = channel.basicGet(DLQ, true); + responseRefeference.set(response); + return responseRefeference.get() != null; + }); + GetResponse getResponse = responseRefeference.get(); assertNotNull("Message not dead-lettered", getResponse); assertEquals("test message", new String(getResponse.getBody())); @@ -432,9 +441,15 @@ public void handleDelivery(String consumerTag, Envelope envelope, .headers(headers) .build(), "test message".getBytes()); - sleep(100); - - getResponse = channel.basicGet(DLQ, true); + responseRefeference.set(null); + waitAtMost( + ofSeconds(1), + () -> { + GetResponse response = channel.basicGet(DLQ, true); + responseRefeference.set(response); + return responseRefeference.get() != null; + }); + getResponse = responseRefeference.get(); assertNotNull("Message not dead-lettered", getResponse); assertEquals("test message", new String(getResponse.getBody())); headers = getResponse.getProps().getHeaders(); @@ -453,9 +468,17 @@ public void handleDelivery(String consumerTag, Envelope envelope, new AMQP.BasicProperties.Builder() .headers(headers) .build(), "test message".getBytes()); - sleep(100); - getResponse = channel.basicGet(DLQ, true); + responseRefeference.set(null); + waitAtMost( + ofSeconds(1), + () -> { + GetResponse response = channel.basicGet(DLQ, true); + responseRefeference.set(response); + return responseRefeference.get() != null; + }); + getResponse = responseRefeference.get(); + assertNotNull("Message not dead-lettered", getResponse); assertEquals("test message", new String(getResponse.getBody())); headers = getResponse.getProps().getHeaders(); From ecbe8501f2dd1923bb8e88b5b126a44e75633872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 25 Oct 2021 11:02:31 +0200 Subject: [PATCH 027/657] Fix test rule (cherry picked from commit 761628ee1ea4f1a90942110d22bb4407ab861549) --- src/test/java/com/rabbitmq/client/test/TestUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java index 72e0b56cea..7544893760 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtils.java @@ -343,6 +343,8 @@ public void evaluate() throws Throwable { if (Host.isOnDocker()) { throw new AssumptionViolatedException("Broker is running on Docker"); } + } catch (AssumptionViolatedException e) { + throw e; } catch (Exception e) { throw new AssumptionViolatedException("Could not check whether broker is running on Docker or not", e); } From 99ea9e07588ee147d38f0babe944e956f59a5a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 25 Oct 2021 11:21:44 +0200 Subject: [PATCH 028/657] Change/remove usage of some deprecated JDK API API deprecated in Java 16 or more. There are alternatives (e.g. for certificate subject and issuer) for some, but not for all (e.g. usage of the security manager to change thread, which is no big deal as the changes to thread are minor and it is likely nobody cares about such checks nowadays). Fixes #709 (cherry picked from commit 57b61d82dc441d3779547c918f179026d94b5d51) --- .../com/rabbitmq/client/impl/Environment.java | 29 +++++++++---------- .../com/rabbitmq/client/impl/TlsUtils.java | 2 +- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/Environment.java b/src/main/java/com/rabbitmq/client/impl/Environment.java index 149b9a102e..2676311322 100644 --- a/src/main/java/com/rabbitmq/client/impl/Environment.java +++ b/src/main/java/com/rabbitmq/client/impl/Environment.java @@ -23,32 +23,29 @@ * Package-protected API. */ public class Environment { + + /** + * This method is deprecated and subject to removal in the next major release. + * + * There is no replacement for this method, as it used to use the + * {@link SecurityManager}, which is itself deprecated and subject to removal. + * @deprecated + * @return always returns true + */ + @Deprecated public static boolean isAllowedToModifyThreads() { - try { - SecurityManager sm = System.getSecurityManager(); - if(sm != null) { - sm.checkPermission(new RuntimePermission("modifyThread")); - sm.checkPermission(new RuntimePermission("modifyThreadGroup")); - } - return true; - } catch (SecurityException se) { - return false; - } + return true; } public static Thread newThread(ThreadFactory factory, Runnable runnable, String name) { Thread t = factory.newThread(runnable); - if(isAllowedToModifyThreads()) { - t.setName(name); - } + t.setName(name); return t; } public static Thread newThread(ThreadFactory factory, Runnable runnable, String name, boolean isDaemon) { Thread t = newThread(factory, runnable, name); - if(isAllowedToModifyThreads()) { - t.setDaemon(isDaemon); - } + t.setDaemon(isDaemon); return t; } } diff --git a/src/main/java/com/rabbitmq/client/impl/TlsUtils.java b/src/main/java/com/rabbitmq/client/impl/TlsUtils.java index a11deddc2c..aa103607ec 100644 --- a/src/main/java/com/rabbitmq/client/impl/TlsUtils.java +++ b/src/main/java/com/rabbitmq/client/impl/TlsUtils.java @@ -104,7 +104,7 @@ public static String peerCertificateInfo(Certificate certificate, String prefix) try { return String.format("%s subject: %s, subject alternative names: %s, " + "issuer: %s, not valid after: %s, X.509 usage extensions: %s", - stripCRLF(prefix), stripCRLF(c.getSubjectDN().getName()), stripCRLF(sans(c, ",")), stripCRLF(c.getIssuerDN().getName()), + stripCRLF(prefix), stripCRLF(c.getSubjectX500Principal().getName()), stripCRLF(sans(c, ",")), stripCRLF(c.getIssuerX500Principal().getName()), c.getNotAfter(), stripCRLF(extensions(c))); } catch (Exception e) { return "Error while retrieving " + prefix + " certificate information"; From d87c82feba2d835c35691bfeb97df90926964817 Mon Sep 17 00:00:00 2001 From: ByteAlex Date: Fri, 5 Nov 2021 11:09:45 +0100 Subject: [PATCH 029/657] Parse unsigned byte `B` in ValueReader (cherry picked from commit 15ed3d151e8c8747cd1beb17931eb06d1281d3e7) --- src/main/java/com/rabbitmq/client/impl/ValueReader.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/rabbitmq/client/impl/ValueReader.java b/src/main/java/com/rabbitmq/client/impl/ValueReader.java index 1162cc8af0..ed7f41284c 100644 --- a/src/main/java/com/rabbitmq/client/impl/ValueReader.java +++ b/src/main/java/com/rabbitmq/client/impl/ValueReader.java @@ -186,6 +186,9 @@ static Object readFieldValue(DataInputStream in) case 'b': value = in.readByte(); break; + case 'B': + value = in.readUnsignedByte(); + break; case 'd': value = in.readDouble(); break; From 525cb08ae142044c7189c606296e3161b6474c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 5 Nov 2021 13:41:55 +0100 Subject: [PATCH 030/657] Fix handshake with NIO on TLS 1.3 The unwrapping does not work the same way between TLS 1.2 and 1.3. This commit makes the unwrapping more reliable by getting the number of bytes consumed in the unwrapping and then set the position of the reading ByteBuffer accordingly to the number of bytes. With TLS 1.3, the unwrapping seems to read the whole content of the buffer and to extract only the first record, so the rewinding is necessary. The commit also adds some debug logging, adds tests on TLS 1.2 and 1.3, and re-arranges the TLS test (add utility class). Fixes #715 (cherry picked from commit 448d3dd0ccb9755db2fccb11f433ddf5b55ca48f) Conflicts: src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java --- .../client/impl/nio/SslEngineHelper.java | 101 +++++++++++---- .../rabbitmq/client/test/BrokerTestCase.java | 7 +- .../com/rabbitmq/client/test/TestUtils.java | 45 +++---- .../test/ssl/BadVerifiedConnection.java | 49 +------- .../client/test/ssl/HostnameVerification.java | 35 +----- .../test/ssl/NioTlsUnverifiedConnection.java | 55 +++++---- .../client/test/ssl/TlsConnectionLogging.java | 4 +- .../client/test/ssl/TlsTestUtils.java | 115 ++++++++++++++++++ .../client/test/ssl/UnverifiedConnection.java | 10 +- .../client/test/ssl/VerifiedConnection.java | 93 +++++++------- src/test/resources/logback-test.xml | 2 +- 11 files changed, 302 insertions(+), 214 deletions(-) create mode 100644 src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SslEngineHelper.java b/src/main/java/com/rabbitmq/client/impl/nio/SslEngineHelper.java index 1e7e3a0793..bcefe8b205 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/SslEngineHelper.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/SslEngineHelper.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -23,8 +23,12 @@ import java.nio.channels.ReadableByteChannel; import java.nio.channels.SocketChannel; import java.nio.channels.WritableByteChannel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_TASK; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_WRAP; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING; /** @@ -32,6 +36,8 @@ */ public class SslEngineHelper { + private static final Logger LOGGER = LoggerFactory.getLogger(SslEngineHelper.class); + public static boolean doHandshake(SocketChannel socketChannel, SSLEngine engine) throws IOException { ByteBuffer plainOut = ByteBuffer.allocate(engine.getSession().getApplicationBufferSize()); @@ -39,20 +45,36 @@ public static boolean doHandshake(SocketChannel socketChannel, SSLEngine engine) ByteBuffer cipherOut = ByteBuffer.allocate(engine.getSession().getPacketBufferSize()); ByteBuffer cipherIn = ByteBuffer.allocate(engine.getSession().getPacketBufferSize()); + LOGGER.debug("Starting TLS handshake"); + SSLEngineResult.HandshakeStatus handshakeStatus = engine.getHandshakeStatus(); + LOGGER.debug("Initial handshake status is {}", handshakeStatus); while (handshakeStatus != FINISHED && handshakeStatus != NOT_HANDSHAKING) { + LOGGER.debug("Handshake status is {}", handshakeStatus); switch (handshakeStatus) { case NEED_TASK: + LOGGER.debug("Running tasks"); handshakeStatus = runDelegatedTasks(engine); break; case NEED_UNWRAP: + LOGGER.debug("Unwrapping..."); handshakeStatus = unwrap(cipherIn, plainIn, socketChannel, engine); break; case NEED_WRAP: + LOGGER.debug("Wrapping..."); handshakeStatus = wrap(plainOut, cipherOut, socketChannel, engine); break; + case FINISHED: + break; + case NOT_HANDSHAKING: + break; + default: + throw new SSLException("Unexpected handshake status " + handshakeStatus); } } + + + LOGGER.debug("TLS handshake completed"); return true; } @@ -60,6 +82,7 @@ private static SSLEngineResult.HandshakeStatus runDelegatedTasks(SSLEngine sslEn // FIXME run in executor? Runnable runnable; while ((runnable = sslEngine.getDelegatedTask()) != null) { + LOGGER.debug("Running delegated task"); runnable.run(); } return sslEngine.getHandshakeStatus(); @@ -68,29 +91,57 @@ private static SSLEngineResult.HandshakeStatus runDelegatedTasks(SSLEngine sslEn private static SSLEngineResult.HandshakeStatus unwrap(ByteBuffer cipherIn, ByteBuffer plainIn, ReadableByteChannel channel, SSLEngine sslEngine) throws IOException { SSLEngineResult.HandshakeStatus handshakeStatus = sslEngine.getHandshakeStatus(); - - if (channel.read(cipherIn) < 0) { - throw new SSLException("Could not read from socket channel"); + LOGGER.debug("Handshake status is {} before unwrapping", handshakeStatus); + + LOGGER.debug("Cipher in position {}", cipherIn.position()); + int read; + if (cipherIn.position() == 0) { + LOGGER.debug("Reading from channel"); + read = channel.read(cipherIn); + LOGGER.debug("Read {} byte(s) from channel", read); + if (read < 0) { + throw new SSLException("Could not read from socket channel"); + } + cipherIn.flip(); + } else { + LOGGER.debug("Not reading"); } - cipherIn.flip(); SSLEngineResult.Status status; + SSLEngineResult unwrapResult; do { - SSLEngineResult unwrapResult = sslEngine.unwrap(cipherIn, plainIn); + int positionBeforeUnwrapping = cipherIn.position(); + unwrapResult = sslEngine.unwrap(cipherIn, plainIn); + LOGGER.debug("SSL engine result is {} after unwrapping", unwrapResult); status = unwrapResult.getStatus(); switch (status) { case OK: plainIn.clear(); - handshakeStatus = runDelegatedTasks(sslEngine); + if (unwrapResult.getHandshakeStatus() == NEED_TASK) { + handshakeStatus = runDelegatedTasks(sslEngine); + int newPosition = positionBeforeUnwrapping + unwrapResult.bytesConsumed(); + if (newPosition == cipherIn.limit()) { + LOGGER.debug("Clearing cipherIn because all bytes have been read and unwrapped"); + cipherIn.clear(); + } else { + LOGGER.debug("Setting cipherIn position to {} (limit is {})", newPosition, cipherIn.limit()); + cipherIn.position(positionBeforeUnwrapping + unwrapResult.bytesConsumed()); + } + } else { + handshakeStatus = unwrapResult.getHandshakeStatus(); + } break; case BUFFER_OVERFLOW: throw new SSLException("Buffer overflow during handshake"); case BUFFER_UNDERFLOW: + LOGGER.debug("Buffer underflow"); cipherIn.compact(); - int read = NioHelper.read(channel, cipherIn); + LOGGER.debug("Reading from channel..."); + read = NioHelper.read(channel, cipherIn); if(read <= 0) { retryRead(channel, cipherIn); } + LOGGER.debug("Done reading from channel..."); cipherIn.flip(); break; case CLOSED: @@ -100,9 +151,9 @@ private static SSLEngineResult.HandshakeStatus unwrap(ByteBuffer cipherIn, ByteB throw new SSLException("Unexpected status from " + unwrapResult); } } - while (cipherIn.hasRemaining()); + while (unwrapResult.getHandshakeStatus() != NEED_WRAP && unwrapResult.getHandshakeStatus() != FINISHED); - cipherIn.compact(); + LOGGER.debug("cipherIn position after unwrap {}", cipherIn.position()); return handshakeStatus; } @@ -127,36 +178,32 @@ private static int retryRead(ReadableByteChannel channel, ByteBuffer buffer) thr private static SSLEngineResult.HandshakeStatus wrap(ByteBuffer plainOut, ByteBuffer cipherOut, WritableByteChannel channel, SSLEngine sslEngine) throws IOException { SSLEngineResult.HandshakeStatus handshakeStatus = sslEngine.getHandshakeStatus(); - SSLEngineResult.Status status = sslEngine.wrap(plainOut, cipherOut).getStatus(); - switch (status) { + LOGGER.debug("Handshake status is {} before wrapping", handshakeStatus); + SSLEngineResult result = sslEngine.wrap(plainOut, cipherOut); + LOGGER.debug("SSL engine result is {} after wrapping", result); + switch (result.getStatus()) { case OK: - handshakeStatus = runDelegatedTasks(sslEngine); cipherOut.flip(); while (cipherOut.hasRemaining()) { - channel.write(cipherOut); + int written = channel.write(cipherOut); + LOGGER.debug("Wrote {} byte(s)", written); } cipherOut.clear(); + if (result.getHandshakeStatus() == NEED_TASK) { + handshakeStatus = runDelegatedTasks(sslEngine); + } else { + handshakeStatus = result.getHandshakeStatus(); + } + break; case BUFFER_OVERFLOW: throw new SSLException("Buffer overflow during handshake"); default: - throw new SSLException("Unexpected status " + status); + throw new SSLException("Unexpected status " + result.getStatus()); } return handshakeStatus; } - static int bufferCopy(ByteBuffer from, ByteBuffer to) { - int maxTransfer = Math.min(to.remaining(), from.remaining()); - - ByteBuffer temporaryBuffer = from.duplicate(); - temporaryBuffer.limit(temporaryBuffer.position() + maxTransfer); - to.put(temporaryBuffer); - - from.position(from.position() + maxTransfer); - - return maxTransfer; - } - public static void write(WritableByteChannel socketChannel, SSLEngine engine, ByteBuffer plainOut, ByteBuffer cypherOut) throws IOException { while (plainOut.hasRemaining()) { cypherOut.clear(); diff --git a/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java b/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java index 7c23a3c0e6..37cf436db4 100644 --- a/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java +++ b/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -28,9 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLContext; import java.io.IOException; -import java.security.NoSuchAlgorithmException; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeoutException; @@ -348,7 +346,4 @@ protected String generateExchangeName() { return "exchange" + UUID.randomUUID().toString(); } - protected SSLContext getSSLContext() throws NoSuchAlgorithmException { - return TestUtils.getSSLContext(); - } } diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java index 7544893760..c488fcff6d 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtils.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -26,19 +26,15 @@ import org.junit.runners.model.Statement; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLContext; import java.io.IOException; import java.net.ServerSocket; -import java.security.NoSuchAlgorithmException; import java.time.Duration; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.function.BooleanSupplier; import static org.junit.Assert.assertTrue; @@ -109,22 +105,6 @@ public static void abort(Connection connection) { } } - public static SSLContext getSSLContext() throws NoSuchAlgorithmException { - SSLContext c = null; - - // pick the first protocol available, preferring TLSv1.2, then TLSv1, - // falling back to SSLv3 if running on an ancient/crippled JDK - for (String proto : Arrays.asList("TLSv1.2", "TLSv1", "SSLv3")) { - try { - c = SSLContext.getInstance(proto); - return c; - } catch (NoSuchAlgorithmException x) { - // keep trying - } - } - throw new NoSuchAlgorithmException(); - } - public static TestRule atLeast38() { return new BrokerVersionTestRule("3.8.0"); } @@ -361,4 +341,27 @@ public interface CallableFunction { } + public static boolean basicGetBasicConsume(Connection connection, String queue, final CountDownLatch latch, int msgSize) + throws Exception { + Channel channel = connection.createChannel(); + channel.queueDeclare(queue, false, true, false, null); + channel.queuePurge(queue); + + channel.basicPublish("", queue, null, new byte[msgSize]); + + String tag = channel.basicConsume(queue, false, new DefaultConsumer(channel) { + + @Override + public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException { + getChannel().basicAck(envelope.getDeliveryTag(), false); + latch.countDown(); + } + }); + + boolean messageReceived = latch.await(20, TimeUnit.SECONDS); + + channel.basicCancel(tag); + + return messageReceived; + } } diff --git a/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java index 9137213578..fe33af7dec 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,20 +15,13 @@ package com.rabbitmq.client.test.ssl; -import com.rabbitmq.client.test.TestUtils; import org.junit.Test; -import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLHandshakeException; -import javax.net.ssl.TrustManagerFactory; -import java.io.FileInputStream; import java.io.IOException; -import java.security.*; -import java.security.cert.CertificateException; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; /** @@ -39,44 +32,10 @@ public class BadVerifiedConnection extends UnverifiedConnection { public void openConnection() throws IOException, TimeoutException { try { - String keystorePath = System.getProperty("test-keystore.empty"); - assertNotNull(keystorePath); - String keystorePasswd = System.getProperty("test-keystore.password"); - assertNotNull(keystorePasswd); - char [] keystorePassword = keystorePasswd.toCharArray(); - - KeyStore tks = KeyStore.getInstance("JKS"); - tks.load(new FileInputStream(keystorePath), keystorePassword); - - TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); - tmf.init(tks); - - String p12Path = System.getProperty("test-client-cert.path"); - assertNotNull(p12Path); - String p12Passwd = System.getProperty("test-client-cert.password"); - assertNotNull(p12Passwd); - KeyStore ks = KeyStore.getInstance("PKCS12"); - char [] p12Password = p12Passwd.toCharArray(); - ks.load(new FileInputStream(p12Path), p12Password); - - KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - kmf.init(ks, p12Password); - - SSLContext c = getSSLContext(); - c.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); - - connectionFactory = TestUtils.connectionFactory(); + SSLContext c = TlsTestUtils.badVerifiedSslContext(); connectionFactory.useSslProtocol(c); - } catch (NoSuchAlgorithmException ex) { - throw new IOException(ex.toString()); - } catch (KeyManagementException ex) { - throw new IOException(ex.toString()); - } catch (KeyStoreException ex) { - throw new IOException(ex.toString()); - } catch (CertificateException ex) { - throw new IOException(ex.toString()); - } catch (UnrecoverableKeyException ex) { - throw new IOException(ex.toString()); + } catch (Exception ex) { + throw new IOException(ex); } try { diff --git a/src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java b/src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java index 014c02cfdd..acbfe48260 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -24,17 +24,11 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLHandshakeException; -import javax.net.ssl.TrustManagerFactory; -import java.io.FileInputStream; -import java.security.KeyStore; import java.util.function.Consumer; -import static com.rabbitmq.client.test.TestUtils.getSSLContext; import static java.util.Collections.singletonList; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -73,32 +67,7 @@ private static Consumer enableHostnameVerification() { @BeforeClass public static void initCrypto() throws Exception { - String keystorePath = System.getProperty("test-keystore.ca"); - assertNotNull(keystorePath); - String keystorePasswd = System.getProperty("test-keystore.password"); - assertNotNull(keystorePasswd); - char[] keystorePassword = keystorePasswd.toCharArray(); - - KeyStore tks = KeyStore.getInstance("JKS"); - tks.load(new FileInputStream(keystorePath), keystorePassword); - - TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); - tmf.init(tks); - - String p12Path = System.getProperty("test-client-cert.path"); - assertNotNull(p12Path); - String p12Passwd = System.getProperty("test-client-cert.password"); - assertNotNull(p12Passwd); - - KeyStore ks = KeyStore.getInstance("PKCS12"); - char[] p12Password = p12Passwd.toCharArray(); - ks.load(new FileInputStream(p12Path), p12Password); - - KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - kmf.init(ks, p12Password); - - sslContext = getSSLContext(); - sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); + sslContext = TlsTestUtils.verifiedSslContext(); } @Test(expected = SSLHandshakeException.class) diff --git a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java index 29fe35899e..37048739e2 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -18,6 +18,10 @@ import com.rabbitmq.client.*; import com.rabbitmq.client.impl.nio.NioParams; import com.rabbitmq.client.test.BrokerTestCase; +import com.rabbitmq.client.test.TestUtils; +import java.util.concurrent.atomic.AtomicReference; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; import org.junit.Test; import org.slf4j.LoggerFactory; @@ -28,6 +32,8 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; +import static com.rabbitmq.client.test.TestUtils.basicGetBasicConsume; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -76,6 +82,29 @@ public void connectionGetConsume() throws Exception { assertTrue("Message has not been received", messagesReceived); } + @Test + public void connectionGetConsumeProtocols() throws Exception { + String [] protocols = new String[] {"TLSv1.2", "TLSv1.3"}; + for (String protocol : protocols) { + SSLContext sslContext = SSLContext.getInstance(protocol); + sslContext.init(null, new TrustManager[] {new TrustEverythingTrustManager()}, null); + ConnectionFactory cf = TestUtils.connectionFactory(); + cf.useSslProtocol(sslContext); + cf.useNio(); + AtomicReference engine = new AtomicReference<>(); + cf.setNioParams(new NioParams() + .setSslEngineConfigurator(sslEngine -> engine.set(sslEngine))); + try (Connection c = cf.newConnection()) { + CountDownLatch latch = new CountDownLatch(1); + basicGetBasicConsume(c, QUEUE, latch, 100); + boolean messagesReceived = latch.await(5, TimeUnit.SECONDS); + assertTrue("Message has not been received", messagesReceived); + assertThat(engine.get()).isNotNull(); + assertThat(engine.get().getEnabledProtocols()).contains(protocol); + } + } + } + @Test public void socketChannelConfigurator() throws Exception { ConnectionFactory connectionFactory = new ConnectionFactory(); connectionFactory.useNio(); @@ -119,28 +148,4 @@ private void sendAndVerifyMessage(int size) throws Exception { assertTrue("Message has not been received", messageReceived); } - private boolean basicGetBasicConsume(Connection connection, String queue, final CountDownLatch latch, int msgSize) - throws Exception { - Channel channel = connection.createChannel(); - channel.queueDeclare(queue, false, false, false, null); - channel.queuePurge(queue); - - channel.basicPublish("", queue, null, new byte[msgSize]); - - String tag = channel.basicConsume(queue, false, new DefaultConsumer(channel) { - - @Override - public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException { - getChannel().basicAck(envelope.getDeliveryTag(), false); - latch.countDown(); - } - }); - - boolean messageReceived = latch.await(20, TimeUnit.SECONDS); - - channel.basicCancel(tag); - - return messageReceived; - } - } diff --git a/src/test/java/com/rabbitmq/client/test/ssl/TlsConnectionLogging.java b/src/test/java/com/rabbitmq/client/test/ssl/TlsConnectionLogging.java index 49b9ac3ad9..4298f18a9a 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/TlsConnectionLogging.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/TlsConnectionLogging.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -66,7 +66,7 @@ public static Function> nio() { @Test public void certificateInfoAreProperlyExtracted() throws Exception { - SSLContext sslContext = TestUtils.getSSLContext(); + SSLContext sslContext = TlsTestUtils.getSSLContext(); sslContext.init(null, new TrustManager[]{new AlwaysTrustTrustManager()}, null); ConnectionFactory connectionFactory = TestUtils.connectionFactory(); connectionFactory.useSslProtocol(sslContext); diff --git a/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java b/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java new file mode 100644 index 0000000000..891bec7f04 --- /dev/null +++ b/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java @@ -0,0 +1,115 @@ +// Copyright (c) 2021 VMware, Inc. or its affiliates. All rights reserved. +// +// This software, the RabbitMQ Java client library, is triple-licensed under the +// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 +// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see +// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, +// please see LICENSE-APACHE2. +// +// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, +// either express or implied. See the LICENSE file for specific language governing +// rights and limitations of this software. +// +// If you have any questions regarding licensing, please contact us at +// info@rabbitmq.com. + +package com.rabbitmq.client.test.ssl; + +import static org.junit.Assert.assertNotNull; + +import java.io.FileInputStream; +import java.security.KeyStore; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManagerFactory; + +class TlsTestUtils { + + private TlsTestUtils() {} + + static SSLContext badVerifiedSslContext() throws Exception { + return verifiedSslContext(() -> getSSLContext(), emptyKeystoreCa()); + } + + static SSLContext verifiedSslContext() throws Exception { + return verifiedSslContext(() -> getSSLContext(), keystoreCa()); + } + + static SSLContext verifiedSslContext(CallableSupplier sslContextSupplier) throws Exception { + return verifiedSslContext(sslContextSupplier, keystoreCa()); + } + + static SSLContext verifiedSslContext(CallableSupplier sslContextSupplier, String keystorePath) throws Exception { + // for local testing, run ./mvnw test-compile -Dtest-tls-certs.dir=/tmp/tls-gen/basic + // (generates the Java keystores) + assertNotNull(keystorePath); + String keystorePasswd = keystorePassword(); + assertNotNull(keystorePasswd); + char [] keystorePassword = keystorePasswd.toCharArray(); + + KeyStore tks = KeyStore.getInstance("JKS"); + tks.load(new FileInputStream(keystorePath), keystorePassword); + + TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); + tmf.init(tks); + + String p12Path = clientCertPath(); + assertNotNull(p12Path); + String p12Passwd = clientCertPassword(); + assertNotNull(p12Passwd); + KeyStore ks = KeyStore.getInstance("PKCS12"); + char [] p12Password = p12Passwd.toCharArray(); + ks.load(new FileInputStream(p12Path), p12Password); + + KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); + kmf.init(ks, p12Password); + + SSLContext c = sslContextSupplier.get(); + c.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); + return c; + } + + static String keystoreCa() { + return System.getProperty("test-keystore.ca", "./target/ca.keystore"); + } + + static String emptyKeystoreCa() { + return System.getProperty("test-keystore.empty", "./target/empty.keystore"); + } + + static String keystorePassword() { + return System.getProperty("test-keystore.password", "bunnies"); + } + + static String clientCertPath() { + return System.getProperty("test-client-cert.path", "/tmp/tls-gen/basic/client/keycert.p12"); + } + + static String clientCertPassword() { + return System.getProperty("test-client-cert.password", ""); + } + + public static SSLContext getSSLContext() throws NoSuchAlgorithmException { + SSLContext c; + + // pick the first protocol available, preferring TLSv1.2, then TLSv1, + // falling back to SSLv3 if running on an ancient/crippled JDK + for (String proto : Arrays.asList("TLSv1.3", "TLSv1.2", "TLSv1", "SSLv3")) { + try { + c = SSLContext.getInstance(proto); + return c; + } catch (NoSuchAlgorithmException x) { + // keep trying + } + } + throw new NoSuchAlgorithmException(); + } + + @FunctionalInterface + interface CallableSupplier { + + T get() throws Exception; + } +} diff --git a/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java index a14a257c24..39e1e90ba5 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -21,8 +21,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; import java.util.concurrent.TimeoutException; import static org.junit.Assert.*; @@ -37,10 +35,8 @@ public void openConnection() throws IOException, TimeoutException { try { connectionFactory.useSslProtocol(); - } catch (NoSuchAlgorithmException ex) { - throw new IOException(ex.toString()); - } catch (KeyManagementException ex) { - throw new IOException(ex.toString()); + } catch (Exception ex) { + throw new IOException(ex); } int attempt = 0; diff --git a/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java index 50d4d9003b..0f82fb1194 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,25 +15,25 @@ package com.rabbitmq.client.test.ssl; -import static org.junit.Assert.assertNotNull; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileInputStream; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.impl.nio.NioParams; import java.io.IOException; -import java.security.KeyManagementException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.UnrecoverableKeyException; -import java.security.cert.CertificateException; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.net.ssl.KeyManagerFactory; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Supplier; import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.SSLSocket; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.test.TestUtils; +import org.junit.Test; import org.slf4j.LoggerFactory; /** @@ -45,44 +45,11 @@ public class VerifiedConnection extends UnverifiedConnection { public void openConnection() throws IOException, TimeoutException { try { - String keystorePath = System.getProperty("test-keystore.ca"); - assertNotNull(keystorePath); - String keystorePasswd = System.getProperty("test-keystore.password"); - assertNotNull(keystorePasswd); - char [] keystorePassword = keystorePasswd.toCharArray(); - - KeyStore tks = KeyStore.getInstance("JKS"); - tks.load(new FileInputStream(keystorePath), keystorePassword); - - TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); - tmf.init(tks); - - String p12Path = System.getProperty("test-client-cert.path"); - assertNotNull(p12Path); - String p12Passwd = System.getProperty("test-client-cert.password"); - assertNotNull(p12Passwd); - KeyStore ks = KeyStore.getInstance("PKCS12"); - char [] p12Password = p12Passwd.toCharArray(); - ks.load(new FileInputStream(p12Path), p12Password); - - KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); - kmf.init(ks, p12Password); - - SSLContext c = getSSLContext(); - c.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); - + SSLContext c = TlsTestUtils.verifiedSslContext(); connectionFactory = TestUtils.connectionFactory(); connectionFactory.useSslProtocol(c); - } catch (NoSuchAlgorithmException ex) { - throw new IOException(ex.toString()); - } catch (KeyManagementException ex) { - throw new IOException(ex.toString()); - } catch (KeyStoreException ex) { - throw new IOException(ex.toString()); - } catch (CertificateException ex) { - throw new IOException(ex.toString()); - } catch (UnrecoverableKeyException ex) { - throw new IOException(ex.toString()); + } catch (Exception ex) { + throw new IOException(ex); } int attempt = 0; @@ -99,4 +66,36 @@ public void openConnection() fail("Couldn't open TLS connection after 3 attempts"); } } + + @Test + public void connectionGetConsumeProtocols() throws Exception { + String [] protocols = new String[] {"TLSv1.2", "TLSv1.3"}; + for (String protocol : protocols) { + SSLContext sslContext = SSLContext.getInstance(protocol); + ConnectionFactory cf = TestUtils.connectionFactory(); + cf.useSslProtocol(TlsTestUtils.verifiedSslContext(() -> sslContext)); + AtomicReference> protocolsSupplier = new AtomicReference<>(); + if (TestUtils.USE_NIO) { + cf.useNio(); + cf.setNioParams(new NioParams() + .setSslEngineConfigurator(sslEngine -> { + protocolsSupplier.set(() -> sslEngine.getEnabledProtocols()); + })); + } else { + cf.setSocketConfigurator(socket -> { + SSLSocket s = (SSLSocket) socket; + protocolsSupplier.set(() -> s.getEnabledProtocols()); + }); + } + try (Connection c = cf.newConnection()) { + CountDownLatch latch = new CountDownLatch(1); + TestUtils.basicGetBasicConsume(c, VerifiedConnection.class.getName(), latch, 100); + boolean messagesReceived = latch.await(5, TimeUnit.SECONDS); + assertTrue("Message has not been received", messagesReceived); + assertThat(protocolsSupplier.get()).isNotNull(); + assertThat(protocolsSupplier.get().get()).contains(protocol); + } + } + } + } diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 4bd2e37606..ee88f442c2 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -5,7 +5,7 @@ - +

\ No newline at end of file From 830bdc6a9cef7d74e2c09831d565d974bb4bd34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 8 Nov 2021 09:32:24 +0100 Subject: [PATCH 031/657] Test TLS 1.3 only if available TLS 1.3 has not been backported to all Java version (e.g. on 9 and 10), so this commit checks if the protocol is available before running the test. References #715 (cherry picked from commit 23961d5d0557a13105e099d2a90d90c4e96ab006) --- .../client/test/ssl/NioTlsUnverifiedConnection.java | 8 +++++++- .../com/rabbitmq/client/test/ssl/TlsTestUtils.java | 12 ++++++++++++ .../rabbitmq/client/test/ssl/VerifiedConnection.java | 8 +++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java index 37048739e2..bc143bc811 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java @@ -19,7 +19,10 @@ import com.rabbitmq.client.impl.nio.NioParams; import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; +import java.util.Collection; import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import org.junit.Test; @@ -84,7 +87,10 @@ public void connectionGetConsume() throws Exception { @Test public void connectionGetConsumeProtocols() throws Exception { - String [] protocols = new String[] {"TLSv1.2", "TLSv1.3"}; + Collection availableProtocols = TlsTestUtils.availableTlsProtocols(); + Collection protocols = Stream.of("TLSv1.2", "TLSv1.3") + .filter(p -> availableProtocols.contains(p)) + .collect(Collectors.toList()); for (String protocol : protocols) { SSLContext sslContext = SSLContext.getInstance(protocol); sslContext.init(null, new TrustManager[] {new TrustEverythingTrustManager()}, null); diff --git a/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java b/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java index 891bec7f04..6e633ce664 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java @@ -21,6 +21,8 @@ import java.security.KeyStore; import java.security.NoSuchAlgorithmException; import java.util.Arrays; +import java.util.Collection; +import java.util.stream.Collectors; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManagerFactory; @@ -107,6 +109,16 @@ public static SSLContext getSSLContext() throws NoSuchAlgorithmException { throw new NoSuchAlgorithmException(); } + static Collection availableTlsProtocols() { + try { + String[] protocols = SSLContext.getDefault().getSupportedSSLParameters().getProtocols(); + return Arrays.stream(protocols).filter(p -> p.toLowerCase().startsWith("tls")).collect( + Collectors.toList()); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + } + @FunctionalInterface interface CallableSupplier { diff --git a/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java index 0f82fb1194..9accac4459 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java @@ -22,12 +22,15 @@ import com.rabbitmq.client.Connection; import com.rabbitmq.client.impl.nio.NioParams; import java.io.IOException; +import java.util.Collection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; @@ -69,7 +72,10 @@ public void openConnection() @Test public void connectionGetConsumeProtocols() throws Exception { - String [] protocols = new String[] {"TLSv1.2", "TLSv1.3"}; + Collection availableProtocols = TlsTestUtils.availableTlsProtocols(); + Collection protocols = Stream.of("TLSv1.2", "TLSv1.3") + .filter(p -> availableProtocols.contains(p)) + .collect(Collectors.toList()); for (String protocol : protocols) { SSLContext sslContext = SSLContext.getInstance(protocol); ConnectionFactory cf = TestUtils.connectionFactory(); From 7e830e9c9641bf49bdadc73715e9dc9ca12913a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 8 Nov 2021 09:46:22 +0100 Subject: [PATCH 032/657] Fix usage of NioParams setter in test References #396,#715 --- .../client/test/ssl/NioTlsUnverifiedConnection.java | 5 +++-- .../com/rabbitmq/client/test/ssl/VerifiedConnection.java | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java index bc143bc811..132cac31cc 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java @@ -98,8 +98,9 @@ public void connectionGetConsumeProtocols() throws Exception { cf.useSslProtocol(sslContext); cf.useNio(); AtomicReference engine = new AtomicReference<>(); - cf.setNioParams(new NioParams() - .setSslEngineConfigurator(sslEngine -> engine.set(sslEngine))); + NioParams nioParams = new NioParams(); + nioParams.setSslEngineConfigurator(sslEngine -> engine.set(sslEngine)); + cf.setNioParams(nioParams); try (Connection c = cf.newConnection()) { CountDownLatch latch = new CountDownLatch(1); basicGetBasicConsume(c, QUEUE, latch, 100); diff --git a/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java index 9accac4459..1df24d83a9 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java @@ -83,10 +83,11 @@ public void connectionGetConsumeProtocols() throws Exception { AtomicReference> protocolsSupplier = new AtomicReference<>(); if (TestUtils.USE_NIO) { cf.useNio(); - cf.setNioParams(new NioParams() - .setSslEngineConfigurator(sslEngine -> { - protocolsSupplier.set(() -> sslEngine.getEnabledProtocols()); - })); + NioParams nioParams = new NioParams(); + nioParams.setSslEngineConfigurator( + sslEngine -> protocolsSupplier.set(() -> sslEngine.getEnabledProtocols()) + ); + cf.setNioParams(nioParams); } else { cf.setSocketConfigurator(socket -> { SSLSocket s = (SSLSocket) socket; From 2002ba6c11345ec5604c7a0c221c2660b6a4d872 Mon Sep 17 00:00:00 2001 From: pivotal-rabbitmq-ci Date: Mon, 8 Nov 2021 10:27:56 +0000 Subject: [PATCH 033/657] [maven-release-plugin] prepare release v5.14.0.RC1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 721405e4a5..d3147ea977 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.14.0-SNAPSHOT + 5.14.0.RC1 jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git - HEAD + v5.14.0.RC1 From 6b80f188d89b0b00750ccb5e859cbf65a4ce32ca Mon Sep 17 00:00:00 2001 From: pivotal-rabbitmq-ci Date: Mon, 8 Nov 2021 10:27:58 +0000 Subject: [PATCH 034/657] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d3147ea977..721405e4a5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.14.0.RC1 + 5.14.0-SNAPSHOT jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git - v5.14.0.RC1 + HEAD From fba1fd92a9190399461287072973b33593b749ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 8 Nov 2021 11:30:10 +0100 Subject: [PATCH 035/657] Set release version to 5.14.0.RC2 --- release-versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-versions.txt b/release-versions.txt index 19d9bee27b..cb85e0b3e9 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.14.0.RC1" +RELEASE_VERSION="5.14.0.RC2" DEVELOPMENT_VERSION="5.14.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From 17de251bf381943f39f558f1bd97900c847bcecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 15 Nov 2021 10:04:21 +0100 Subject: [PATCH 036/657] Set release version to 5.14.0 --- release-versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-versions.txt b/release-versions.txt index cb85e0b3e9..a93c142519 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.14.0.RC2" -DEVELOPMENT_VERSION="5.14.0-SNAPSHOT" +RELEASE_VERSION="5.14.0" +DEVELOPMENT_VERSION="5.15.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From dd03c79f4d30f32e4871188b52f0148b24846ad2 Mon Sep 17 00:00:00 2001 From: pivotal-rabbitmq-ci Date: Mon, 15 Nov 2021 09:09:20 +0000 Subject: [PATCH 037/657] [maven-release-plugin] prepare release v5.14.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 721405e4a5..04bbaf2a16 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.14.0-SNAPSHOT + 5.14.0 jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git - HEAD + v5.14.0 From 69336683f91b2ac75bf80eecfb49974c2be7333b Mon Sep 17 00:00:00 2001 From: pivotal-rabbitmq-ci Date: Mon, 15 Nov 2021 09:09:22 +0000 Subject: [PATCH 038/657] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 04bbaf2a16..32984a40fe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.14.0 + 5.15.0-SNAPSHOT jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git - v5.14.0 + HEAD From 412cfa8b8bc647a5fa73c17dcb9085290987cad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 15 Nov 2021 15:56:45 +0100 Subject: [PATCH 039/657] Bump Micrometer to 1.8.0 References #717 (cherry picked from commit 3d1c55c4c82ca112d304f4f9e87582d7052be07d) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32984a40fe..a95126b0ec 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.32 4.2.4 - 1.7.5 + 1.8.0 2.13.0 1.2.6 4.13.2 From 08039edeb7de7deb20a61b4dbc57b3c72a4803f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 15 Nov 2021 15:57:28 +0100 Subject: [PATCH 040/657] Bump logback to 1.2.7 (test dependency) (cherry picked from commit 45f761eb7ce041bb1fd0eaf88282e68f0a3d2d4d) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a95126b0ec..d51ed53f39 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 4.2.4 1.8.0 2.13.0 - 1.2.6 + 1.2.7 4.13.2 4.0.0 3.21.0 From 670f271c23336bce08f3421ae120828607016211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 13 Dec 2021 11:23:34 +0100 Subject: [PATCH 041/657] Bump Maven Groovy Plugin to 2.1.1 To avoid error on Java 18, it fails because of the usage of the SecurityManager (deprecated). (cherry picked from commit ba4ebbaaf17bad8ebc7503bc01a38fc711930bf7) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d51ed53f39..57187f8679 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 2.3 3.1.0 3.0.1 - 2.0 + 2.1.1 2.4.8 1.5 1.12 From 1106a8ba45a91cefa2242630336dc9a6b97848a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 13 Dec 2021 13:57:40 +0100 Subject: [PATCH 042/657] Use count down latch in test To avoid using Thread#stop(), which is deprecated since 1998. The test does not explain why or if Thread#stop() is necessary to the test. It's unlikely as the target thread has stopped already when stop is called in the test. (cherry picked from commit 6aaa203aa979307e7dc9326b7d9f0f077d8cc390) --- .../rabbitmq/client/test/Bug20004Test.java | 89 ++++++++----------- 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/Bug20004Test.java b/src/test/java/com/rabbitmq/client/test/Bug20004Test.java index 63e237d4b1..d14e1d3e74 100644 --- a/src/test/java/com/rabbitmq/client/test/Bug20004Test.java +++ b/src/test/java/com/rabbitmq/client/test/Bug20004Test.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,66 +15,55 @@ package com.rabbitmq.client.test; -import org.junit.Test; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; - -import static org.junit.Assert.*; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import org.junit.Test; /** - * Test for bug 20004 - deadlock through internal synchronization on - * the channel object. This is more properly a unit test, but since it - * requires a connection to a broker, it's grouped with the functional - * tests. - *

- * Test calls channel.queueDeclare, while synchronising on channel, from - * an independent thread. + * Test for bug 20004 - deadlock through internal synchronization on the channel object. This is + * more properly a unit test, but since it requires a connection to a broker, it's grouped with the + * functional tests. + * + *

Test calls channel.queueDeclare, while synchronising on channel, from an independent thread. */ public class Bug20004Test extends BrokerTestCase { - private volatile Exception caughtException = null; - private volatile boolean completed = false; - private volatile boolean created = false; + private volatile Exception caughtException = null; + private volatile boolean created = false; - protected void releaseResources() - throws IOException - { - if (created) { - channel.queueDelete("Bug20004Test"); - } + protected void releaseResources() throws IOException { + if (created) { + channel.queueDelete("Bug20004Test"); } + } - @SuppressWarnings("deprecation") - @Test public void bug20004() throws IOException - { - final Bug20004Test testInstance = this; + @Test + public void bug20004() throws InterruptedException { + final Bug20004Test testInstance = this; + CountDownLatch completedLatch = new CountDownLatch(1); - Thread declaringThread = new Thread(new Runnable() { - public void run() { - try { - synchronized (channel) { - channel.queueDeclare("Bug20004Test", false, false, false, null); - testInstance.created = true; - } - } catch (Exception e) { - testInstance.caughtException = e; + Thread declaringThread = + new Thread( + () -> { + try { + synchronized (channel) { + channel.queueDeclare("Bug20004Test", false, false, false, null); + testInstance.created = true; } - testInstance.completed = true; - } - }); - declaringThread.start(); + } catch (Exception e) { + testInstance.caughtException = e; + } + completedLatch.countDown(); + }); + declaringThread.start(); - // poll (100ms) for `completed`, up to 5s - long endTime = System.currentTimeMillis() + 5000; - while (!completed && (System.currentTimeMillis() < endTime)) { - try { - Thread.sleep(100); - } catch (InterruptedException ie) {} - } + boolean completed = completedLatch.await(5, TimeUnit.SECONDS); - declaringThread.stop(); // see bug 20012. - - assertTrue("Deadlock detected?", completed); - assertNull("queueDeclare threw an exception", caughtException); - assertTrue("unknown sequence of events", created); - } + assertTrue("Deadlock detected?", completed); + assertNull("queueDeclare threw an exception", caughtException); + assertTrue("unknown sequence of events", created); + } } From 3f541ead56b8190d80fe3965397c3afb109b9f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 3 Jan 2022 10:53:02 +0100 Subject: [PATCH 043/657] Bump dependencies References #717 (cherry picked from commit 7eb4d3fe32a85234c629ef4493238fc677be0655) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 57187f8679..40469c0241 100644 --- a/pom.xml +++ b/pom.xml @@ -55,9 +55,9 @@ UTF-8 1.7.32 - 4.2.4 - 1.8.0 - 2.13.0 + 4.2.7 + 1.8.1 + 2.13.1 1.2.7 4.13.2 4.0.0 From a7c5d5dc5d5cc0266709eb3e4ebaa869a73e894e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 3 Jan 2022 10:53:51 +0100 Subject: [PATCH 044/657] Bump test dependencies (cherry picked from commit 32dfd0fb338a3ff1db2c79dfeb42c9fd451284a0) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 40469c0241..dae3fc505c 100644 --- a/pom.xml +++ b/pom.xml @@ -58,12 +58,12 @@ 4.2.7 1.8.1 2.13.1 - 1.2.7 + 1.2.10 4.13.2 - 4.0.0 - 3.21.0 + 4.2.0 + 3.22.0 9.4.44.v20210927 - 1.69 + 1.70 3.2.0 2.5.3 From b04e8172f9ad1e4a9eb2cad01161dadfd74525f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 12 Jan 2022 16:56:41 +0100 Subject: [PATCH 045/657] Enforce connection timeout in NIO TLS handshake The handshake is in blocking mode and reading from a channel in this mode does not honor so_timeout but using temporary channels based on the socket input/output streams offers a decent workaround for this stage. Fixes #719 (cherry picked from commit 2751d463918b201f36afd1356408272f544816ab) --- pom.xml | 8 ++ .../nio/SocketChannelFrameHandlerFactory.java | 16 +++- .../client/impl/nio/SslEngineHelper.java | 9 +- .../test/ssl/NioTlsUnverifiedConnection.java | 89 ++++++++++++++++--- 4 files changed, 101 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index dae3fc505c..038648aea8 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,7 @@ 3.22.0 9.4.44.v20210927 1.70 + 0.10 3.2.0 2.5.3 @@ -759,6 +760,13 @@ ${bouncycastle.version} test + + com.github.netcrusherorg + netcrusher-core + ${netcrusher.version} + test + + diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java index 10f550d70a..5e5b9016d1 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -21,6 +21,9 @@ import com.rabbitmq.client.impl.AbstractFrameHandlerFactory; import com.rabbitmq.client.impl.FrameHandler; import com.rabbitmq.client.impl.TlsUtils; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.nio.channels.WritableByteChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,14 +98,23 @@ public FrameHandler create(Address addr, String connectionName) throws IOExcepti channel.connect(address); + if (ssl) { + int initialSoTimeout = channel.socket().getSoTimeout(); + channel.socket().setSoTimeout(this.connectionTimeout); sslEngine.beginHandshake(); try { - boolean handshake = SslEngineHelper.doHandshake(channel, sslEngine); + ReadableByteChannel wrappedReadChannel = Channels.newChannel( + channel.socket().getInputStream()); + WritableByteChannel wrappedWriteChannel = Channels.newChannel( + channel.socket().getOutputStream()); + boolean handshake = SslEngineHelper.doHandshake( + wrappedWriteChannel, wrappedReadChannel, sslEngine); if (!handshake) { LOGGER.error("TLS connection failed"); throw new SSLException("TLS handshake failed"); } + channel.socket().setSoTimeout(initialSoTimeout); } catch (SSLHandshakeException e) { LOGGER.error("TLS connection failed: {}", e.getMessage()); throw e; diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SslEngineHelper.java b/src/main/java/com/rabbitmq/client/impl/nio/SslEngineHelper.java index bcefe8b205..b7a535da87 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/SslEngineHelper.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/SslEngineHelper.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -21,7 +21,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -import java.nio.channels.SocketChannel; import java.nio.channels.WritableByteChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +37,7 @@ public class SslEngineHelper { private static final Logger LOGGER = LoggerFactory.getLogger(SslEngineHelper.class); - public static boolean doHandshake(SocketChannel socketChannel, SSLEngine engine) throws IOException { + public static boolean doHandshake(WritableByteChannel writeChannel, ReadableByteChannel readChannel, SSLEngine engine) throws IOException { ByteBuffer plainOut = ByteBuffer.allocate(engine.getSession().getApplicationBufferSize()); ByteBuffer plainIn = ByteBuffer.allocate(engine.getSession().getApplicationBufferSize()); @@ -58,11 +57,11 @@ public static boolean doHandshake(SocketChannel socketChannel, SSLEngine engine) break; case NEED_UNWRAP: LOGGER.debug("Unwrapping..."); - handshakeStatus = unwrap(cipherIn, plainIn, socketChannel, engine); + handshakeStatus = unwrap(cipherIn, plainIn, readChannel, engine); break; case NEED_WRAP: LOGGER.debug("Wrapping..."); - handshakeStatus = wrap(plainOut, cipherOut, socketChannel, engine); + handshakeStatus = wrap(plainOut, cipherOut, writeChannel, engine); break; case FINISHED: break; diff --git a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java index 132cac31cc..4010bc444e 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,31 +15,39 @@ package com.rabbitmq.client.test.ssl; -import com.rabbitmq.client.*; +import static com.rabbitmq.client.test.TestUtils.basicGetBasicConsume; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ConnectionFactory; +import com.rabbitmq.client.TrustEverythingTrustManager; import com.rabbitmq.client.impl.nio.NioParams; import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.SocketTimeoutException; import java.util.Collection; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLEngine; import javax.net.ssl.TrustManager; import org.junit.Test; +import org.netcrusher.core.reactor.NioReactor; +import org.netcrusher.tcp.TcpCrusher; +import org.netcrusher.tcp.TcpCrusherBuilder; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLEngine; -import java.io.IOException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicBoolean; - -import static com.rabbitmq.client.test.TestUtils.basicGetBasicConsume; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** * */ @@ -149,6 +157,59 @@ public void connectionGetConsumeProtocols() throws Exception { } } + @Test + public void connectionShouldEnforceConnectionTimeout() throws Exception { + int amqpPort = 5671; // assumes RabbitMQ server running on localhost; + int amqpProxyPort = TestUtils.randomNetworkPort(); + + int connectionTimeout = 3_000; + int handshakeTimeout = 1_000; + + try (NioReactor reactor = new NioReactor(); + TcpCrusher tcpProxy = + TcpCrusherBuilder.builder() + .withReactor(reactor) + .withBindAddress(new InetSocketAddress(amqpProxyPort)) + .withConnectAddress("localhost", amqpPort) + .build()) { + + tcpProxy.open(); + tcpProxy.freeze(); + + ConnectionFactory factory = new ConnectionFactory(); + factory.setHost("localhost"); + factory.setPort(amqpProxyPort); + + factory.useSslProtocol(); + factory.useNio(); + + factory.setConnectionTimeout(connectionTimeout); + factory.setHandshakeTimeout(handshakeTimeout); + + ExecutorService executorService = Executors.newSingleThreadExecutor(); + try { + CountDownLatch latch = new CountDownLatch(1); + executorService.submit( + () -> { + try { + factory.newConnection(); + latch.countDown(); + } catch (SocketTimeoutException e) { + latch.countDown(); + } catch (Exception e) { + // not supposed to happen + } + }); + + boolean connectionCreatedTimedOut = latch.await(10, TimeUnit.SECONDS); + assertThat(connectionCreatedTimedOut).isTrue(); + + } finally { + executorService.shutdownNow(); + } + } + } + private void sendAndVerifyMessage(int size) throws Exception { CountDownLatch latch = new CountDownLatch(1); boolean messageReceived = basicGetBasicConsume(connection, QUEUE, latch, size); From fcb9bf84fb759af478a3d74cd213787ed595bdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 12 Jan 2022 17:03:48 +0100 Subject: [PATCH 046/657] Set timeout on NIO connection Fixes #720 (cherry picked from commit 510389efde7a206dc29e6de70ca4e01764ac4c68) --- .../client/impl/nio/SocketChannelFrameHandlerFactory.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java index 5e5b9016d1..a482ace825 100644 --- a/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java +++ b/src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java @@ -58,12 +58,11 @@ public class SocketChannelFrameHandlerFactory extends AbstractFrameHandlerFactor private final List nioLoopContexts; - public SocketChannelFrameHandlerFactory(int connectionTimeout, NioParams nioParams, boolean ssl, SslContextFactory sslContextFactory) - throws IOException { + public SocketChannelFrameHandlerFactory(int connectionTimeout, NioParams nioParams, boolean ssl, SslContextFactory sslContextFactory) { super(connectionTimeout, null, ssl); this.nioParams = new NioParams(nioParams); this.sslContextFactory = sslContextFactory; - this.nioLoopContexts = new ArrayList(this.nioParams.getNbIoThreads()); + this.nioLoopContexts = new ArrayList<>(this.nioParams.getNbIoThreads()); for (int i = 0; i < this.nioParams.getNbIoThreads(); i++) { this.nioLoopContexts.add(new NioLoopContext(this, this.nioParams)); } @@ -96,7 +95,7 @@ public FrameHandler create(Address addr, String connectionName) throws IOExcepti nioParams.getSocketChannelConfigurator().configure(channel); } - channel.connect(address); + channel.socket().connect(address, this.connectionTimeout); if (ssl) { From 19948ded2b9f3942e63b9d0528384d757e62f368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 13 Jan 2022 14:52:24 +0100 Subject: [PATCH 047/657] Bump dependencies References #717 (cherry picked from commit 42c4d613c0111a7500b769d04905a5c35773d953) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 038648aea8..5b030eda5c 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.32 4.2.7 - 1.8.1 + 1.8.2 2.13.1 1.2.10 4.13.2 From 1dc6640cbe69214880aab0b782bb3ba7674afc06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 3 Feb 2022 10:43:53 +0100 Subject: [PATCH 048/657] Use publish confirms in visibility effect test The test started to fail on a 2-node 3.10 cluster while it was OK before. The test expected messages to be almost immediately available in the queues after publishing, which is not realistic, as publishing is asynchronous. This commit enables publish confirms and waits for the confirms to arrive before purging and checking the content of the queues, which is more realistic in terms of expectations. The bulk of the test remains asynchronous in case it would hang like it used to do sometimes. (cherry picked from commit 24fd5953bf81de43066d72a149c73b70b6c02edc) --- .../server/EffectVisibilityCrossNodeTest.java | 43 ++++++++++++++++--- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java index b4c9a0bc6a..0070d38c73 100644 --- a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java +++ b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java @@ -15,11 +15,15 @@ package com.rabbitmq.client.test.server; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import java.io.IOException; +import java.util.Iterator; +import java.util.Set; import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicReference; import org.junit.Test; import com.rabbitmq.client.test.functional.ClusteredTestBase; @@ -31,16 +35,20 @@ public class EffectVisibilityCrossNodeTest extends ClusteredTestBase { private final String[] queues = new String[QUEUES]; + ExecutorService executorService; + @Override protected void createResources() throws IOException { for (int i = 0; i < queues.length ; i++) { queues[i] = alternateChannel.queueDeclare("", false, false, true, null).getQueue(); alternateChannel.queueBind(queues[i], "amq.fanout", ""); } + executorService = Executors.newSingleThreadExecutor(); } @Override protected void releaseResources() throws IOException { + executorService.shutdownNow(); for (int i = 0; i < queues.length ; i++) { alternateChannel.queueDelete(queues[i]); } @@ -53,14 +61,41 @@ protected void releaseResources() throws IOException { private static final byte[] msg = "".getBytes(); @Test public void effectVisibility() throws Exception { - ExecutorService executorService = Executors.newSingleThreadExecutor(); - try { + AtomicReference confirmLatch = new AtomicReference<>(); + Set publishIds = ConcurrentHashMap.newKeySet(); + channel.addConfirmListener( + (deliveryTag, multiple) -> { + if (multiple) { + Iterator iterator = publishIds.iterator(); + while (iterator.hasNext()) { + long publishId = iterator.next(); + if (publishId <= deliveryTag) { + iterator.remove(); + } + } + } else { + publishIds.remove(deliveryTag); + } + if (publishIds.isEmpty()) { + confirmLatch.get().countDown(); + } + }, + (deliveryTag, multiple) -> {}); + // the test bulk is asynchronous because this test has a history of hanging Future task = executorService.submit(() -> { + // we use publish confirm to make sure messages made it to the queues + // before checking their content + channel.confirmSelect(); for (int i = 0; i < BATCHES; i++) { Thread.sleep(10); // to avoid flow control for the connection + confirmLatch.set(new CountDownLatch(1)); for (int j = 0; j < MESSAGES_PER_BATCH; j++) { + long publishId = channel.getNextPublishSeqNo(); channel.basicPublish("amq.fanout", "", null, msg); + publishIds.add(publishId); } + assertThat(confirmLatch.get().await(10, TimeUnit.SECONDS)).isTrue(); + publishIds.clear(); for (int j = 0; j < queues.length; j++) { assertEquals(MESSAGES_PER_BATCH, channel.queuePurge(queues[j]).getMessageCount()); } @@ -68,9 +103,5 @@ protected void releaseResources() throws IOException { return null; }); task.get(1, TimeUnit.MINUTES); - } finally { - executorService.shutdownNow(); - executorService.awaitTermination(1, TimeUnit.SECONDS); - } } } From 2f1cab3a2c4eec553739db862ec3aef59382863f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 3 Feb 2022 11:30:47 +0100 Subject: [PATCH 049/657] Report unconfirmed messages in test (cherry picked from commit e237496c8eb08965d54b3c25d3866cdaedf31a16) --- .../client/test/server/EffectVisibilityCrossNodeTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java index 0070d38c73..17ac78e5d2 100644 --- a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java +++ b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; +import org.junit.Assert; import org.junit.Test; import com.rabbitmq.client.test.functional.ClusteredTestBase; @@ -94,7 +95,10 @@ protected void releaseResources() throws IOException { channel.basicPublish("amq.fanout", "", null, msg); publishIds.add(publishId); } - assertThat(confirmLatch.get().await(10, TimeUnit.SECONDS)).isTrue(); + boolean confirmed = confirmLatch.get().await(10, TimeUnit.SECONDS); + if (!confirmed) { + Assert.fail("Messages not confirmed in 10 seconds: " + publishIds); + } publishIds.clear(); for (int j = 0; j < queues.length; j++) { assertEquals(MESSAGES_PER_BATCH, channel.queuePurge(queues[j]).getMessageCount()); From ad936582838e7934802abf2d89676147c1d14c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 3 Feb 2022 14:29:59 +0100 Subject: [PATCH 050/657] Register publish ID before sending message (cherry picked from commit 34b2f30a4bf6dac9cc3c24af752bd3de54aa4ce6) --- .../client/test/server/EffectVisibilityCrossNodeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java index 17ac78e5d2..2a8dbe1df3 100644 --- a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java +++ b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java @@ -92,8 +92,8 @@ protected void releaseResources() throws IOException { confirmLatch.set(new CountDownLatch(1)); for (int j = 0; j < MESSAGES_PER_BATCH; j++) { long publishId = channel.getNextPublishSeqNo(); - channel.basicPublish("amq.fanout", "", null, msg); publishIds.add(publishId); + channel.basicPublish("amq.fanout", "", null, msg); } boolean confirmed = confirmLatch.get().await(10, TimeUnit.SECONDS); if (!confirmed) { From f9a6253f86f9893b836097f3d40b470e636e2a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 3 Feb 2022 14:52:20 +0100 Subject: [PATCH 051/657] Retry until queue is fully purged The test remains flaky even with publish confirms. Purging the queue repeatedly until all published messages have been purged serves the same purpose of eventual visibility. (cherry picked from commit faeed579f4ecbed0664f10dbed04c774f8687aeb) --- .../server/EffectVisibilityCrossNodeTest.java | 69 +++++++------------ 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java index 2a8dbe1df3..bf3c56bf58 100644 --- a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java +++ b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java @@ -15,16 +15,11 @@ package com.rabbitmq.client.test.server; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import java.io.IOException; -import java.util.Iterator; -import java.util.Set; import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicReference; -import org.junit.Assert; import org.junit.Test; import com.rabbitmq.client.test.functional.ClusteredTestBase; @@ -62,49 +57,33 @@ protected void releaseResources() throws IOException { private static final byte[] msg = "".getBytes(); @Test public void effectVisibility() throws Exception { - AtomicReference confirmLatch = new AtomicReference<>(); - Set publishIds = ConcurrentHashMap.newKeySet(); - channel.addConfirmListener( - (deliveryTag, multiple) -> { - if (multiple) { - Iterator iterator = publishIds.iterator(); - while (iterator.hasNext()) { - long publishId = iterator.next(); - if (publishId <= deliveryTag) { - iterator.remove(); - } - } - } else { - publishIds.remove(deliveryTag); - } - if (publishIds.isEmpty()) { - confirmLatch.get().countDown(); + // the test bulk is asynchronous because this test has a history of hanging + Future task = + executorService.submit( + () -> { + for (int i = 0; i < BATCHES; i++) { + Thread.sleep(10); // to avoid flow control for the connection + for (int j = 0; j < MESSAGES_PER_BATCH; j++) { + channel.basicPublish("amq.fanout", "", null, msg); } - }, - (deliveryTag, multiple) -> {}); - // the test bulk is asynchronous because this test has a history of hanging - Future task = executorService.submit(() -> { - // we use publish confirm to make sure messages made it to the queues - // before checking their content - channel.confirmSelect(); - for (int i = 0; i < BATCHES; i++) { - Thread.sleep(10); // to avoid flow control for the connection - confirmLatch.set(new CountDownLatch(1)); - for (int j = 0; j < MESSAGES_PER_BATCH; j++) { - long publishId = channel.getNextPublishSeqNo(); - publishIds.add(publishId); - channel.basicPublish("amq.fanout", "", null, msg); - } - boolean confirmed = confirmLatch.get().await(10, TimeUnit.SECONDS); - if (!confirmed) { - Assert.fail("Messages not confirmed in 10 seconds: " + publishIds); - } - publishIds.clear(); - for (int j = 0; j < queues.length; j++) { - assertEquals(MESSAGES_PER_BATCH, channel.queuePurge(queues[j]).getMessageCount()); + for (int j = 0; j < queues.length; j++) { + String queue = queues[j]; + long timeout = 10 * 1000; + long waited = 0; + int purged = 0; + while (waited < timeout) { + purged += channel.queuePurge(queue).getMessageCount(); + if (purged == MESSAGES_PER_BATCH) { + break; } + Thread.sleep(10); + waited += 10; + } + assertEquals("Queue " + queue + " should have been purged after 10 seconds", + MESSAGES_PER_BATCH, purged); } - return null; + } + return null; }); task.get(1, TimeUnit.MINUTES); } From 1e96924fe0f01a75d11f0f5f763a7b38ccab95d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 4 Feb 2022 09:05:36 +0100 Subject: [PATCH 052/657] Log test execution start and end CI jobs hang regularly, this could help to tell whether the cause is the tests themselves or something in the CI environment. (cherry picked from commit 8d9f1ff8ce115cf719b571a10281403870e7966d) --- src/test/resources/logback-test.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index ee88f442c2..596182704c 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -5,6 +5,8 @@ + + From dddf081c84f7cab594057bf2bba29e9cefa4ea89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 7 Feb 2022 11:18:22 +0100 Subject: [PATCH 053/657] Add logging to topic permissions test Test tends to hang on CI. (cherry picked from commit f2e5a24bf078bfb3d95cc68dee221080bca7704f) --- .../client/test/server/TopicPermissions.java | 15 +++++++++++++++ src/test/resources/logback-test.xml | 1 + 2 files changed, 16 insertions(+) diff --git a/src/test/java/com/rabbitmq/client/test/server/TopicPermissions.java b/src/test/java/com/rabbitmq/client/test/server/TopicPermissions.java index 5b79de1387..323b9cba65 100644 --- a/src/test/java/com/rabbitmq/client/test/server/TopicPermissions.java +++ b/src/test/java/com/rabbitmq/client/test/server/TopicPermissions.java @@ -25,36 +25,45 @@ import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.Assert.fail; public class TopicPermissions extends BrokerTestCase { + private static final Logger LOGGER = LoggerFactory.getLogger(TopicPermissions.class); + String protectedTopic = "protected.topic"; String notProtectedTopic = "not.protected.topic"; String noneTopicExchange = "not.a.topic"; @Override protected boolean shouldRun() throws IOException { + LOGGER.debug("Checking if test should run"); return Host.isRabbitMqCtlCommandAvailable("set_topic_permissions"); } @Override protected void createResources() throws IOException, TimeoutException { + LOGGER.debug("Creating AMQP resources"); channel.exchangeDeclare(protectedTopic, BuiltinExchangeType.TOPIC); channel.exchangeDeclare(notProtectedTopic, BuiltinExchangeType.TOPIC); channel.exchangeDeclare(noneTopicExchange, BuiltinExchangeType.DIRECT); + LOGGER.debug("Setting permissions"); Host.rabbitmqctl("set_topic_permissions -p / guest " + protectedTopic + " \"^{username}\" \"^{username}\""); Host.rabbitmqctl("set_topic_permissions -p / guest " + noneTopicExchange + " \"^{username}\" \"^{username}\""); } @Override protected void releaseResources() throws IOException { + LOGGER.debug("Deleting AMQP resources"); channel.exchangeDelete(protectedTopic); channel.exchangeDelete(notProtectedTopic); channel.exchangeDelete(noneTopicExchange); + LOGGER.debug("Clearing permissions"); Host.rabbitmqctl("clear_topic_permissions -p / guest"); } @@ -107,14 +116,18 @@ public void topicPermissions() throws IOException { } void assertAccessOk(String description, Callable action) { + LOGGER.debug("Running '" + description + "'"); try { action.call(); } catch(Exception e) { fail(description + " (" + e.getMessage()+")"); + } finally { + LOGGER.debug("'" + description + "' done"); } } void assertAccessRefused(String description, Callable action) throws IOException { + LOGGER.debug("Running '" + description + "'"); try { action.call(); fail(description); @@ -126,6 +139,8 @@ void assertAccessRefused(String description, Callable action) throws IOExc openChannel(); } catch(Exception e) { fail("Unexpected exception: " + e.getMessage()); + } finally { + LOGGER.debug("'" + description + "' done"); } } } diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 596182704c..90ebf5307e 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -6,6 +6,7 @@ + From b78e803d41a231b891b4ade5fdff53abd54a643b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 7 Feb 2022 12:04:20 +0100 Subject: [PATCH 054/657] Handle process better in Host The method to check if a command exists asks for the help of this command now (instead of checking if the command name is in the output of rabbitmqctl). This way we just have to check the exit code (0 if the command exists). We also use a timeout to wait for the end of the process. A test hangs on the CI environment, these changes try to fix this. (cherry picked from commit 6b2251fe05684f39eca99eb846179df4c0d91e7e) --- src/test/java/com/rabbitmq/tools/Host.java | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/rabbitmq/tools/Host.java b/src/test/java/com/rabbitmq/tools/Host.java index e81aef9a93..74be79b66c 100644 --- a/src/test/java/com/rabbitmq/tools/Host.java +++ b/src/test/java/com/rabbitmq/tools/Host.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -28,12 +28,17 @@ import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.impl.NetworkConnection; import com.rabbitmq.client.test.TestUtils; +import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Host { + private static final Logger LOGGER = LoggerFactory.getLogger(Host.class); + private static final String DOCKER_PREFIX = "DOCKER:"; private static final Pattern CONNECTION_NAME_PATTERN = Pattern.compile("\"connection_name\",\"(?[a-zA-Z0-9\\-]+)?\""); @@ -78,7 +83,14 @@ private static int waitForExitValue(Process pr) { public static Process executeCommandIgnoringErrors(String command) throws IOException { Process pr = executeCommandProcess(command); - waitForExitValue(pr); + boolean exited = false; + try { + exited = pr.waitFor(30, TimeUnit.SECONDS); + } catch (InterruptedException e) { + } + if (!exited) { + LOGGER.warn("Command '{}' did not finish in 30 seconds", command); + } return pr; } @@ -101,9 +113,9 @@ private static Process executeCommandProcess(String command) throws IOException } public static boolean isRabbitMqCtlCommandAvailable(String command) throws IOException { - Process process = rabbitmqctlIgnoreErrors(""); - String stderr = capture(process.getErrorStream()); - return stderr.contains(command); + Process process = rabbitmqctlIgnoreErrors(command + " --help"); + int exitValue = process.exitValue(); + return exitValue == 0; } public static Process rabbitmqctl(String command) throws IOException { From 8da31a37673c6058e16bcc7f4bb00dee9278cc6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 7 Feb 2022 14:30:53 +0100 Subject: [PATCH 055/657] Pump process inputs before checking completion Process completion methods can hang because internal buffers are full. This commit "pumps" the inputs before calling the completion method, which should help to finish properly the command call. (cherry picked from commit 17afacafdb58c37d987a5ad1eb1457c9ffbb7824) --- src/test/java/com/rabbitmq/tools/Host.java | 69 ++++++++++++++++++---- 1 file changed, 58 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/rabbitmq/tools/Host.java b/src/test/java/com/rabbitmq/tools/Host.java index 74be79b66c..ee3b6a59f3 100644 --- a/src/test/java/com/rabbitmq/tools/Host.java +++ b/src/test/java/com/rabbitmq/tools/Host.java @@ -54,25 +54,68 @@ public static String capture(InputStream is) return buff.toString(); } - public static Process executeCommand(String command) throws IOException + public static ProcessState executeCommand(String command) throws IOException { Process pr = executeCommandProcess(command); + InputStreamPumpState inputState = new InputStreamPumpState(pr.getInputStream()); + InputStreamPumpState errorState = new InputStreamPumpState(pr.getErrorStream()); - int ev = waitForExitValue(pr); + int ev = waitForExitValue(pr, inputState, errorState); + inputState.pump(); + errorState.pump(); if (ev != 0) { - String stdout = capture(pr.getInputStream()); - String stderr = capture(pr.getErrorStream()); throw new IOException("unexpected command exit value: " + ev + "\ncommand: " + command + "\n" + - "\nstdout:\n" + stdout + - "\nstderr:\n" + stderr + "\n"); + "\nstdout:\n" + inputState.buffer.toString() + + "\nstderr:\n" + errorState.buffer.toString() + "\n"); } - return pr; + return new ProcessState(pr, inputState, errorState); + } + + static class ProcessState { + + private final Process process; + private final InputStreamPumpState inputState; + private final InputStreamPumpState errorState; + + ProcessState(Process process, InputStreamPumpState inputState, + InputStreamPumpState errorState) { + this.process = process; + this.inputState = inputState; + this.errorState = errorState; + } + + private String output() { + return inputState.buffer.toString(); + } + + } + + private static class InputStreamPumpState { + + private final BufferedReader reader; + private final StringBuilder buffer; + + private InputStreamPumpState(InputStream in) { + this.reader = new BufferedReader(new InputStreamReader(in)); + this.buffer = new StringBuilder(); + } + + void pump() throws IOException { + String line; + while ((line = reader.readLine()) != null) { + buffer.append(line).append("\n"); + } + } + } - private static int waitForExitValue(Process pr) { + private static int waitForExitValue(Process pr, InputStreamPumpState inputState, + InputStreamPumpState errorState) throws IOException { while(true) { try { + inputState.pump(); + errorState.pump(); pr.waitFor(); break; } catch (InterruptedException ignored) {} @@ -83,6 +126,10 @@ private static int waitForExitValue(Process pr) { public static Process executeCommandIgnoringErrors(String command) throws IOException { Process pr = executeCommandProcess(command); + InputStreamPumpState inputState = new InputStreamPumpState(pr.getInputStream()); + InputStreamPumpState errorState = new InputStreamPumpState(pr.getErrorStream()); + inputState.pump(); + errorState.pump(); boolean exited = false; try { exited = pr.waitFor(30, TimeUnit.SECONDS); @@ -118,7 +165,7 @@ public static boolean isRabbitMqCtlCommandAvailable(String command) throws IOExc return exitValue == 0; } - public static Process rabbitmqctl(String command) throws IOException { + public static ProcessState rabbitmqctl(String command) throws IOException { return executeCommand(rabbitmqctlCommand() + rabbitmqctlNodenameArgument() + " " + command); @@ -142,7 +189,7 @@ public static void clearResourceAlarm(String source) throws IOException { rabbitmqctl("eval 'rabbit_alarm:clear_alarm({resource_limit, " + source + ", node()}).'"); } - public static Process invokeMakeTarget(String command) throws IOException { + public static ProcessState invokeMakeTarget(String command) throws IOException { File rabbitmqctl = new File(rabbitmqctlCommand()); return executeCommand(makeCommand() + " -C \'" + rabbitmqDir() + "\'" + @@ -307,7 +354,7 @@ public String toString() { } public static List listConnections() throws IOException { - String output = capture(rabbitmqctl("list_connections -q pid peer_port client_properties").getInputStream()); + String output = rabbitmqctl("list_connections -q pid peer_port client_properties").output(); // output (header line presence depends on broker version): // pid peer_port // 58713 From b53e5ca2bf8abdf6967be3b79b3c85e2736b32da Mon Sep 17 00:00:00 2001 From: Laurent Perez Date: Wed, 9 Feb 2022 15:14:19 +0100 Subject: [PATCH 056/657] topology : fix connection factory property evaluation (cherry picked from commit ed7a83aa1abe584025383f43ec6625b9cffa9cb3) --- .../java/com/rabbitmq/client/ConnectionFactoryConfigurator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactoryConfigurator.java b/src/main/java/com/rabbitmq/client/ConnectionFactoryConfigurator.java index d59770380e..66f4a3742d 100644 --- a/src/main/java/com/rabbitmq/client/ConnectionFactoryConfigurator.java +++ b/src/main/java/com/rabbitmq/client/ConnectionFactoryConfigurator.java @@ -210,7 +210,7 @@ public static void load(ConnectionFactory cf, Map properties, St } String topologyRecovery = lookUp(TOPOLOGY_RECOVERY_ENABLED, properties, prefix); if (topologyRecovery != null) { - cf.setTopologyRecoveryEnabled(Boolean.getBoolean(topologyRecovery)); + cf.setTopologyRecoveryEnabled(Boolean.valueOf(topologyRecovery)); } String networkRecoveryInterval = lookUp(CONNECTION_RECOVERY_INTERVAL, properties, prefix); if (networkRecoveryInterval != null) { From 7e6c46c9462204dba54ce7a93f5ed3d87bece338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 16 Feb 2022 09:24:57 +0100 Subject: [PATCH 057/657] Bump dependencies References #717 (cherry picked from commit b613dc1f277de28de63caa6cd6e5bcdf2a0c0c10) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5b030eda5c..27120dacd5 100644 --- a/pom.xml +++ b/pom.xml @@ -54,8 +54,8 @@ UTF-8 UTF-8 - 1.7.32 - 4.2.7 + 1.7.36 + 4.2.8 1.8.2 2.13.1 1.2.10 From ba9c54849bb26d645299eab6a4ecc93d1fb876f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 16 Feb 2022 09:25:57 +0100 Subject: [PATCH 058/657] Bump test dependencies (cherry picked from commit 99c4e738b037a00b9eb1878847f4cc75e1188ccb) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 27120dacd5..78534eb35b 100644 --- a/pom.xml +++ b/pom.xml @@ -60,9 +60,9 @@ 2.13.1 1.2.10 4.13.2 - 4.2.0 + 4.3.1 3.22.0 - 9.4.44.v20210927 + 9.4.45.v20220203 1.70 0.10 From 7e38ec9597ecd550f902a9201f6b03b065f6d7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 21 Feb 2022 10:26:59 +0100 Subject: [PATCH 059/657] Add log before starting each test CI environment hangs sometimes, this should help diagnose if a test in particular is hanging. (cherry picked from commit 02fba0c106c6f3fe4ff6d4ec505a27c09bc78aca) --- .../com/rabbitmq/client/test/ClientTests.java | 4 +- .../client/test/RequiredPropertiesSuite.java | 11 +++++ .../com/rabbitmq/client/test/TestUtils.java | 46 ++++++++++++++++++- .../test/functional/FunctionalTests.java | 2 +- .../rabbitmq/client/test/ssl/SSLTests.java | 15 +++++- src/test/resources/logback-test.xml | 3 ++ 6 files changed, 75 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/ClientTests.java b/src/test/java/com/rabbitmq/client/test/ClientTests.java index 681542ab70..b8550640ca 100644 --- a/src/test/java/com/rabbitmq/client/test/ClientTests.java +++ b/src/test/java/com/rabbitmq/client/test/ClientTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) +@RunWith(TestUtils.DefaultTestSuite.class) @Suite.SuiteClasses({ TableTest.class, LongStringTest.class, diff --git a/src/test/java/com/rabbitmq/client/test/RequiredPropertiesSuite.java b/src/test/java/com/rabbitmq/client/test/RequiredPropertiesSuite.java index b97a0b0af6..f8ab431800 100644 --- a/src/test/java/com/rabbitmq/client/test/RequiredPropertiesSuite.java +++ b/src/test/java/com/rabbitmq/client/test/RequiredPropertiesSuite.java @@ -1,18 +1,23 @@ package com.rabbitmq.client.test; import org.junit.runner.Runner; +import org.junit.runner.notification.RunNotifier; import org.junit.runners.Suite; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; import java.util.ArrayList; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * */ public class RequiredPropertiesSuite extends Suite { + private static final Logger LOGGER = LoggerFactory.getLogger(RequiredPropertiesSuite.class); + public RequiredPropertiesSuite(Class klass, RunnerBuilder builder) throws InitializationError { super(klass, builder); } @@ -41,4 +46,10 @@ protected List getChildren() { return super.getChildren(); } } + + @Override + protected void runChild(Runner runner, RunNotifier notifier) { + LOGGER.info("Running test {}", runner.getDescription().getDisplayName()); + super.runChild(runner, notifier); + } } diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java index c488fcff6d..0c0ea49a89 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtils.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -19,11 +19,18 @@ import com.rabbitmq.client.impl.NetworkConnection; import com.rabbitmq.client.impl.recovery.AutorecoveringConnection; import com.rabbitmq.tools.Host; +import java.util.List; import org.assertj.core.api.Assertions; import org.junit.AssumptionViolatedException; import org.junit.rules.TestRule; import org.junit.runner.Description; +import org.junit.runner.Runner; +import org.junit.runner.notification.RunNotifier; +import org.junit.runners.Suite; +import org.junit.runners.model.InitializationError; +import org.junit.runners.model.RunnerBuilder; import org.junit.runners.model.Statement; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; @@ -40,6 +47,8 @@ public class TestUtils { + private static final Logger LOGGER = LoggerFactory.getLogger(TestUtils.class); + public static final boolean USE_NIO = System.getProperty("use.nio") != null; public static ConnectionFactory connectionFactory() { @@ -364,4 +373,39 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp return messageReceived; } + + public static class DefaultTestSuite extends Suite { + + + public DefaultTestSuite(Class klass, RunnerBuilder builder) + throws InitializationError { + super(klass, builder); + } + + public DefaultTestSuite(RunnerBuilder builder, Class[] classes) + throws InitializationError { + super(builder, classes); + } + + protected DefaultTestSuite(Class klass, Class[] suiteClasses) + throws InitializationError { + super(klass, suiteClasses); + } + + protected DefaultTestSuite(RunnerBuilder builder, Class klass, Class[] suiteClasses) + throws InitializationError { + super(builder, klass, suiteClasses); + } + + @Override + protected void runChild(Runner runner, RunNotifier notifier) { + LOGGER.info("Running test {}", runner.getDescription().getDisplayName()); + super.runChild(runner, notifier); + } + + protected DefaultTestSuite(Class klass, List runners) + throws InitializationError { + super(klass, runners); + } + } } diff --git a/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java b/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java index db87a38695..892f4977ba 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java +++ b/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java b/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java index 3d629d15ea..758d87118a 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -20,12 +20,15 @@ import com.rabbitmq.client.test.SslContextFactoryTest; import org.junit.runner.RunWith; import org.junit.runner.Runner; +import org.junit.runner.notification.RunNotifier; import org.junit.runners.Suite; import org.junit.runners.model.InitializationError; import org.junit.runners.model.RunnerBuilder; import java.util.ArrayList; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @RunWith(SSLTests.SslSuite.class) @Suite.SuiteClasses({ @@ -40,6 +43,8 @@ }) public class SSLTests { + private static final Logger LOGGER = LoggerFactory.getLogger(SSLTests.class); + // initialize system properties static{ new AbstractRMQTestSuite(){}; @@ -70,11 +75,17 @@ protected SslSuite(Class klass, List runners) throws InitializationEr @Override protected List getChildren() { if(!AbstractRMQTestSuite.requiredProperties() && !AbstractRMQTestSuite.isSSLAvailable()) { - return new ArrayList(); + return new ArrayList<>(); } else { return super.getChildren(); } } + + @Override + protected void runChild(Runner runner, RunNotifier notifier) { + LOGGER.info("Running test {}", runner.getDescription().getDisplayName()); + super.runChild(runner, notifier); + } } } diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 90ebf5307e..5874c1c8c4 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -5,6 +5,9 @@ + + + From 04b060dbb28b61ff70af522403be3ad1d9e3d3c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 25 Feb 2022 16:24:33 +0100 Subject: [PATCH 060/657] Copy element-list to package-list in Javadoc deployment For Java8-generated Javadoc to link correctly to the library Javadoc whatever Java version used to generate it. See https://bugs.openjdk.java.net/browse/JDK-8211194. (cherry picked from commit 04bc4caed4a89b9da8e8815d1771e00ed189a79d) --- deploy-javadoc.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deploy-javadoc.sh b/deploy-javadoc.sh index 74878215e9..46cdb09398 100755 --- a/deploy-javadoc.sh +++ b/deploy-javadoc.sh @@ -5,6 +5,11 @@ TAG=$(git describe --exact-match --tags $(git log -n1 --pretty='%h')) make deps ./mvnw -q clean javadoc:javadoc -Dmaven.javadoc.failOnError=false + +if [ -e target/site/apidocs/element-list ] + then cp target/site/apidocs/element-list target/site/apidocs/package-list +fi + git co gh-pages rm -rf $DEPLOY_DIRECTORY/* cp -r target/site/apidocs/* $DEPLOY_DIRECTORY From 896fc56d6c61e6ffa23be27648a6971b67b48fad Mon Sep 17 00:00:00 2001 From: David Ansari Date: Sun, 27 Feb 2022 15:19:59 +0100 Subject: [PATCH 061/657] Add tests for any-with-x and all-with-x for x-match binding argument in headers exchange (cherry picked from commit 7e92c2df240f326c4afff3eb803cf1efeda65f9f) --- .../functional/HeadersExchangeValidation.java | 6 +++ .../client/test/functional/Routing.java | 45 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java b/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java index b2eeee7719..e62dd04d0b 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java +++ b/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java @@ -47,6 +47,12 @@ public class HeadersExchangeValidation extends BrokerTestCase { arguments.put("x-match", "any"); succeedBind(queue, arguments); + + arguments.put("x-match", "all-with-x"); + succeedBind(queue, arguments); + + arguments.put("x-match", "any-with-x"); + succeedBind(queue, arguments); } private void failBind(String queue, HashMap arguments) { diff --git a/src/test/java/com/rabbitmq/client/test/functional/Routing.java b/src/test/java/com/rabbitmq/client/test/functional/Routing.java index 050eb379b0..45161acddc 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Routing.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Routing.java @@ -170,6 +170,7 @@ private void checkGet(String queue, boolean messageExpected) spec.put("h1", "12345"); spec.put("h2", "bar"); spec.put("h3", null); + spec.put("x-key-1", "bindings starting with x- get filtered out"); spec.put("x-match", "all"); channel.queueBind(Q1, "amq.match", "", spec); spec.put("x-match", "any"); @@ -226,6 +227,10 @@ private void checkGet(String queue, boolean messageExpected) map.put("h2", "quux"); channel.basicPublish("amq.match", "", props.build(), "8".getBytes()); + map.clear(); + map.put("x-key-1", "bindings starting with x- get filtered out"); + channel.basicPublish("amq.match", "", props.build(), "9".getBytes()); + checkGet(Q1, true); // 4 checkGet(Q1, false); @@ -240,6 +245,46 @@ private void checkGet(String queue, boolean messageExpected) checkGet(Q2, false); } + @Test public void headersWithXRouting() throws Exception { + Map spec = new HashMap(); + spec.put("x-key-1", "value-1"); + spec.put("x-key-2", "value-2"); + spec.put("x-match", "all-with-x"); + channel.queueBind(Q1, "amq.match", "", spec); + spec.put("x-match", "any-with-x"); + channel.queueBind(Q2, "amq.match", "", spec); + + AMQP.BasicProperties.Builder props = new AMQP.BasicProperties.Builder(); + channel.basicPublish("amq.match", "", props.build(), "0".getBytes()); + + Map map = new HashMap(); + props.headers(map); + + map.clear(); + map.put("x-key-1", "value-1"); + channel.basicPublish("amq.match", "", props.build(), "1".getBytes()); + + map.clear(); + map.put("x-key-1", "value-1"); + map.put("x-key-2", "value-2"); + channel.basicPublish("amq.match", "", props.build(), "2".getBytes()); + + map.clear(); + map.put("x-key-1", "value-1"); + map.put("x-key-2", "value-2"); + map.put("x-key-3", "value-3"); + channel.basicPublish("amq.match", "", props.build(), "3".getBytes()); + + checkGet(Q1, true); // 2 + checkGet(Q1, true); // 3 + checkGet(Q1, false); + + checkGet(Q2, true); // 1 + checkGet(Q2, true); // 2 + checkGet(Q2, true); // 3 + checkGet(Q2, false); + } + @Test public void basicReturn() throws IOException { channel.addReturnListener(makeReturnListener()); returnCell = new BlockingCell(); From f5cf5cb0e6075b3bfc4005f89788a85d4f66118b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 28 Feb 2022 09:57:24 +0100 Subject: [PATCH 062/657] Add test condition to test x-match=all-with-x Broker version >= 3.10. References #725 (cherry picked from commit 0b7d8f0b778aa1bbd7eb13e517abf84b2782fafe) --- .../com/rabbitmq/client/test/TestUtils.java | 57 +++++++++++++++++++ .../functional/HeadersExchangeValidation.java | 13 +++-- .../client/test/functional/Routing.java | 13 ++++- 3 files changed, 76 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java index 0c0ea49a89..86605d71f9 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtils.java @@ -19,6 +19,11 @@ import com.rabbitmq.client.impl.NetworkConnection; import com.rabbitmq.client.impl.recovery.AutorecoveringConnection; import com.rabbitmq.tools.Host; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.Method; import java.util.List; import org.assertj.core.api.Assertions; import org.junit.AssumptionViolatedException; @@ -130,6 +135,10 @@ public static boolean isVersion38orLater(Connection connection) { return atLeastVersion("3.8.0", connection); } + public static boolean isVersion310orLater(Connection connection) { + return atLeastVersion("3.10.0", connection); + } + private static boolean atLeastVersion(String expectedVersion, Connection connection) { String currentVersion = null; try { @@ -408,4 +417,52 @@ protected DefaultTestSuite(Class klass, List runners) super(klass, runners); } } + + @Target({ElementType.METHOD}) + @Retention(RetentionPolicy.RUNTIME) + public @interface TestExecutionCondition { + + Class[] value(); + + } + + interface ExecutionCondition { + + void check(Description description) throws Exception; + + } + + public static class BrokerAtLeast310Condition implements ExecutionCondition { + + private static final String VERSION = "3.10.0"; + + @Override + public void check(Description description) throws Exception { + try (Connection c = TestUtils.connectionFactory().newConnection()) { + if (!TestUtils.atLeastVersion(VERSION, c)) { + throw new AssumptionViolatedException("Broker version < " + VERSION + ", skipping."); + } + } + } + } + + public static class ExecutionConditionRule implements TestRule { + + @Override + public Statement apply(Statement base, Description description) { + return new Statement() { + @Override + public void evaluate() throws Throwable { + Method testMethod = description.getTestClass().getDeclaredMethod(description.getMethodName()); + TestExecutionCondition conditionAnnotation = testMethod.getAnnotation( + TestExecutionCondition.class); + if (conditionAnnotation != null) { + conditionAnnotation.value()[0].getConstructor().newInstance() + .check(description); + } + base.evaluate(); + } + }; + } + } } diff --git a/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java b/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java index e62dd04d0b..c82ed749b6 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java +++ b/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,6 +17,7 @@ import static org.junit.Assert.fail; +import com.rabbitmq.client.test.TestUtils; import java.io.IOException; import java.util.HashMap; @@ -48,11 +49,13 @@ public class HeadersExchangeValidation extends BrokerTestCase { arguments.put("x-match", "any"); succeedBind(queue, arguments); - arguments.put("x-match", "all-with-x"); - succeedBind(queue, arguments); + if (TestUtils.isVersion310orLater(connection)) { + arguments.put("x-match", "all-with-x"); + succeedBind(queue, arguments); - arguments.put("x-match", "any-with-x"); - succeedBind(queue, arguments); + arguments.put("x-match", "any-with-x"); + succeedBind(queue, arguments); + } } private void failBind(String queue, HashMap arguments) { diff --git a/src/test/java/com/rabbitmq/client/test/functional/Routing.java b/src/test/java/com/rabbitmq/client/test/functional/Routing.java index 45161acddc..30a643a918 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Routing.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Routing.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -21,6 +21,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import com.rabbitmq.client.test.TestUtils.BrokerAtLeast310Condition; +import com.rabbitmq.client.test.TestUtils.ExecutionConditionRule; +import com.rabbitmq.client.test.TestUtils.TestExecutionCondition; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -28,6 +31,7 @@ import java.util.Map; import java.util.concurrent.TimeoutException; +import org.junit.Rule; import org.junit.Test; import com.rabbitmq.client.AMQP; @@ -36,10 +40,13 @@ import com.rabbitmq.client.ReturnListener; import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.utility.BlockingCell; +import org.junit.rules.TestRule; public class Routing extends BrokerTestCase { + @Rule public TestRule executionConditionRule = new ExecutionConditionRule(); + protected final String E = "MRDQ"; protected final String Q1 = "foo"; protected final String Q2 = "bar"; @@ -245,7 +252,9 @@ private void checkGet(String queue, boolean messageExpected) checkGet(Q2, false); } - @Test public void headersWithXRouting() throws Exception { + @Test + @TestExecutionCondition(BrokerAtLeast310Condition.class) + public void headersWithXRouting() throws Exception { Map spec = new HashMap(); spec.put("x-key-1", "value-1"); spec.put("x-key-2", "value-2"); From b8ecfaf96aa88e9643530dae8ecd9511134529f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 11 Mar 2022 11:38:17 +0100 Subject: [PATCH 063/657] Set -Dmaven.wagon.http.retryHandler.count=10 in .mvn/maven.config Trying to help download dependencing from CI. (cherry picked from commit 80440298e3179c28fcb1c4a398bd95b1858ce42b) --- .mvn/maven.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 .mvn/maven.config diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000000..f373d1de10 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dmaven.wagon.http.retryHandler.count=10 From c1735cafa0b7a4bae9547b5a7d8e5443f09b07ea Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 11 Mar 2022 18:50:23 +0400 Subject: [PATCH 064/657] Wording (cherry picked from commit 0c933cb2c659e014df60e07352f163ecbae1641a) Conflicts: src/main/java/com/rabbitmq/client/impl/AMQConnection.java --- src/main/java/com/rabbitmq/client/impl/AMQConnection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java index 2592345baa..61b7a678a9 100644 --- a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java +++ b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java @@ -750,8 +750,8 @@ private void readFrame(Frame frame) throws IOException { /** private API */ public void handleHeartbeatFailure() { - Exception ex = new MissedHeartbeatException("Heartbeat missing with heartbeat = " + - _heartbeat + " seconds"); + Exception ex = new MissedHeartbeatException("Detected missed server heartbeats, heartbeat interval: " + + _heartbeat + " seconds, RabbitMQ node hostname: " + this.getHostAddress()); try { _exceptionHandler.handleUnexpectedConnectionDriverException(this, ex); shutdown(null, false, ex, true); From 659c21fdcc3e7d5f16e84468c6a184beaac8da16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 30 Mar 2022 15:15:13 +0200 Subject: [PATCH 065/657] Use available processor number for default thread count in consumer work service The current value is available processors times 2, which may be overkill nowadays. The commit also allows using the rabbitmq.amqp.client.availableProcessors system property value, which is convenient as it's configuration-based (no code changes required). Fixes #730 (cherry picked from commit 49c5e2cf5c55bf0a775550004a7e168eeea6d413) --- .../client/impl/ConsumerWorkService.java | 15 ++++++--- .../java/com/rabbitmq/client/impl/Utils.java | 31 +++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/rabbitmq/client/impl/Utils.java diff --git a/src/main/java/com/rabbitmq/client/impl/ConsumerWorkService.java b/src/main/java/com/rabbitmq/client/impl/ConsumerWorkService.java index b3810aae2f..f607e816e3 100644 --- a/src/main/java/com/rabbitmq/client/impl/ConsumerWorkService.java +++ b/src/main/java/com/rabbitmq/client/impl/ConsumerWorkService.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -22,10 +22,13 @@ import java.util.concurrent.ThreadFactory; import com.rabbitmq.client.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; final public class ConsumerWorkService { + private static final Logger LOGGER = LoggerFactory.getLogger(ConsumerWorkService.class); private static final int MAX_RUNNABLE_BLOCK_SIZE = 16; - private static final int DEFAULT_NUM_THREADS = Runtime.getRuntime().availableProcessors() * 2; + private static final int DEFAULT_NUM_THREADS = Math.max(1, Utils.availableProcessors()); private final ExecutorService executor; private final boolean privateExecutor; private final WorkPool workPool; @@ -33,8 +36,12 @@ final public class ConsumerWorkService { public ConsumerWorkService(ExecutorService executor, ThreadFactory threadFactory, int queueingTimeout, int shutdownTimeout) { this.privateExecutor = (executor == null); - this.executor = (executor == null) ? Executors.newFixedThreadPool(DEFAULT_NUM_THREADS, threadFactory) - : executor; + if (executor == null) { + LOGGER.debug("Creating executor service with {} thread(s) for consumer work service", DEFAULT_NUM_THREADS); + this.executor = Executors.newFixedThreadPool(DEFAULT_NUM_THREADS, threadFactory); + } else { + this.executor = executor; + } this.workPool = new WorkPool<>(queueingTimeout); this.shutdownTimeout = shutdownTimeout; } diff --git a/src/main/java/com/rabbitmq/client/impl/Utils.java b/src/main/java/com/rabbitmq/client/impl/Utils.java new file mode 100644 index 0000000000..d3e3412ee4 --- /dev/null +++ b/src/main/java/com/rabbitmq/client/impl/Utils.java @@ -0,0 +1,31 @@ +// Copyright (c) 2022 VMware, Inc. or its affiliates. All rights reserved. +// +// This software, the RabbitMQ Java client library, is triple-licensed under the +// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 +// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see +// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, +// please see LICENSE-APACHE2. +// +// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, +// either express or implied. See the LICENSE file for specific language governing +// rights and limitations of this software. +// +// If you have any questions regarding licensing, please contact us at +// info@rabbitmq.com. + +package com.rabbitmq.client.impl; + +final class Utils { + + private static final int AVAILABLE_PROCESSORS = + Integer.parseInt( + System.getProperty( + "rabbitmq.amqp.client.availableProcessors", + String.valueOf(Runtime.getRuntime().availableProcessors()))); + + static int availableProcessors() { + return AVAILABLE_PROCESSORS; + } + + private Utils() {} +} From e2743af9d8a34bd87501a29076f5499a1ea1eb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 8 Apr 2022 14:44:28 +0200 Subject: [PATCH 066/657] Bump optional dependencies References #717 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 78534eb35b..a0bb91a56e 100644 --- a/pom.xml +++ b/pom.xml @@ -55,9 +55,9 @@ UTF-8 1.7.36 - 4.2.8 - 1.8.2 - 2.13.1 + 4.2.9 + 1.8.4 + 2.13.2.2 1.2.10 4.13.2 4.3.1 From 7d5099ed4b8327346c5e6d654e1d6c1211b342b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 8 Apr 2022 14:46:01 +0200 Subject: [PATCH 067/657] Bump test dependencies --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a0bb91a56e..7c08b5647e 100644 --- a/pom.xml +++ b/pom.xml @@ -58,11 +58,11 @@ 4.2.9 1.8.4 2.13.2.2 - 1.2.10 + 1.2.11 4.13.2 - 4.3.1 + 4.4.0 3.22.0 - 9.4.45.v20220203 + 9.4.46.v20220331 1.70 0.10 From 96f5b0e23433a1620505cb8ba655940bd8f99a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 8 Apr 2022 15:04:34 +0200 Subject: [PATCH 068/657] Bump plugins --- pom.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 7c08b5647e..b9b63f8ca3 100644 --- a/pom.xml +++ b/pom.xml @@ -66,24 +66,24 @@ 1.70 0.10 - 3.2.0 + 3.3.2 2.5.3 - 2.3 - 3.1.0 - 3.0.1 + 2.10.0 + 3.2.0 + 3.2.1 2.1.1 - 2.4.8 + 2.4.21 1.5 - 1.12 - 3.8.1 + 3.3.0 + 3.10.1 2.22.2 2.22.2 - 1.6 - 3.0.2 - 3.2.0 + 3.0.1 + 3.2.2 + 5.1.4 0.0.6 - 1.6.8 - 1.8 + 1.6.12 + 1.11 1.3 - javadoc-no-module-dir-java-11 - - [11,) - - - --no-module-directories - - - + + org.junit.jupiter + junit-jupiter-params test @@ -768,6 +778,18 @@ + + + + + org.junit + junit-bom + ${junit.jupiter.version} + pom + import + + + diff --git a/src/test/java/com/rabbitmq/client/AbstractJsonRpcTest.java b/src/test/java/com/rabbitmq/client/AbstractJsonRpcTest.java index 0b6bc20a68..ec9fbd2f39 100644 --- a/src/test/java/com/rabbitmq/client/AbstractJsonRpcTest.java +++ b/src/test/java/com/rabbitmq/client/AbstractJsonRpcTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -19,8 +19,8 @@ import com.rabbitmq.tools.jsonrpc.JsonRpcClient; import com.rabbitmq.tools.jsonrpc.JsonRpcMapper; import com.rabbitmq.tools.jsonrpc.JsonRpcServer; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.util.Date; @@ -35,7 +35,7 @@ public abstract class AbstractJsonRpcTest { abstract JsonRpcMapper createMapper(); - @Before + @BeforeEach public void init() throws Exception { clientConnection = TestUtils.connectionFactory().newConnection(); clientChannel = clientConnection.createChannel(); @@ -57,7 +57,7 @@ public void init() throws Exception { service = client.createProxy(RpcService.class); } - @After + @AfterEach public void tearDown() throws Exception { if (server != null) { server.terminateMainloop(); diff --git a/src/test/java/com/rabbitmq/client/AmqpClientTestExtension.java b/src/test/java/com/rabbitmq/client/AmqpClientTestExtension.java new file mode 100644 index 0000000000..07e27a6838 --- /dev/null +++ b/src/test/java/com/rabbitmq/client/AmqpClientTestExtension.java @@ -0,0 +1,237 @@ +// Copyright (c) 2023 VMware, Inc. or its affiliates. All rights reserved. +// +// This software, the RabbitMQ Java client library, is triple-licensed under the +// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 +// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see +// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, +// please see LICENSE-APACHE2. +// +// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, +// either express or implied. See the LICENSE file for specific language governing +// rights and limitations of this software. +// +// If you have any questions regarding licensing, please contact us at +// info@rabbitmq.com. + +package com.rabbitmq.client; + +import static org.junit.jupiter.api.extension.ConditionEvaluationResult.disabled; +import static org.junit.jupiter.api.extension.ConditionEvaluationResult.enabled; + +import com.rabbitmq.client.test.TestUtils; +import com.rabbitmq.client.test.functional.FunctionalTestSuite; +import com.rabbitmq.client.test.server.HaTestSuite; +import com.rabbitmq.client.test.server.LastHaTestSuite; +import com.rabbitmq.client.test.server.ServerTestSuite; +import com.rabbitmq.client.test.ssl.SslTestSuite; +import com.rabbitmq.tools.Host; +import java.io.File; +import java.lang.reflect.Field; +import java.net.Socket; +import java.util.Properties; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ExtensionContext.Namespace; +import org.junit.jupiter.api.extension.ExtensionContext.Store; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AmqpClientTestExtension implements ExecutionCondition, BeforeAllCallback, + BeforeEachCallback, + AfterEachCallback { + + private static final Logger LOGGER = LoggerFactory.getLogger(AmqpClientTestExtension.class); + private static final Namespace NAMESPACE = Namespace.create(AmqpClientTestExtension.class); + + static { + Properties TESTS_PROPS = new Properties(System.getProperties()); + String make = System.getenv("MAKE"); + if (make != null) { + TESTS_PROPS.setProperty("make.bin", make); + } + try { + TESTS_PROPS.load(Host.class.getClassLoader().getResourceAsStream("config.properties")); + } catch (Exception e) { + System.out.println( + "\"build.properties\" or \"config.properties\" not found" + + " in classpath. Please copy \"build.properties\" and" + + " \"config.properties\" into src/test/resources. Ignore" + + " this message if running with ant."); + } finally { + System.setProperties(TESTS_PROPS); + } + } + + private static void maybeSetHaFieldValue(ExtensionContext context, boolean value) { + if (context.getTestClass().isPresent() && context.getTestInstance().isPresent()) { + try { + Field haField = findField(context.getTestClass().get(), "ha"); + if (haField != null) { + haField.setAccessible(true); + haField.set(context.getTestInstance().get(), value); + } + } catch (Exception e) { + // OK + } + } + } + + private static Field findField(Class clazz, String fieldName) { + try { + return clazz.getDeclaredField(fieldName); + } catch (NoSuchFieldException e) { + if (clazz.getSuperclass() != null) { + return findField(clazz.getSuperclass(), fieldName); + } + } + return null; + } + + private static boolean isFunctionalSuite(ExtensionContext context) { + return isTestSuite(context, FunctionalTestSuite.class); + } + + private static boolean isSslSuite(ExtensionContext context) { + return isTestSuite(context, SslTestSuite.class); + } + + private static boolean isServerSuite(ExtensionContext context) { + return isTestSuite(context, ServerTestSuite.class); + } + + private static boolean isHaSuite(ExtensionContext context) { + return isTestSuite(context, HaTestSuite.class); + } + + private static boolean isLastHaSuite(ExtensionContext context) { + return isTestSuite(context, LastHaTestSuite.class); + } + + private static boolean isTestSuite(ExtensionContext context, Class clazz) { + return context.getUniqueId().contains(clazz.getName()); + } + + public static boolean requiredProperties() { + /* Path to rabbitmqctl. */ + String rabbitmqctl = Host.rabbitmqctlCommand(); + if (rabbitmqctl == null) { + System.err.println( + "rabbitmqctl required; please set \"rabbitmqctl.bin\" system" + + " property"); + return false; + } + + return true; + } + + public static boolean isSSLAvailable() { + String sslClientCertsDir = System.getProperty("test-client-cert.path"); + String hostname = System.getProperty("broker.hostname"); + String port = System.getProperty("broker.sslport"); + if (sslClientCertsDir == null || hostname == null || port == null) { + return false; + } + + // If certificate is present and some server is listening on port 5671 + if (new File(sslClientCertsDir).exists() && + checkServerListening(hostname, Integer.parseInt(port))) { + return true; + } else { + return false; + } + } + + private static boolean checkServerListening(String host, int port) { + Socket s = null; + try { + s = new Socket(host, port); + return true; + } catch (Exception e) { + return false; + } finally { + if (s != null) { + try { + s.close(); + } catch (Exception e) { + } + } + } + } + + private static Store store(ExtensionContext context) { + return context.getRoot().getStore(NAMESPACE); + } + + private static boolean hasHaSuiteStarted(ExtensionContext context) { + return "true".equals(store(context).get("ha")); + } + + private static void markHaSuiteStarted(ExtensionContext context) { + store(context).put("ha", "true"); + } + + private static void markHaSuiteFinished(ExtensionContext context) { + store(context).remove("ha"); + } + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + // HA test suite must be checked first because it contains other test suites + if (isHaSuite(context)) { + return requiredProperties() ? enabled("Required properties available") + : disabled("Required properties not available"); + } else if (isServerSuite(context)) { + return requiredProperties() ? enabled("Required properties available") + : disabled("Required properties not available"); + } else if (isFunctionalSuite(context)) { + return requiredProperties() ? enabled("Required properties available") + : disabled("Required properties not available"); + } else if (isSslSuite(context)) { + return requiredProperties() && isSSLAvailable() ? enabled( + "Required properties and TLS available") + : disabled("Required properties or TLS not available"); + } + return enabled("ok"); + } + + @Override + public void beforeAll(ExtensionContext context) throws Exception { + if (isHaSuite(context) && !hasHaSuiteStarted(context)) { + LOGGER.info("Starting HA test suite"); + Host.rabbitmqctl("set_policy HA '.*' '{\"ha-mode\":\"all\"}'"); + markHaSuiteStarted(context); + } + if (isLastHaSuite(context)) { + LOGGER.info("HA suite done, clearing HA state"); + Host.rabbitmqctl("clear_policy HA"); + markHaSuiteFinished(context); + } + } + + @Override + public void beforeEach(ExtensionContext context) { + LOGGER.info( + "Starting test: {}.{} (nio? {}, HA? {})", + context.getTestClass().get().getSimpleName(), context.getTestMethod().get().getName(), + TestUtils.USE_NIO, + hasHaSuiteStarted(context) + ); + if (isHaSuite(context)) { + maybeSetHaFieldValue(context, true); + } + } + + @Override + public void afterEach(ExtensionContext context) { + LOGGER.info("Test finished: {}.{}", + context.getTestClass().get().getSimpleName(), context.getTestMethod().get().getName()); + if (isHaSuite(context)) { + maybeSetHaFieldValue(context, false); + } + } + +} diff --git a/src/test/java/com/rabbitmq/client/JacksonJsonRpcTest.java b/src/test/java/com/rabbitmq/client/JacksonJsonRpcTest.java index e7a57021d4..f926061f94 100644 --- a/src/test/java/com/rabbitmq/client/JacksonJsonRpcTest.java +++ b/src/test/java/com/rabbitmq/client/JacksonJsonRpcTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -18,16 +18,16 @@ import com.rabbitmq.tools.jsonrpc.JacksonJsonRpcMapper; import com.rabbitmq.tools.jsonrpc.JsonRpcException; import com.rabbitmq.tools.jsonrpc.JsonRpcMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.UndeclaredThrowableException; import java.util.Calendar; import java.util.Date; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class JacksonJsonRpcTest extends AbstractJsonRpcTest { diff --git a/src/test/java/com/rabbitmq/client/QueueingConsumer.java b/src/test/java/com/rabbitmq/client/QueueingConsumer.java index 33a033008f..9ecddaa67b 100644 --- a/src/test/java/com/rabbitmq/client/QueueingConsumer.java +++ b/src/test/java/com/rabbitmq/client/QueueingConsumer.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/impl/AMQConnectionRefreshCredentialsTest.java b/src/test/java/com/rabbitmq/client/impl/AMQConnectionRefreshCredentialsTest.java index 989ee69ffa..a5fce8a561 100644 --- a/src/test/java/com/rabbitmq/client/impl/AMQConnectionRefreshCredentialsTest.java +++ b/src/test/java/com/rabbitmq/client/impl/AMQConnectionRefreshCredentialsTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -18,12 +18,13 @@ import com.rabbitmq.client.Method; import com.rabbitmq.client.*; import com.rabbitmq.client.test.TestUtils; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; +import com.rabbitmq.client.test.TestUtils.BrokerVersion; +import com.rabbitmq.client.test.TestUtils.BrokerVersionAtLeast; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.MockitoAnnotations; import java.io.IOException; import java.time.Duration; @@ -38,18 +39,27 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; -@RunWith(MockitoJUnitRunner.class) +@BrokerVersionAtLeast(BrokerVersion.RABBITMQ_3_8) public class AMQConnectionRefreshCredentialsTest { - @ClassRule - public static TestRule brokerVersionTestRule = TestUtils.atLeast38(); - @Mock CredentialsProvider credentialsProvider; @Mock CredentialsRefreshService refreshService; + AutoCloseable mocks; + + @BeforeEach + void init() { + mocks = MockitoAnnotations.openMocks(this); + } + + @AfterEach + void tearDown() throws Exception { + mocks.close(); + } + private static ConnectionFactory connectionFactoryThatSendsGarbageAfterUpdateSecret() { ConnectionFactory cf = new ConnectionFactory() { @Override diff --git a/src/test/java/com/rabbitmq/client/impl/DefaultCredentialsRefreshServiceTest.java b/src/test/java/com/rabbitmq/client/impl/DefaultCredentialsRefreshServiceTest.java index 3bd0cca640..2ad3681c52 100644 --- a/src/test/java/com/rabbitmq/client/impl/DefaultCredentialsRefreshServiceTest.java +++ b/src/test/java/com/rabbitmq/client/impl/DefaultCredentialsRefreshServiceTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,10 +15,11 @@ package com.rabbitmq.client.impl; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; @@ -38,7 +39,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; -@RunWith(MockitoJUnitRunner.class) public class DefaultCredentialsRefreshServiceTest { @Mock @@ -49,11 +49,19 @@ public class DefaultCredentialsRefreshServiceTest { DefaultCredentialsRefreshService refreshService; - @After - public void tearDown() { + AutoCloseable mocks; + + @BeforeEach + void init() { + this.mocks = MockitoAnnotations.openMocks(this); + } + + @AfterEach + public void tearDown() throws Exception { if (refreshService != null) { refreshService.close(); } + mocks.close(); } @Test diff --git a/src/test/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProviderTest.java b/src/test/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProviderTest.java index 0a08125d8f..33614d78bd 100644 --- a/src/test/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProviderTest.java +++ b/src/test/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProviderTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -27,9 +27,9 @@ import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManagerFactory; @@ -62,7 +62,7 @@ static boolean isJava13() { return javaVersion != null && javaVersion.startsWith("13."); } - @Before + @BeforeEach public void init() { if (isJava13()) { // for Java 13.0.7, see https://github.com/bcgit/bc-java/issues/941 @@ -70,7 +70,7 @@ public void init() { } } - @After + @AfterEach public void tearDown() throws Exception { if (isJava13()) { System.setProperty("keystore.pkcs12.keyProtectionAlgorithm", ""); diff --git a/src/test/java/com/rabbitmq/client/impl/RefreshProtectedCredentialsProviderTest.java b/src/test/java/com/rabbitmq/client/impl/RefreshProtectedCredentialsProviderTest.java index a65ed3b6ca..dfed27341d 100644 --- a/src/test/java/com/rabbitmq/client/impl/RefreshProtectedCredentialsProviderTest.java +++ b/src/test/java/com/rabbitmq/client/impl/RefreshProtectedCredentialsProviderTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,7 @@ package com.rabbitmq.client.impl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.Set; diff --git a/src/test/java/com/rabbitmq/client/impl/ValueWriterTest.java b/src/test/java/com/rabbitmq/client/impl/ValueWriterTest.java index ea0d94c683..54a9acfe55 100644 --- a/src/test/java/com/rabbitmq/client/impl/ValueWriterTest.java +++ b/src/test/java/com/rabbitmq/client/impl/ValueWriterTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,49 +15,43 @@ package com.rabbitmq.client.impl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.*; import java.math.BigDecimal; import java.math.BigInteger; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; public class ValueWriterTest { - @Test(expected = IllegalArgumentException.class) - public void writingOverlyLargeBigDecimalShouldFail() - throws IOException { - - OutputStream outputStream = new OutputStream() { - @Override - public void write(int b) { - } - }; - - DataOutputStream dataOutputStream = new DataOutputStream(outputStream); - - ValueWriter valueWriter = new ValueWriter(dataOutputStream); - - valueWriter.writeFieldValue(new BigDecimal(Integer.MAX_VALUE).add(new BigDecimal(1))); - + @Test + public void writingOverlyLargeBigDecimalShouldFail() { + assertThatThrownBy(() -> { + OutputStream outputStream = new OutputStream() { + @Override + public void write(int b) { + } + }; + DataOutputStream dataOutputStream = new DataOutputStream(outputStream); + ValueWriter valueWriter = new ValueWriter(dataOutputStream); + valueWriter.writeFieldValue(new BigDecimal(Integer.MAX_VALUE).add(new BigDecimal(1))); + }).isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) - public void writingOverlyLargeScaleInBigDecimalShouldFail() - throws IOException { - - OutputStream outputStream = new OutputStream() { - @Override - public void write(int b) { - } - }; - - DataOutputStream dataOutputStream = new DataOutputStream(outputStream); - - ValueWriter valueWriter = new ValueWriter(dataOutputStream); - - valueWriter.writeFieldValue(new BigDecimal(BigInteger.ONE, 500)); + @Test + public void writingOverlyLargeScaleInBigDecimalShouldFail() { + assertThatThrownBy(() -> { + OutputStream outputStream = new OutputStream() { + @Override + public void write(int b) { + } + }; + DataOutputStream dataOutputStream = new DataOutputStream(outputStream); + ValueWriter valueWriter = new ValueWriter(dataOutputStream); + valueWriter.writeFieldValue(new BigDecimal(BigInteger.ONE, 500)); + }).isInstanceOf(IllegalArgumentException.class); } @Test diff --git a/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java b/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java index 4cc054ca88..54a49da485 100644 --- a/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java +++ b/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,15 +15,15 @@ package com.rabbitmq.client.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link WorkPool} @@ -34,9 +34,8 @@ public class WorkPoolTests { /** * Test unknown key tolerated silently - * @throws Exception untested */ - @Test public void unknownKey() throws Exception{ + @Test public void unknownKey() { assertFalse(this.pool.addWorkItem("test", new Object())); } @@ -58,16 +57,15 @@ public class WorkPoolTests { assertEquals(1, workList.size()); assertEquals(one, workList.get(0)); - assertTrue("Should be made ready", this.pool.finishWorkBlock(key)); + assertTrue(this.pool.finishWorkBlock(key), "Should be made ready"); workList.clear(); key = this.pool.nextWorkBlock(workList, 1); - assertEquals("Work client key wrong", "test", key); - assertEquals("Wrong work delivered", two, workList.get(0)); - - assertFalse("Should not be made ready after this.", this.pool.finishWorkBlock(key)); + assertEquals("test", key, "Work client key wrong"); + assertEquals(two, workList.get(0), "Wrong work delivered"); - assertNull("Shouldn't be more work", this.pool.nextWorkBlock(workList, 1)); + assertFalse(this.pool.finishWorkBlock(key), "Should not be made ready after this."); + assertNull(this.pool.nextWorkBlock(workList, 1), "Shouldn't be more work"); } /** diff --git a/src/test/java/com/rabbitmq/client/test/AMQBuilderApiTest.java b/src/test/java/com/rabbitmq/client/test/AMQBuilderApiTest.java index 46241c38b3..a4b54c9fa7 100644 --- a/src/test/java/com/rabbitmq/client/test/AMQBuilderApiTest.java +++ b/src/test/java/com/rabbitmq/client/test/AMQBuilderApiTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -14,12 +14,12 @@ // info@rabbitmq.com. package com.rabbitmq.client.test; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Method; @@ -38,7 +38,7 @@ public class AMQBuilderApiTest extends BrokerTestCase .build() ).getMethod(); - assertTrue("Channel should still be open.", channel.isOpen()); + assertTrue(channel.isOpen(), "Channel should still be open."); assertTrue(retVal instanceof AMQP.Exchange.DeclareOk); retVal = channel.rpc(new AMQP.Exchange.Delete.Builder() @@ -46,7 +46,7 @@ public class AMQBuilderApiTest extends BrokerTestCase .build() ).getMethod(); - assertTrue("Channel should still be open.", channel.isOpen()); + assertTrue(channel.isOpen(), "Channel should still be open."); assertTrue(retVal instanceof AMQP.Exchange.DeleteOk); } @@ -59,14 +59,14 @@ public class AMQBuilderApiTest extends BrokerTestCase .build() ); - assertTrue("Channel should still be open.", channel.isOpen()); + assertTrue(channel.isOpen(), "Channel should still be open."); channel.asyncRpc(new AMQP.Exchange.Delete.Builder() .exchange(XCHG_NAME) .build() ); - assertTrue("Channel should still be open.", channel.isOpen()); + assertTrue(channel.isOpen(), "Channel should still be open."); } @Test public void illFormedBuilder() diff --git a/src/test/java/com/rabbitmq/client/test/AMQChannelTest.java b/src/test/java/com/rabbitmq/client/test/AMQChannelTest.java index 0ea1a89c60..091e1b14c2 100644 --- a/src/test/java/com/rabbitmq/client/test/AMQChannelTest.java +++ b/src/test/java/com/rabbitmq/client/test/AMQChannelTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -23,9 +23,9 @@ import com.rabbitmq.client.impl.AMQCommand; import com.rabbitmq.client.impl.AMQConnection; import com.rabbitmq.client.impl.AMQImpl; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.concurrent.Callable; @@ -41,11 +41,11 @@ public class AMQChannelTest { ScheduledExecutorService scheduler; - @Before public void init() { + @BeforeEach public void init() { scheduler = Executors.newSingleThreadScheduledExecutor(); } - @After public void tearDown() { + @AfterEach public void tearDown() { scheduler.shutdownNow(); } diff --git a/src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java b/src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java index e36631de7c..de50c74542 100644 --- a/src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java +++ b/src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -20,9 +20,9 @@ import com.rabbitmq.client.impl.ConnectionParams; import com.rabbitmq.client.impl.Frame; import com.rabbitmq.client.impl.FrameHandler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.InetAddress; @@ -36,8 +36,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * Test suite for AMQConnection. @@ -51,14 +51,14 @@ public class AMQConnectionTest { private ConnectionFactory factory; private MyExceptionHandler exceptionHandler; - @Before public void setUp() { + @BeforeEach public void setUp() { _mockFrameHandler = new MockFrameHandler(); factory = TestUtils.connectionFactory(); exceptionHandler = new MyExceptionHandler(); factory.setExceptionHandler(exceptionHandler); } - @After public void tearDown() { + @AfterEach public void tearDown() { factory = null; _mockFrameHandler = null; } @@ -159,8 +159,8 @@ public class AMQConnectionTest { } assertEquals(1, this._mockFrameHandler.countHeadersSent()); List exceptionList = exceptionHandler.getHandledExceptions(); - assertEquals("Only one exception expected", 1, exceptionList.size()); - assertEquals("Wrong type of exception returned.", SocketTimeoutException.class, exceptionList.get(0).getClass()); + assertEquals(1, exceptionList.size(), "Only one exception expected"); + assertEquals(SocketTimeoutException.class, exceptionList.get(0).getClass(), "Wrong type of exception returned."); } @Test public void clientProvidedConnectionName() throws IOException, TimeoutException { diff --git a/src/test/java/com/rabbitmq/client/test/AbstractRMQTestSuite.java b/src/test/java/com/rabbitmq/client/test/AbstractRMQTestSuite.java deleted file mode 100644 index 922b6b9931..0000000000 --- a/src/test/java/com/rabbitmq/client/test/AbstractRMQTestSuite.java +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. -// -// This software, the RabbitMQ Java client library, is triple-licensed under the -// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 -// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see -// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, -// please see LICENSE-APACHE2. -// -// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, -// either express or implied. See the LICENSE file for specific language governing -// rights and limitations of this software. -// -// If you have any questions regarding licensing, please contact us at -// info@rabbitmq.com. - -package com.rabbitmq.client.test; - -import com.rabbitmq.tools.Host; - -import java.io.File; -import java.io.IOException; -import java.net.Socket; -import java.util.Properties; - -public abstract class AbstractRMQTestSuite { - - static { - Properties TESTS_PROPS = new Properties(System.getProperties()); - String make = System.getenv("MAKE"); - if (make != null) - TESTS_PROPS.setProperty("make.bin", make); - try { - TESTS_PROPS.load(Host.class.getClassLoader().getResourceAsStream("config.properties")); - } catch (Exception e) { - System.out.println( - "\"build.properties\" or \"config.properties\" not found" + - " in classpath. Please copy \"build.properties\" and" + - " \"config.properties\" into src/test/resources. Ignore" + - " this message if running with ant."); - } finally { - System.setProperties(TESTS_PROPS); - } - } - - public static boolean requiredProperties() { - /* Path to rabbitmqctl. */ - String rabbitmqctl = Host.rabbitmqctlCommand(); - if (rabbitmqctl == null) { - System.err.println( - "rabbitmqctl required; please set \"rabbitmqctl.bin\" system" + - " property"); - return false; - } - - return true; - } - - public static boolean isSSLAvailable() { - String sslClientCertsDir = System.getProperty("test-client-cert.path"); - String hostname = System.getProperty("broker.hostname"); - String port = System.getProperty("broker.sslport"); - if (sslClientCertsDir == null || hostname == null || port == null) - return false; - - // If certificate is present and some server is listening on port 5671 - if (new File(sslClientCertsDir).exists() && - checkServerListening(hostname, Integer.parseInt(port))) { - return true; - } else - return false; - } - - private static boolean checkServerListening(String host, int port) { - Socket s = null; - try { - s = new Socket(host, port); - return true; - } catch (Exception e) { - return false; - } finally { - if (s != null) - try { - s.close(); - } catch (Exception e) { - } - } - } -} diff --git a/src/test/java/com/rabbitmq/client/test/AddressTest.java b/src/test/java/com/rabbitmq/client/test/AddressTest.java index 631dc5d986..bc9e860e8b 100644 --- a/src/test/java/com/rabbitmq/client/test/AddressTest.java +++ b/src/test/java/com/rabbitmq/client/test/AddressTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,11 +16,12 @@ package com.rabbitmq.client.test; import com.rabbitmq.client.Address; -import org.junit.Test; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @@ -73,10 +74,11 @@ public class AddressTest { assertEquals(addr("[::1]", 5673), Address.parseAddress("[::1]:5673")); } - @Test(expected = IllegalArgumentException.class) + @Test public void parseUnquotedIPv6() { // using a non-quoted IPv6 addresses with a port - Address.parseAddress("::1:5673"); + Assertions.assertThatThrownBy(() -> Address.parseAddress("::1:5673")) + .isInstanceOf(IllegalArgumentException.class); } private Address addr(String addr) { diff --git a/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java b/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java index d5be86e4ee..f81ee0ea5c 100644 --- a/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java +++ b/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,8 +15,8 @@ package com.rabbitmq.client.test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.net.URISyntaxException; import java.security.KeyManagementException; @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.ConnectionFactory; diff --git a/src/test/java/com/rabbitmq/client/test/BlockingCellTest.java b/src/test/java/com/rabbitmq/client/test/BlockingCellTest.java index b5c7e9a3b0..03334570a6 100644 --- a/src/test/java/com/rabbitmq/client/test/BlockingCellTest.java +++ b/src/test/java/com/rabbitmq/client/test/BlockingCellTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,12 +17,12 @@ package com.rabbitmq.client.test; import com.rabbitmq.utility.BlockingCell; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BlockingCellTest { diff --git a/src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java b/src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java index 0ea3a02793..c0be492ae7 100644 --- a/src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java +++ b/src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -23,9 +23,9 @@ import com.rabbitmq.client.impl.AMQImpl.Basic.Publish; import com.rabbitmq.client.impl.Frame; import com.rabbitmq.client.impl.FrameHandler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.InetAddress; @@ -35,19 +35,19 @@ import java.util.List; import java.util.concurrent.Executors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BrokenFramesTest { private MyFrameHandler myFrameHandler; private ConnectionFactory factory; - @Before public void setUp() { + @BeforeEach public void setUp() { myFrameHandler = new MyFrameHandler(); factory = TestUtils.connectionFactory(); } - @After public void tearDown() { + @AfterEach public void tearDown() { factory = null; myFrameHandler = null; } diff --git a/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java b/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java index 871a157b6b..46763e78cc 100644 --- a/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java +++ b/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java @@ -17,46 +17,24 @@ import com.rabbitmq.client.*; import com.rabbitmq.client.impl.nio.NioParams; -import com.rabbitmq.client.test.TestUtils.TestDescription; import com.rabbitmq.tools.Host; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TestRule; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.TestInfo; import java.io.IOException; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.*; -import static org.junit.Assume.*; +import static org.junit.jupiter.api.Assertions.*; public class BrokerTestCase { - @Rule - public TestDescription testDescription = new TestDescription(); + private boolean ha = false; - private static final Logger LOGGER = LoggerFactory.getLogger(BrokerTestCase.class); - - @Rule - public TestRule watcher = new TestWatcher() { - protected void starting(Description description) { - LOGGER.info( - "Starting test: {}.{} (nio? {})", - description.getTestClass().getSimpleName(), description.getMethodName(), TestUtils.USE_NIO - ); - } - - @Override - protected void finished(Description description) { - LOGGER.info("Test finished: {}.{}", description.getTestClass().getSimpleName(), description.getMethodName()); - } - }; + protected volatile TestInfo testInfo; protected ConnectionFactory connectionFactory = newConnectionFactory(); @@ -80,16 +58,19 @@ protected boolean isAutomaticRecoveryEnabled() { protected Connection connection; protected Channel channel; - @Before public void setUp() - throws IOException, TimeoutException { - assumeTrue(shouldRun()); + @BeforeEach + public void setUp(TestInfo testInfo) throws IOException, TimeoutException { + + + Assumptions.assumeTrue(shouldRun()); + this.testInfo = testInfo; openConnection(); openChannel(); createResources(); } - @After public void tearDown() + @AfterEach public void tearDown(TestInfo testInfo) throws IOException, TimeoutException { if(shouldRun()) { closeChannel(); @@ -135,9 +116,9 @@ protected void releaseResources() protected void restart() throws IOException, TimeoutException { - tearDown(); + tearDown(this.testInfo); bareRestart(); - setUp(); + setUp(this.testInfo); } protected void bareRestart() @@ -342,13 +323,13 @@ protected void unblock() throws IOException, InterruptedException { } protected String generateQueueName() { - return name("queue", this.testDescription.getDescription().getTestClass(), - this.testDescription.getDescription().getMethodName()); + return name("queue", this.testInfo.getTestClass().get(), + this.testInfo.getTestMethod().get().getName()); } protected String generateExchangeName() { - return name("exchange", this.testDescription.getDescription().getTestClass(), - this.testDescription.getDescription().getMethodName()); + return name("exchange", this.testInfo.getTestClass().get(), + this.testInfo.getTestMethod().get().getName()); } private static String name(String prefix, Class testClass, String testMethodName) { @@ -358,6 +339,8 @@ private static String name(String prefix, Class testClass, String testMethodN prefix, testClass.getSimpleName(), testMethodName, uuid.substring(uuid.length() / 2)); } - + protected boolean ha() { + return this.ha; + } } diff --git a/src/test/java/com/rabbitmq/client/test/Bug20004Test.java b/src/test/java/com/rabbitmq/client/test/Bug20004Test.java index d14e1d3e74..a62598165b 100644 --- a/src/test/java/com/rabbitmq/client/test/Bug20004Test.java +++ b/src/test/java/com/rabbitmq/client/test/Bug20004Test.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,13 +15,13 @@ package com.rabbitmq.client.test; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for bug 20004 - deadlock through internal synchronization on the channel object. This is @@ -62,8 +62,8 @@ public void bug20004() throws InterruptedException { boolean completed = completedLatch.await(5, TimeUnit.SECONDS); - assertTrue("Deadlock detected?", completed); - assertNull("queueDeclare threw an exception", caughtException); - assertTrue("unknown sequence of events", created); + assertTrue(completed, "Deadlock detected?"); + assertNull(caughtException, "queueDeclare threw an exception"); + assertTrue(created, "unknown sequence of events"); } } diff --git a/src/test/java/com/rabbitmq/client/test/ChannelAsyncCompletableFutureTest.java b/src/test/java/com/rabbitmq/client/test/ChannelAsyncCompletableFutureTest.java index a871d49455..b3e5592dd4 100644 --- a/src/test/java/com/rabbitmq/client/test/ChannelAsyncCompletableFutureTest.java +++ b/src/test/java/com/rabbitmq/client/test/ChannelAsyncCompletableFutureTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2017-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -19,15 +19,15 @@ import com.rabbitmq.client.DefaultConsumer; import com.rabbitmq.client.Envelope; import com.rabbitmq.client.impl.AMQImpl; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.UUID; import java.util.concurrent.*; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ChannelAsyncCompletableFutureTest extends BrokerTestCase { diff --git a/src/test/java/com/rabbitmq/client/test/ChannelNTest.java b/src/test/java/com/rabbitmq/client/test/ChannelNTest.java index 1568881016..c615c3bfe0 100644 --- a/src/test/java/com/rabbitmq/client/test/ChannelNTest.java +++ b/src/test/java/com/rabbitmq/client/test/ChannelNTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,9 +17,9 @@ import com.rabbitmq.client.Method; import com.rabbitmq.client.impl.*; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.io.IOException; @@ -36,13 +36,13 @@ public class ChannelNTest { ConsumerWorkService consumerWorkService; ExecutorService executorService; - @Before + @BeforeEach public void init() { executorService = Executors.newSingleThreadExecutor(); consumerWorkService = new ConsumerWorkService(executorService, null, 1000, 1000); } - @After + @AfterEach public void tearDown() { consumerWorkService.shutdown(); executorService.shutdownNow(); diff --git a/src/test/java/com/rabbitmq/client/test/ChannelNumberAllocationTests.java b/src/test/java/com/rabbitmq/client/test/ChannelNumberAllocationTests.java index aa916529d7..76ecd0abda 100644 --- a/src/test/java/com/rabbitmq/client/test/ChannelNumberAllocationTests.java +++ b/src/test/java/com/rabbitmq/client/test/ChannelNumberAllocationTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -18,16 +18,16 @@ import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ChannelNumberAllocationTests { static final int CHANNEL_COUNT = 100; @@ -41,11 +41,11 @@ public int compare(Channel x, Channel y){ Connection connection; - @Before public void setUp() throws Exception{ + @BeforeEach public void setUp() throws Exception{ connection = TestUtils.connectionFactory().newConnection(); } - @After public void tearDown() throws Exception{ + @AfterEach public void tearDown() throws Exception{ connection.close(); connection = null; } @@ -81,10 +81,10 @@ public int compare(Channel x, Channel y){ // In the current implementation the allocated numbers need not be increasing Collections.sort(channels, COMPARATOR); - assertEquals("Didn't create the right number of channels!", CHANNEL_COUNT, channels.size()); + assertEquals(CHANNEL_COUNT, channels.size(), "Didn't create the right number of channels!"); for(int i = 1; i < CHANNEL_COUNT; ++i) { - assertTrue("Channel numbers should be distinct." - , channels.get(i-1).getChannelNumber() < channels.get(i).getChannelNumber() + assertTrue(channels.get(i-1).getChannelNumber() < channels.get(i).getChannelNumber(), + "Channel numbers should be distinct." ); } } diff --git a/src/test/java/com/rabbitmq/client/test/ChannelRpcTimeoutIntegrationTest.java b/src/test/java/com/rabbitmq/client/test/ChannelRpcTimeoutIntegrationTest.java index 2e9c4bf9ed..d2f3aafcba 100644 --- a/src/test/java/com/rabbitmq/client/test/ChannelRpcTimeoutIntegrationTest.java +++ b/src/test/java/com/rabbitmq/client/test/ChannelRpcTimeoutIntegrationTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,9 +17,9 @@ import com.rabbitmq.client.*; import com.rabbitmq.client.impl.*; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.net.SocketFactory; import java.io.IOException; @@ -36,12 +36,12 @@ public class ChannelRpcTimeoutIntegrationTest { ConnectionFactory factory; - @Before + @BeforeEach public void setUp() { factory = TestUtils.connectionFactory(); } - @After + @AfterEach public void tearDown() { factory = null; } diff --git a/src/test/java/com/rabbitmq/client/test/ClientTests.java b/src/test/java/com/rabbitmq/client/test/ClientTestSuite.java similarity index 90% rename from src/test/java/com/rabbitmq/client/test/ClientTests.java rename to src/test/java/com/rabbitmq/client/test/ClientTestSuite.java index b8550640ca..9a06f67f5d 100644 --- a/src/test/java/com/rabbitmq/client/test/ClientTests.java +++ b/src/test/java/com/rabbitmq/client/test/ClientTestSuite.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -13,7 +13,6 @@ // If you have any questions regarding licensing, please contact us at // info@rabbitmq.com. - package com.rabbitmq.client.test; import com.rabbitmq.client.JacksonJsonRpcTest; @@ -24,11 +23,12 @@ import com.rabbitmq.client.impl.ValueWriterTest; import com.rabbitmq.client.impl.*; import com.rabbitmq.utility.IntAllocatorTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -@RunWith(TestUtils.DefaultTestSuite.class) -@Suite.SuiteClasses({ +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +@Suite +@SelectClasses({ TableTest.class, LongStringTest.class, BlockingCellTest.class, @@ -83,11 +83,6 @@ RefreshCredentialsTest.class, AMQConnectionRefreshCredentialsTest.class }) -public class ClientTests { - - // initialize system properties - static{ - new AbstractRMQTestSuite(){}; - } +public class ClientTestSuite { } diff --git a/src/test/java/com/rabbitmq/client/test/ClientVersionTest.java b/src/test/java/com/rabbitmq/client/test/ClientVersionTest.java index c2c39284e3..3b66ec34fa 100644 --- a/src/test/java/com/rabbitmq/client/test/ClientVersionTest.java +++ b/src/test/java/com/rabbitmq/client/test/ClientVersionTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2017-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,7 +16,7 @@ package com.rabbitmq.client.test; import com.rabbitmq.client.impl.ClientVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/rabbitmq/client/test/ClonePropertiesTest.java b/src/test/java/com/rabbitmq/client/test/ClonePropertiesTest.java index aae4d10e28..0ba413e9e8 100644 --- a/src/test/java/com/rabbitmq/client/test/ClonePropertiesTest.java +++ b/src/test/java/com/rabbitmq/client/test/ClonePropertiesTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,10 +17,10 @@ import com.rabbitmq.client.AMQP.BasicProperties; import com.rabbitmq.client.MessageProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ClonePropertiesTest { diff --git a/src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java b/src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java index 00e9570136..b340f472c4 100644 --- a/src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java +++ b/src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,7 @@ package com.rabbitmq.client.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.CountDownLatch; @@ -25,7 +25,7 @@ import javax.net.SocketFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; diff --git a/src/test/java/com/rabbitmq/client/test/ConfirmBase.java b/src/test/java/com/rabbitmq/client/test/ConfirmBase.java index 144ab68564..425965b17a 100644 --- a/src/test/java/com/rabbitmq/client/test/ConfirmBase.java +++ b/src/test/java/com/rabbitmq/client/test/ConfirmBase.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,7 @@ package com.rabbitmq.client.test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.ExecutionException; @@ -25,8 +25,8 @@ import java.util.concurrent.TimeoutException; import com.rabbitmq.client.ShutdownSignalException; +import org.opentest4j.AssertionFailedError; -import junit.framework.AssertionFailedError; public class ConfirmBase extends BrokerTestCase { protected void waitForConfirms() throws Exception diff --git a/src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java b/src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java index 09af1b3c36..39cc92493d 100644 --- a/src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java +++ b/src/test/java/com/rabbitmq/client/test/ConnectionFactoryTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,7 +17,7 @@ import com.rabbitmq.client.*; import com.rabbitmq.client.impl.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; diff --git a/src/test/java/com/rabbitmq/client/test/ConnectionTest.java b/src/test/java/com/rabbitmq/client/test/ConnectionTest.java index 8fb1c82059..e7233d6e86 100644 --- a/src/test/java/com/rabbitmq/client/test/ConnectionTest.java +++ b/src/test/java/com/rabbitmq/client/test/ConnectionTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,11 +17,12 @@ import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mock; import org.mockito.stubbing.OngoingStubbing; @@ -29,16 +30,13 @@ import java.util.NoSuchElementException; import java.util.Optional; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.openMocks; -@RunWith(Parameterized.class) public class ConnectionTest { - @Parameterized.Parameter - public TestConfigurator configurator; @Mock MyConnection c = mock(MyConnection.class); @Mock @@ -46,23 +44,23 @@ public class ConnectionTest { AutoCloseable mocks; - @Parameterized.Parameters public static Object[] configurators() { return new Object[]{new NotNumberedChannelCreationCallback(), new NumberedChannelCreationCallback()}; } - @Before + @BeforeEach public void init() { mocks = openMocks(this); } - @After + @AfterEach public void tearDown() throws Exception { mocks.close(); } - @Test - public void openChannelWithNonNullChannelShouldReturnNonEmptyOptional() throws Exception { + @ParameterizedTest + @MethodSource("configurators") + public void openChannelWithNonNullChannelShouldReturnNonEmptyOptional(TestConfigurator configurator) throws Exception { configurator.mockAndWhenChannel(c).thenReturn(ch); configurator.mockAndWhenOptional(c).thenCallRealMethod(); Optional optional = configurator.open(c); @@ -70,20 +68,24 @@ public void openChannelWithNonNullChannelShouldReturnNonEmptyOptional() throws E assertSame(ch, optional.get()); } - @Test(expected = NoSuchElementException.class) - public void openChannelWithNullChannelShouldReturnEmptyOptional() throws Exception { + @ParameterizedTest + @MethodSource("configurators") + public void openChannelWithNullChannelShouldReturnEmptyOptional(TestConfigurator configurator) throws Exception { configurator.mockAndWhenChannel(c).thenReturn(null); configurator.mockAndWhenOptional(c).thenCallRealMethod(); - Optional optional = configurator.open(c); - assertFalse(optional.isPresent()); - optional.get(); + Assertions.assertThatThrownBy(() -> { + Optional optional = configurator.open(c); + assertFalse(optional.isPresent()); + optional.get(); + }).isInstanceOf(NoSuchElementException.class); } - @Test(expected = IOException.class) - public void openChannelShouldPropagateIoException() throws Exception { + @ParameterizedTest + @MethodSource("configurators") + public void openChannelShouldPropagateIoException(TestConfigurator configurator) throws Exception { configurator.mockAndWhenChannel(c).thenThrow(IOException.class); configurator.mockAndWhenOptional(c).thenCallRealMethod(); - configurator.open(c); + Assertions.assertThatThrownBy(() -> configurator.open(c)).isInstanceOf(IOException.class); } interface TestConfigurator { diff --git a/src/test/java/com/rabbitmq/client/test/DefaultRetryHandlerTest.java b/src/test/java/com/rabbitmq/client/test/DefaultRetryHandlerTest.java index ae841b430b..363c7285c8 100644 --- a/src/test/java/com/rabbitmq/client/test/DefaultRetryHandlerTest.java +++ b/src/test/java/com/rabbitmq/client/test/DefaultRetryHandlerTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -23,9 +23,9 @@ import com.rabbitmq.client.impl.recovery.RecordedQueue; import com.rabbitmq.client.impl.recovery.RetryContext; import com.rabbitmq.client.impl.recovery.RetryHandler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.verification.VerificationMode; @@ -33,8 +33,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiPredicate; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.intThat; @@ -75,12 +75,12 @@ public class DefaultRetryHandlerTest { AutoCloseable mocks; - @Before + @BeforeEach public void init() { mocks = openMocks(this); } - @After + @AfterEach public void tearDown() throws Exception { mocks.close(); } diff --git a/src/test/java/com/rabbitmq/client/test/DnsRecordIpAddressResolverTests.java b/src/test/java/com/rabbitmq/client/test/DnsRecordIpAddressResolverTests.java index 5c38d5c8da..c339bf34e8 100644 --- a/src/test/java/com/rabbitmq/client/test/DnsRecordIpAddressResolverTests.java +++ b/src/test/java/com/rabbitmq/client/test/DnsRecordIpAddressResolverTests.java @@ -3,13 +3,13 @@ import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.DnsRecordIpAddressResolver; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.UnknownHostException; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * diff --git a/src/test/java/com/rabbitmq/client/test/DnsSrvRecordAddressResolverTest.java b/src/test/java/com/rabbitmq/client/test/DnsSrvRecordAddressResolverTest.java index 4950cc2323..839fb16fe4 100644 --- a/src/test/java/com/rabbitmq/client/test/DnsSrvRecordAddressResolverTest.java +++ b/src/test/java/com/rabbitmq/client/test/DnsSrvRecordAddressResolverTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,7 +17,7 @@ import com.rabbitmq.client.Address; import com.rabbitmq.client.DnsSrvRecordAddressResolver; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; diff --git a/src/test/java/com/rabbitmq/client/test/FrameBuilderTest.java b/src/test/java/com/rabbitmq/client/test/FrameBuilderTest.java index 38fd654f3f..3e8b462f3d 100644 --- a/src/test/java/com/rabbitmq/client/test/FrameBuilderTest.java +++ b/src/test/java/com/rabbitmq/client/test/FrameBuilderTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -19,10 +19,11 @@ import com.rabbitmq.client.MalformedFrameException; import com.rabbitmq.client.impl.Frame; import com.rabbitmq.client.impl.nio.FrameBuilder; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.MockitoAnnotations; import java.io.IOException; import java.nio.ByteBuffer; @@ -34,7 +35,6 @@ /** * */ -@RunWith(MockitoJUnitRunner.class) public class FrameBuilderTest { @Mock @@ -44,6 +44,18 @@ public class FrameBuilderTest { FrameBuilder builder; + AutoCloseable mocks; + + @BeforeEach + void init() { + this.mocks = MockitoAnnotations.openMocks(this); + } + + @AfterEach + void tearDown() throws Exception { + mocks.close(); + } + @Test public void buildFrameInOneGo() throws IOException { buffer = ByteBuffer.wrap(new byte[] { 1, 0, 0, 0, 0, 0, 3, 1, 2, 3, end() }); diff --git a/src/test/java/com/rabbitmq/client/test/FrameTest.java b/src/test/java/com/rabbitmq/client/test/FrameTest.java index e78ec48a70..fae132263b 100644 --- a/src/test/java/com/rabbitmq/client/test/FrameTest.java +++ b/src/test/java/com/rabbitmq/client/test/FrameTest.java @@ -3,7 +3,7 @@ import com.rabbitmq.client.AMQP; import com.rabbitmq.client.impl.Frame; import com.rabbitmq.client.impl.nio.ByteBufferOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/test/java/com/rabbitmq/client/test/GeneratedClassesTest.java b/src/test/java/com/rabbitmq/client/test/GeneratedClassesTest.java index 78919bbca6..d8b139e7d7 100644 --- a/src/test/java/com/rabbitmq/client/test/GeneratedClassesTest.java +++ b/src/test/java/com/rabbitmq/client/test/GeneratedClassesTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,14 +17,14 @@ import com.rabbitmq.client.AMQP; import com.rabbitmq.client.impl.AMQImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Calendar; import java.util.Date; import static java.util.Collections.singletonMap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; /** * diff --git a/src/test/java/com/rabbitmq/client/test/JavaNioTest.java b/src/test/java/com/rabbitmq/client/test/JavaNioTest.java index 0d143e86e8..925c31ed55 100644 --- a/src/test/java/com/rabbitmq/client/test/JavaNioTest.java +++ b/src/test/java/com/rabbitmq/client/test/JavaNioTest.java @@ -5,9 +5,9 @@ import com.rabbitmq.client.impl.nio.DefaultByteBufferFactory; import com.rabbitmq.client.impl.nio.NioParams; import org.assertj.core.api.Condition; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.ByteBuffer; @@ -16,8 +16,8 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @@ -28,14 +28,14 @@ public class JavaNioTest { private Connection testConnection; - @Before + @BeforeEach public void init() throws Exception { ConnectionFactory connectionFactory = new ConnectionFactory(); connectionFactory.useNio(); testConnection = connectionFactory.newConnection(); } - @After + @AfterEach public void tearDown() throws Exception { if (testConnection != null) { testConnection.createChannel().queueDelete(QUEUE); @@ -52,7 +52,7 @@ public void connection() throws Exception { try { connection = basicGetBasicConsume(connectionFactory, "nio.queue", latch); boolean messagesReceived = latch.await(5, TimeUnit.SECONDS); - assertTrue("Message has not been received", messagesReceived); + assertTrue(messagesReceived, "Message has not been received"); } finally { safeClose(connection); } @@ -71,7 +71,7 @@ public void twoConnections() throws IOException, TimeoutException, InterruptedEx connection2 = basicGetBasicConsume(connectionFactory, "nio.queue.2", latch); boolean messagesReceived = latch.await(5, TimeUnit.SECONDS); - assertTrue("Messages have not been received", messagesReceived); + assertTrue(messagesReceived, "Messages have not been received"); } finally { safeClose(connection1); safeClose(connection2); @@ -91,7 +91,7 @@ public void twoConnectionsWithNioExecutor() throws IOException, TimeoutException connection2 = basicGetBasicConsume(connectionFactory, "nio.queue.2", latch); boolean messagesReceived = latch.await(5, TimeUnit.SECONDS); - assertTrue("Messages have not been received", messagesReceived); + assertTrue(messagesReceived, "Messages have not been received"); } finally { safeClose(connection1); safeClose(connection2); @@ -114,7 +114,7 @@ public void shutdownCompleted(ShutdownSignalException cause) { } }); safeClose(connection); - assertTrue("Shutdown listener should have been called", latch.await(5, TimeUnit.SECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS), "Shutdown listener should have been called"); } finally { safeClose(connection); } @@ -194,7 +194,7 @@ public void customWriteQueue() throws Exception { private void sendAndVerifyMessage(Connection connection, int size) throws Exception { CountDownLatch latch = new CountDownLatch(1); boolean messageReceived = basicGetBasicConsume(connection, QUEUE, latch, size); - assertTrue("Message has not been received", messageReceived); + assertTrue(messageReceived, "Message has not been received"); } private Connection basicGetBasicConsume(ConnectionFactory connectionFactory, String queue, final CountDownLatch latch) diff --git a/src/test/java/com/rabbitmq/client/test/LambdaCallbackTest.java b/src/test/java/com/rabbitmq/client/test/LambdaCallbackTest.java index 0f30f4f83a..68390b0631 100644 --- a/src/test/java/com/rabbitmq/client/test/LambdaCallbackTest.java +++ b/src/test/java/com/rabbitmq/client/test/LambdaCallbackTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2017-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,7 +17,7 @@ import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.UUID; @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class LambdaCallbackTest extends BrokerTestCase { @@ -53,7 +53,7 @@ protected void releaseResources() throws IOException { Channel channel = connection.createChannel(); channel.addShutdownListener(cause -> latch.countDown()); } - assertTrue("Connection closed, shutdown listeners should have been called", latch.await(1, TimeUnit.SECONDS)); + assertTrue(latch.await(1, TimeUnit.SECONDS), "Connection closed, shutdown listeners should have been called"); } @Test public void confirmListener() throws Exception { @@ -64,14 +64,14 @@ protected void releaseResources() throws IOException { (deliveryTag, multiple) -> {} ); channel.basicPublish("", "whatever", null, "dummy".getBytes()); - assertTrue("Should have received publisher confirm", latch.await(1, TimeUnit.SECONDS)); + assertTrue(latch.await(1, TimeUnit.SECONDS), "Should have received publisher confirm"); } @Test public void returnListener() throws Exception { CountDownLatch latch = new CountDownLatch(1); channel.addReturnListener(returnMessage -> latch.countDown()); channel.basicPublish("", "notlikelytoexist", true, null, "dummy".getBytes()); - assertTrue("Should have received returned message", latch.await(1, TimeUnit.SECONDS)); + assertTrue(latch.await(1, TimeUnit.SECONDS), "Should have received returned message"); } @Test public void blockedListener() throws Exception { @@ -90,7 +90,7 @@ protected void releaseResources() throws IOException { block(); Channel ch = connection.createChannel(); ch.basicPublish("", "", null, "dummy".getBytes()); - assertTrue("Should have been blocked and unblocked", latch.await(10, TimeUnit.SECONDS)); + assertTrue(latch.await(10, TimeUnit.SECONDS), "Should have been blocked and unblocked"); } } @@ -104,9 +104,9 @@ protected void releaseResources() throws IOException { consumerTag -> cancelLatch.countDown() ); this.channel.basicPublish("", queue, null, "dummy".getBytes()); - assertTrue("deliver callback should have been called", consumingLatch.await(1, TimeUnit.SECONDS)); + assertTrue(consumingLatch.await(1, TimeUnit.SECONDS), "deliver callback should have been called"); this.channel.queueDelete(queue); - assertTrue("cancel callback should have been called", cancelLatch.await(1, TimeUnit.SECONDS)); + assertTrue(cancelLatch.await(1, TimeUnit.SECONDS), "cancel callback should have been called"); } } @@ -120,9 +120,9 @@ protected void releaseResources() throws IOException { (consumerTag, sig) -> shutdownLatch.countDown() ); this.channel.basicPublish("", queue, null, "dummy".getBytes()); - assertTrue("deliver callback should have been called", consumingLatch.await(1, TimeUnit.SECONDS)); + assertTrue(consumingLatch.await(1, TimeUnit.SECONDS), "deliver callback should have been called"); } - assertTrue("shutdown callback should have been called", shutdownLatch.await(1, TimeUnit.SECONDS)); + assertTrue(shutdownLatch.await(1, TimeUnit.SECONDS), "shutdown callback should have been called"); } @Test public void basicConsumeCancelDeliverShutdown() throws Exception { @@ -138,9 +138,9 @@ protected void releaseResources() throws IOException { (consumerTag, sig) -> shutdownLatch.countDown() ); this.channel.basicPublish("", queue, null, "dummy".getBytes()); - assertTrue("deliver callback should have been called", consumingLatch.await(1, TimeUnit.SECONDS)); + assertTrue(consumingLatch.await(1, TimeUnit.SECONDS), "deliver callback should have been called"); } - assertTrue("shutdown callback should have been called", shutdownLatch.await(1, TimeUnit.SECONDS)); + assertTrue(shutdownLatch.await(1, TimeUnit.SECONDS), "shutdown callback should have been called"); } } diff --git a/src/test/java/com/rabbitmq/client/test/LongStringTest.java b/src/test/java/com/rabbitmq/client/test/LongStringTest.java index 7c711b4fe4..82c6053116 100644 --- a/src/test/java/com/rabbitmq/client/test/LongStringTest.java +++ b/src/test/java/com/rabbitmq/client/test/LongStringTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,11 +17,11 @@ import com.rabbitmq.client.LongString; import com.rabbitmq.client.impl.LongStringHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.UnsupportedEncodingException; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class LongStringTest { diff --git a/src/test/java/com/rabbitmq/client/test/MetricsCollectorTest.java b/src/test/java/com/rabbitmq/client/test/MetricsCollectorTest.java index 965707ba12..2286f6611a 100644 --- a/src/test/java/com/rabbitmq/client/test/MetricsCollectorTest.java +++ b/src/test/java/com/rabbitmq/client/test/MetricsCollectorTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -26,11 +26,11 @@ import io.opentelemetry.sdk.metrics.data.LongPointData; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import java.io.IOException; import java.util.List; @@ -42,13 +42,11 @@ /** * */ -@RunWith(Parameterized.class) public class MetricsCollectorTest { - @ClassRule - public static final OpenTelemetryRule openTelemetryRule = OpenTelemetryRule.create(); + @RegisterExtension + static final OpenTelemetryExtension otelTesting = OpenTelemetryExtension.create(); - @Parameterized.Parameters public static Object[] data() { // need to resort to a factory, as this method is called only once // if creating the collector instance, it's reused across the test methods @@ -56,17 +54,15 @@ public static Object[] data() { return new Object[]{new StandardMetricsCollectorFactory(), new MicrometerMetricsCollectorFactory(), new OpenTelemetryMetricsCollectorFactory()}; } - @Parameterized.Parameter - public MetricsCollectorFactory factory; - - @Before + @BeforeEach public void reset() { // reset metrics - openTelemetryRule.clearMetrics(); + otelTesting.clearMetrics(); } - @Test - public void basicGetAndAck() { + @ParameterizedTest + @MethodSource("data") + public void basicGetAndAck(MetricsCollectorFactory factory) { AbstractMetricsCollector metrics = factory.create(); Connection connection = mock(Connection.class); when(connection.getId()).thenReturn("connection-1"); @@ -97,7 +93,9 @@ public void basicGetAndAck() { assertThat(acknowledgedMessages(metrics)).isEqualTo(1L+2L+1L); } - @Test public void basicConsumeAndAck() { + @ParameterizedTest + @MethodSource("data") + public void basicConsumeAndAck(MetricsCollectorFactory factory) { AbstractMetricsCollector metrics = factory.create(); Connection connection = mock(Connection.class); when(connection.getId()).thenReturn("connection-1"); @@ -136,7 +134,9 @@ public void basicGetAndAck() { assertThat(acknowledgedMessages(metrics)).isEqualTo(1L+2L+1L); } - @Test public void publishingAndPublishingFailures() { + @ParameterizedTest + @MethodSource("data") + public void publishingAndPublishingFailures(MetricsCollectorFactory factory) { AbstractMetricsCollector metrics = factory.create(); Channel channel = mock(Channel.class); @@ -164,7 +164,9 @@ public void basicGetAndAck() { assertThat(publishedMessages(metrics)).isEqualTo(2L); } - @Test public void publishingAcknowledgements() { + @ParameterizedTest + @MethodSource("data") + public void publishingAcknowledgements(MetricsCollectorFactory factory) { long anyDeliveryTag = 123L; AbstractMetricsCollector metrics = factory.create(); Channel channel = mock(Channel.class); @@ -184,7 +186,9 @@ public void basicGetAndAck() { assertThat(publishAck(metrics)).isEqualTo(2); } - @Test public void publishingNotAcknowledgements() { + @ParameterizedTest + @MethodSource("data") + public void publishingNotAcknowledgements(MetricsCollectorFactory factory) { long anyDeliveryTag = 123L; AbstractMetricsCollector metrics = factory.create(); Channel channel = mock(Channel.class); @@ -204,7 +208,9 @@ public void basicGetAndAck() { assertThat(publishNack(metrics)).isEqualTo(2L); } - @Test public void publishingUnrouted() { + @ParameterizedTest + @MethodSource("data") + public void publishingUnrouted(MetricsCollectorFactory factory) { AbstractMetricsCollector metrics = factory.create(); Channel channel = mock(Channel.class); // begins with no messages not-acknowledged @@ -220,7 +226,9 @@ public void basicGetAndAck() { assertThat(publishUnrouted(metrics)).isEqualTo(2L); } - @Test public void cleanStaleState() { + @ParameterizedTest + @MethodSource("data") + public void cleanStaleState(MetricsCollectorFactory factory) { AbstractMetricsCollector metrics = factory.create(); Connection openConnection = mock(Connection.class); when(openConnection.getId()).thenReturn("connection-1"); @@ -390,13 +398,13 @@ public AbstractMetricsCollector create() { static class OpenTelemetryMetricsCollectorFactory implements MetricsCollectorFactory { @Override public AbstractMetricsCollector create() { - return new OpenTelemetryMetricsCollector(openTelemetryRule.getOpenTelemetry()); + return new OpenTelemetryMetricsCollector(otelTesting.getOpenTelemetry()); } } static long getOpenTelemetryCounterMeterValue(String name) { // open telemetry metrics - List metrics = openTelemetryRule.getMetrics(); + List metrics = otelTesting.getMetrics(); // metric value return metrics.stream() .filter(metric -> metric.getName().equals(name)) diff --git a/src/test/java/com/rabbitmq/client/test/MicrometerMetricsCollectorTest.java b/src/test/java/com/rabbitmq/client/test/MicrometerMetricsCollectorTest.java index 125d185160..16c7fc12df 100644 --- a/src/test/java/com/rabbitmq/client/test/MicrometerMetricsCollectorTest.java +++ b/src/test/java/com/rabbitmq/client/test/MicrometerMetricsCollectorTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,12 +15,14 @@ package com.rabbitmq.client.test; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import com.rabbitmq.client.impl.MicrometerMetricsCollector; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -31,7 +33,7 @@ public class MicrometerMetricsCollectorTest { MicrometerMetricsCollector collector; - @Before + @BeforeEach public void init() { registry = new SimpleMeterRegistry(); } @@ -52,9 +54,10 @@ public void tags() { } } - @Test(expected = IllegalArgumentException.class) + @Test public void tagsMustBeKeyValuePairs() { - collector = new MicrometerMetricsCollector(registry, "rabbitmq", "uri"); + assertThatThrownBy(() -> new MicrometerMetricsCollector(registry, "rabbitmq", "uri")) + .isInstanceOf(IllegalArgumentException.class); } } diff --git a/src/test/java/com/rabbitmq/client/test/MultiThreadedChannel.java b/src/test/java/com/rabbitmq/client/test/MultiThreadedChannel.java index 93a2d1c837..7893ab056b 100644 --- a/src/test/java/com/rabbitmq/client/test/MultiThreadedChannel.java +++ b/src/test/java/com/rabbitmq/client/test/MultiThreadedChannel.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests whether a Channel is safe for multi-threaded access diff --git a/src/test/java/com/rabbitmq/client/test/NioDeadlockOnConnectionClosing.java b/src/test/java/com/rabbitmq/client/test/NioDeadlockOnConnectionClosing.java index 0f3984ade7..9ca7dd156a 100644 --- a/src/test/java/com/rabbitmq/client/test/NioDeadlockOnConnectionClosing.java +++ b/src/test/java/com/rabbitmq/client/test/NioDeadlockOnConnectionClosing.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -18,9 +18,9 @@ import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.impl.nio.NioParams; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit; import static com.rabbitmq.client.test.TestUtils.closeAllConnectionsAndWaitForRecovery; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @@ -44,7 +44,7 @@ public class NioDeadlockOnConnectionClosing { ConnectionFactory cf; List connections; - @Before + @BeforeEach public void setUp() { nioExecutorService = Executors.newFixedThreadPool(2); connectionShutdownExecutorService = Executors.newFixedThreadPool(2); @@ -60,7 +60,7 @@ public void setUp() { connections = new ArrayList<>(); } - @After + @AfterEach public void tearDown() throws Exception { for (Connection connection : connections) { try { diff --git a/src/test/java/com/rabbitmq/client/test/NoAutoRecoveryWhenTcpWindowIsFullTest.java b/src/test/java/com/rabbitmq/client/test/NoAutoRecoveryWhenTcpWindowIsFullTest.java index 247fdcfd57..ea0bf72c74 100644 --- a/src/test/java/com/rabbitmq/client/test/NoAutoRecoveryWhenTcpWindowIsFullTest.java +++ b/src/test/java/com/rabbitmq/client/test/NoAutoRecoveryWhenTcpWindowIsFullTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -27,10 +27,10 @@ import com.rabbitmq.client.impl.nio.NioParams; import com.rabbitmq.client.impl.recovery.AutorecoveringChannel; import com.rabbitmq.client.impl.recovery.AutorecoveringConnection; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import com.rabbitmq.client.test.TestUtils.DisabledIfBrokerRunningOnDocker; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.Socket; @@ -42,7 +42,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.junit.rules.TestRule; import static org.assertj.core.api.Assertions.assertThat; @@ -66,11 +65,9 @@ * to the socket fails. *

*/ +@DisabledIfBrokerRunningOnDocker public class NoAutoRecoveryWhenTcpWindowIsFullTest { - @ClassRule - public static TestRule brokerOnDockerTestRule = TestUtils.brokerIsNotRunningOnDocker(); - private static final int NUM_MESSAGES_TO_PRODUCE = 50000; private static final int MESSAGE_PROCESSING_TIME_MS = 3000; private static final byte[] MESSAGE_CONTENT = ("MESSAGE CONTENT " + NUM_MESSAGES_TO_PRODUCE).getBytes(); @@ -83,7 +80,7 @@ public class NoAutoRecoveryWhenTcpWindowIsFullTest { private CountDownLatch consumerOkLatch; - @Before + @BeforeEach public void setUp() throws Exception { // we need several threads to publish, dispatch deliveries, handle RPC responses, etc. executorService = Executors.newFixedThreadPool(10); @@ -123,7 +120,7 @@ public void configure(Socket socket) throws IOException { consumerOkLatch = new CountDownLatch(2); } - @After + @AfterEach public void tearDown() throws IOException { closeConnectionIfOpen(consumingConnection); closeConnectionIfOpen(producingConnection); diff --git a/src/test/java/com/rabbitmq/client/test/PropertyFileInitialisationTest.java b/src/test/java/com/rabbitmq/client/test/PropertyFileInitialisationTest.java index 40138a26d6..24d3f808d8 100644 --- a/src/test/java/com/rabbitmq/client/test/PropertyFileInitialisationTest.java +++ b/src/test/java/com/rabbitmq/client/test/PropertyFileInitialisationTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,7 +17,7 @@ import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.ConnectionFactoryConfigurator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.net.ssl.SSLContext; import java.io.FileReader; diff --git a/src/test/java/com/rabbitmq/client/test/QueueingConsumerTests.java b/src/test/java/com/rabbitmq/client/test/QueueingConsumerTests.java index ba9d72e47b..4a4793952f 100644 --- a/src/test/java/com/rabbitmq/client/test/QueueingConsumerTests.java +++ b/src/test/java/com/rabbitmq/client/test/QueueingConsumerTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,10 +15,10 @@ package com.rabbitmq.client.test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import com.rabbitmq.client.ConsumerCancelledException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.concurrent.ArrayBlockingQueue; diff --git a/src/test/java/com/rabbitmq/client/test/RecoveryAwareAMQConnectionFactoryTest.java b/src/test/java/com/rabbitmq/client/test/RecoveryAwareAMQConnectionFactoryTest.java index 785b58ec53..2b40553778 100644 --- a/src/test/java/com/rabbitmq/client/test/RecoveryAwareAMQConnectionFactoryTest.java +++ b/src/test/java/com/rabbitmq/client/test/RecoveryAwareAMQConnectionFactoryTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -24,7 +24,7 @@ import com.rabbitmq.client.impl.FrameHandlerFactory; import com.rabbitmq.client.impl.recovery.RecoveryAwareAMQConnection; import com.rabbitmq.client.impl.recovery.RecoveryAwareAMQConnectionFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; @@ -32,7 +32,7 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.*; public class RecoveryAwareAMQConnectionFactoryTest { diff --git a/src/test/java/com/rabbitmq/client/test/RecoveryDelayHandlerTest.java b/src/test/java/com/rabbitmq/client/test/RecoveryDelayHandlerTest.java index be9958b487..035b96191d 100644 --- a/src/test/java/com/rabbitmq/client/test/RecoveryDelayHandlerTest.java +++ b/src/test/java/com/rabbitmq/client/test/RecoveryDelayHandlerTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,8 @@ package com.rabbitmq.client.test; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Collections; @@ -24,7 +25,7 @@ import com.rabbitmq.client.RecoveryDelayHandler.DefaultRecoveryDelayHandler; import com.rabbitmq.client.RecoveryDelayHandler.ExponentialBackoffDelayHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RecoveryDelayHandlerTest { @@ -61,13 +62,15 @@ public void testExponentialBackoffDelayHandlerSequence() { assertEquals(2, handler.getDelay(Integer.MAX_VALUE)); } - @Test(expected=IllegalArgumentException.class) + @Test public void testExponentialBackoffDelayHandlerWithNullSequence() { - new ExponentialBackoffDelayHandler(null); + assertThatThrownBy(() -> new ExponentialBackoffDelayHandler(null)) + .isInstanceOf(IllegalArgumentException.class); } - @Test(expected=IllegalArgumentException.class) + @Test public void testExponentialBackoffDelayHandlerWithEmptySequence() { - new ExponentialBackoffDelayHandler(Collections.emptyList()); + assertThatThrownBy(() -> new ExponentialBackoffDelayHandler(Collections.emptyList())) + .isInstanceOf(IllegalArgumentException.class); } } diff --git a/src/test/java/com/rabbitmq/client/test/RefreshCredentialsTest.java b/src/test/java/com/rabbitmq/client/test/RefreshCredentialsTest.java index 0a0100cbc6..8e32dbc6c3 100644 --- a/src/test/java/com/rabbitmq/client/test/RefreshCredentialsTest.java +++ b/src/test/java/com/rabbitmq/client/test/RefreshCredentialsTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -20,10 +20,10 @@ import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.impl.DefaultCredentialsRefreshService; import com.rabbitmq.client.impl.RefreshProtectedCredentialsProvider; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TestRule; +import com.rabbitmq.client.test.TestUtils.BrokerVersion; +import com.rabbitmq.client.test.TestUtils.BrokerVersionAtLeast; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.time.Instant; @@ -33,13 +33,12 @@ import static org.assertj.core.api.Assertions.assertThat; +@BrokerVersionAtLeast(BrokerVersion.RABBITMQ_3_8) public class RefreshCredentialsTest { - @ClassRule - public static TestRule brokerVersionTestRule = TestUtils.atLeast38(); DefaultCredentialsRefreshService refreshService; - @Before + @BeforeEach public void tearDown() { if (refreshService != null) { refreshService.close(); diff --git a/src/test/java/com/rabbitmq/client/test/RequiredPropertiesSuite.java b/src/test/java/com/rabbitmq/client/test/RequiredPropertiesSuite.java index f8ab431800..f0040e43ab 100644 --- a/src/test/java/com/rabbitmq/client/test/RequiredPropertiesSuite.java +++ b/src/test/java/com/rabbitmq/client/test/RequiredPropertiesSuite.java @@ -1,10 +1,5 @@ package com.rabbitmq.client.test; -import org.junit.runner.Runner; -import org.junit.runner.notification.RunNotifier; -import org.junit.runners.Suite; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.RunnerBuilder; import java.util.ArrayList; import java.util.List; @@ -14,8 +9,9 @@ /** * */ -public class RequiredPropertiesSuite extends Suite { +public class RequiredPropertiesSuite { //extends Suite { +/* private static final Logger LOGGER = LoggerFactory.getLogger(RequiredPropertiesSuite.class); public RequiredPropertiesSuite(Class klass, RunnerBuilder builder) throws InitializationError { @@ -52,4 +48,6 @@ protected void runChild(Runner runner, RunNotifier notifier) { LOGGER.info("Running test {}", runner.getDescription().getDisplayName()); super.runChild(runner, notifier); } + + */ } diff --git a/src/test/java/com/rabbitmq/client/test/RpcTest.java b/src/test/java/com/rabbitmq/client/test/RpcTest.java index d535d9c8f7..5d95d0d448 100644 --- a/src/test/java/com/rabbitmq/client/test/RpcTest.java +++ b/src/test/java/com/rabbitmq/client/test/RpcTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2017-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -25,9 +25,9 @@ import com.rabbitmq.client.impl.recovery.TopologyRecoveryFilter; import com.rabbitmq.tools.Host; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.Duration; @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static com.rabbitmq.client.test.TestUtils.waitAtMost; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class RpcTest { @@ -49,7 +49,7 @@ public class RpcTest { String queue = "rpc.queue"; RpcServer rpcServer; - @Before + @BeforeEach public void init() throws Exception { clientConnection = TestUtils.connectionFactory().newConnection(); clientChannel = clientConnection.createChannel(); @@ -58,7 +58,7 @@ public void init() throws Exception { serverChannel.queueDeclare(queue, false, false, false, null); } - @After + @AfterEach public void tearDown() throws Exception { if (rpcServer != null) { rpcServer.terminateMainloop(); @@ -241,7 +241,7 @@ public void handleRecoveryStarted(Recoverable recoverable) { } }); Host.closeConnection((NetworkConnection) connection); - assertTrue("Connection should have recovered by now", recoveryLatch.await(10, TimeUnit.SECONDS)); + assertTrue(recoveryLatch.await(10, TimeUnit.SECONDS), "Connection should have recovered by now"); client = new RpcClient(new RpcClientParams() .channel(channel).exchange("").routingKey(queue).timeout(1000)); response = client.doCall(null, "hello".getBytes()); @@ -289,7 +289,7 @@ public void handleRecoveryStarted(Recoverable recoverable) { } }); Host.closeConnection((NetworkConnection) connection); - assertTrue("Connection should have recovered by now", recoveryLatch.await(10, TimeUnit.SECONDS)); + assertTrue(recoveryLatch.await(10, TimeUnit.SECONDS), "Connection should have recovered by now"); try { new RpcClient(new RpcClientParams() .channel(channel).exchange("").routingKey(queue).timeout(1000)); diff --git a/src/test/java/com/rabbitmq/client/test/RpcTopologyRecordingTest.java b/src/test/java/com/rabbitmq/client/test/RpcTopologyRecordingTest.java index 3769218fd7..249eeb3f1b 100644 --- a/src/test/java/com/rabbitmq/client/test/RpcTopologyRecordingTest.java +++ b/src/test/java/com/rabbitmq/client/test/RpcTopologyRecordingTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,9 +17,6 @@ import com.rabbitmq.client.*; import com.rabbitmq.client.impl.AMQImpl; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.io.IOException; import java.util.UUID; @@ -27,20 +24,18 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import static com.rabbitmq.client.test.TestUtils.closeAndWaitForRecovery; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(Parameterized.class) public class RpcTopologyRecordingTest extends BrokerTestCase { - @Parameterized.Parameter - public RpcCall rpcCall; String exchange, queue, routingKey; String exchange2, queue2, routingKey2; - @Parameterized.Parameters public static Object[] data() { return new Object[]{ (RpcCall) (channel, method) -> channel.asyncCompletableRpc(method).get(5, TimeUnit.SECONDS), @@ -73,9 +68,10 @@ protected void releaseResources() throws IOException { channel.exchangeDelete(exchange2); } - @Test - public void topologyRecovery() throws Exception { - createTopology(); + @ParameterizedTest + @MethodSource("data") + public void topologyRecovery(RpcCall rpcCall) throws Exception { + createTopology(rpcCall); AtomicReference latch = new AtomicReference<>(new CountDownLatch(2)); DeliverCallback countDown = (ctag, message) -> latch.get().countDown(); @@ -98,9 +94,10 @@ public void topologyRecovery() throws Exception { assertTrue(latch.get().await(5, TimeUnit.SECONDS)); } - @Test - public void deletionAreProperlyRecorded() throws Exception { - createTopology(); + @ParameterizedTest + @MethodSource("data") + public void deletionAreProperlyRecorded(RpcCall rpcCall) throws Exception { + createTopology(rpcCall); AtomicReference latch = new AtomicReference<>(new CountDownLatch(2)); DeliverCallback countDown = (ctag, message) -> latch.get().countDown(); @@ -151,9 +148,10 @@ boolean exchangeExists(String exchange) throws TimeoutException { } } - @Test - public void bindingDeletionAreProperlyRecorded() throws Exception { - createTopology(); + @ParameterizedTest + @MethodSource("data") + public void bindingDeletionAreProperlyRecorded(RpcCall rpcCall) throws Exception { + createTopology(rpcCall); AtomicReference latch = new AtomicReference<>(new CountDownLatch(2)); DeliverCallback countDown = (ctag, message) -> latch.get().countDown(); @@ -167,7 +165,7 @@ public void bindingDeletionAreProperlyRecorded() throws Exception { assertTrue(latch.get().await(5, TimeUnit.SECONDS)); - unbind(); + unbind(rpcCall); latch.set(new CountDownLatch(2)); @@ -178,9 +176,9 @@ public void bindingDeletionAreProperlyRecorded() throws Exception { assertFalse(latch.get().await(2, TimeUnit.SECONDS)); } - private void createTopology() throws Exception { - createAndBind(exchange, queue, routingKey); - createAndBind(exchange2, queue2, routingKey2); + private void createTopology(RpcCall rpcCall) throws Exception { + createAndBind(rpcCall, exchange, queue, routingKey); + createAndBind(rpcCall, exchange2, queue2, routingKey2); rpcCall.call(channel, new AMQImpl.Exchange.Bind.Builder() .source(exchange) .destination(exchange2) @@ -189,7 +187,7 @@ private void createTopology() throws Exception { .build()); } - private void createAndBind(String e, String q, String rk) throws Exception { + private void createAndBind(RpcCall rpcCall, String e, String q, String rk) throws Exception { rpcCall.call(channel, new AMQImpl.Queue.Declare.Builder() .queue(q) .durable(false) @@ -212,7 +210,7 @@ private void createAndBind(String e, String q, String rk) throws Exception { .build()); } - private void unbind() throws Exception { + private void unbind(RpcCall rpcCall) throws Exception { rpcCall.call(channel, new AMQImpl.Queue.Unbind.Builder() .exchange(exchange) .queue(queue) diff --git a/src/test/java/com/rabbitmq/client/test/SharedThreadPoolTest.java b/src/test/java/com/rabbitmq/client/test/SharedThreadPoolTest.java index 747a2805e5..0e8317b987 100644 --- a/src/test/java/com/rabbitmq/client/test/SharedThreadPoolTest.java +++ b/src/test/java/com/rabbitmq/client/test/SharedThreadPoolTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,8 +15,8 @@ package com.rabbitmq.client.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.ExecutorService; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException; import com.rabbitmq.client.Connection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.impl.AMQConnection; diff --git a/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java b/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java index 585e74f7a8..69a3eee1e8 100644 --- a/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java +++ b/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -19,7 +19,7 @@ import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.SslContextFactory; import com.rabbitmq.client.TrustEverythingTrustManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLHandshakeException; @@ -32,7 +32,7 @@ import java.util.Map; import java.util.function.Supplier; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * diff --git a/src/test/java/com/rabbitmq/client/test/StrictExceptionHandlerTest.java b/src/test/java/com/rabbitmq/client/test/StrictExceptionHandlerTest.java index fbb3ad984b..c2a3f28aa9 100644 --- a/src/test/java/com/rabbitmq/client/test/StrictExceptionHandlerTest.java +++ b/src/test/java/com/rabbitmq/client/test/StrictExceptionHandlerTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -23,7 +23,7 @@ import com.rabbitmq.client.DefaultConsumer; import com.rabbitmq.client.Envelope; import com.rabbitmq.client.impl.StrictExceptionHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/com/rabbitmq/client/test/TableTest.java b/src/test/java/com/rabbitmq/client/test/TableTest.java index d39e871760..be808fa262 100644 --- a/src/test/java/com/rabbitmq/client/test/TableTest.java +++ b/src/test/java/com/rabbitmq/client/test/TableTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -18,7 +18,8 @@ import com.rabbitmq.client.impl.*; import java.sql.Timestamp; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.*; import java.math.BigDecimal; @@ -26,12 +27,12 @@ import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TableTest { - public byte [] marshal(Map table) + public byte [] marshal(Map table) throws IOException { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java index 2afffd8d33..8897bf23a9 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtils.java @@ -19,23 +19,17 @@ import com.rabbitmq.client.impl.NetworkConnection; import com.rabbitmq.client.impl.recovery.AutorecoveringConnection; import com.rabbitmq.tools.Host; +import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.lang.reflect.Method; -import java.util.List; +import java.util.function.Function; import org.assertj.core.api.Assertions; -import org.junit.AssumptionViolatedException; -import org.junit.rules.TestRule; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; -import org.junit.runner.Runner; -import org.junit.runner.notification.RunNotifier; -import org.junit.runners.Suite; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.RunnerBuilder; -import org.junit.runners.model.Statement; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ExtensionContext.Namespace; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +43,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestUtils { @@ -124,14 +118,6 @@ public static void abort(Connection connection) { } } - public static TestRule atLeast38() { - return new BrokerVersionTestRule("3.8.0"); - } - - public static TestRule brokerIsNotRunningOnDocker() { - return new BrokerIsNotOnDocker(); - } - public static boolean isVersion37orLater(Connection connection) { return atLeastVersion("3.7.0", connection); } @@ -145,11 +131,11 @@ public static boolean isVersion310orLater(Connection connection) { } private static boolean atLeastVersion(String expectedVersion, Connection connection) { - String currentVersion = null; + return atLeastVersion(expectedVersion, currentVersion(connection.getServerProperties().get("version").toString())); + } + + private static boolean atLeastVersion(String expectedVersion, String currentVersion) { try { - currentVersion = currentVersion( - connection.getServerProperties().get("version").toString() - ); return "0.0.0".equals(currentVersion) || versionCompare(currentVersion, expectedVersion) >= 0; } catch (RuntimeException e) { LoggerFactory.getLogger(TestUtils.class).warn("Unable to parse broker version {}", currentVersion, e); @@ -310,52 +296,6 @@ public static int randomNetworkPort() throws IOException { return port; } - private static class BrokerVersionTestRule implements TestRule { - - private final String version; - - public BrokerVersionTestRule(String version) { - this.version = version; - } - - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - try (Connection c = TestUtils.connectionFactory().newConnection()) { - if (!TestUtils.atLeastVersion(version, c)) { - throw new AssumptionViolatedException("Broker version < " + version + ", skipping."); - } - } - base.evaluate(); - } - }; - } - } - - private static class BrokerIsNotOnDocker implements TestRule { - - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - try { - if (Host.isOnDocker()) { - throw new AssumptionViolatedException("Broker is running on Docker"); - } - } catch (AssumptionViolatedException e) { - throw e; - } catch (Exception e) { - throw new AssumptionViolatedException("Could not check whether broker is running on Docker or not", e); - } - base.evaluate(); - } - }; - } - } - @FunctionalInterface public interface CallableFunction { @@ -387,6 +327,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp return messageReceived; } + /* public static class DefaultTestSuite extends Suite { @@ -422,140 +363,132 @@ protected DefaultTestSuite(Class klass, List runners) } } - @Target({ElementType.METHOD}) - @Retention(RetentionPolicy.RUNTIME) - public @interface TestExecutionCondition { - - Class[] value(); + */ + public static void safeDelete(Connection connection, String queue) { + try { + Channel ch = connection.createChannel(); + ch.queueDelete(queue); + ch.close(); + } catch (Exception e) { + // OK + } } - interface ExecutionCondition { - - void check(Description description) throws Exception; - - } + private static class BaseBrokerVersionAtLeastCondition implements + org.junit.jupiter.api.extension.ExecutionCondition { - public static class BrokerAtLeast310Condition implements ExecutionCondition { + private final Function versionProvider; - private static final String VERSION = "3.10.0"; + private BaseBrokerVersionAtLeastCondition(Function versionProvider) { + this.versionProvider = versionProvider; + } @Override - public void check(Description description) throws Exception { - try (Connection c = TestUtils.connectionFactory().newConnection()) { - if (!TestUtils.atLeastVersion(VERSION, c)) { - throw new AssumptionViolatedException("Broker version < " + VERSION + ", skipping."); + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + if (!context.getTestMethod().isPresent()) { + return ConditionEvaluationResult.enabled("Apply only to methods"); + } + String expectedVersion = versionProvider.apply(context); + if (expectedVersion == null) { + return ConditionEvaluationResult.enabled("No broker version requirement"); + } else { + String brokerVersion = + context + .getRoot() + .getStore(Namespace.GLOBAL) + .getOrComputeIfAbsent( + "brokerVersion", + k -> { + try (Connection c = TestUtils.connectionFactory().newConnection()) { + return currentVersion( + c.getServerProperties().get("version").toString() + ); + } catch (Exception e) { + throw new RuntimeException(e); + } + }, + String.class); + + if (atLeastVersion(expectedVersion, brokerVersion)) { + return ConditionEvaluationResult.enabled( + "Broker version requirement met, expected " + + expectedVersion + + ", actual " + + brokerVersion); + } else { + return ConditionEvaluationResult.disabled( + "Broker version requirement not met, expected " + + expectedVersion + + ", actual " + + brokerVersion); } } } } - public static class ExecutionConditionRule implements TestRule { + private static class AnnotationBrokerVersionAtLeastCondition + extends BaseBrokerVersionAtLeastCondition { - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - Method testMethod = description.getTestClass().getDeclaredMethod(description.getMethodName()); - TestExecutionCondition conditionAnnotation = testMethod.getAnnotation( - TestExecutionCondition.class); - if (conditionAnnotation != null) { - conditionAnnotation.value()[0].getConstructor().newInstance() - .check(description); - } - base.evaluate(); - } - }; + private AnnotationBrokerVersionAtLeastCondition() { + super( + context -> { + BrokerVersionAtLeast annotation = + context.getElement().get().getAnnotation(BrokerVersionAtLeast.class); + return annotation == null ? null : annotation.value().toString(); + }); } } - public static TestRule atLeastJava11() { - return new AtLeastJavaVersion(11); - } - - private static class AtLeastJavaVersion implements TestRule { + static class BrokerVersionAtLeast310Condition extends BaseBrokerVersionAtLeastCondition { - private final int expectedMinVersion; - - private AtLeastJavaVersion(int expectedMinVersion) { - this.expectedMinVersion = expectedMinVersion; + private BrokerVersionAtLeast310Condition() { + super(context -> "3.10.0"); } + } - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - try { - int javaMajorVersion = javaMajorVersion(); - if (javaMajorVersion < expectedMinVersion) { - throw new AssumptionViolatedException("Java version is " + javaMajorVersion - + ", expecting at least " + expectedMinVersion); - } - } catch (AssumptionViolatedException e) { - throw e; - } catch (Exception e) { - throw new AssumptionViolatedException("Could determine Java version", e); - } - base.evaluate(); - } - }; - } + @Target({ElementType.TYPE, ElementType.METHOD}) + @Retention(RetentionPolicy.RUNTIME) + @Documented + @ExtendWith(AnnotationBrokerVersionAtLeastCondition.class) + public @interface BrokerVersionAtLeast { + + BrokerVersion value(); } - private static int javaMajorVersion() { - String javaVersion = System.getProperty("java.version"); - if (javaVersion == null || javaVersion.trim().isEmpty()) { - throw new IllegalStateException("JVM system property 'java.version' is undefined"); - } + public enum BrokerVersion { + RABBITMQ_3_8("3.8.0"), + RABBITMQ_3_10("3.10.0"); - if (javaVersion.startsWith("1.8")) { - return 8; - } + final String value; - try { - // from JUnit 5 JRE class - // java.lang.Runtime.version() is a static method available on Java 9+ - // that returns an instance of java.lang.Runtime.Version which has the - // following method: public int major() - Method versionMethod = Runtime.class.getMethod("version"); - Object version = versionMethod.invoke(null); - Method majorMethod = version.getClass().getMethod("major"); - int major = (int) majorMethod.invoke(version); - if (major < 9) { - throw new IllegalStateException("Invalid Java major version: " + major); - } - return major; - } catch (Exception ex) { - LOGGER.warn("Error while computing Java major version", ex); + BrokerVersion(String value) { + this.value = value; } - throw new IllegalStateException("Could not determine Java major version"); - } - public static void safeDelete(Connection connection, String queue) { - try { - Channel ch = connection.createChannel(); - ch.queueDelete(queue); - ch.close(); - } catch (Exception e) { - // OK + @Override + public String toString() { + return this.value; } } - public static class TestDescription extends TestWatcher { - - private volatile Description description; + static class DisabledIfBrokerRunningOnDockerCondition implements + org.junit.jupiter.api.extension.ExecutionCondition { @Override - protected void starting(Description d) { - description = d; - } - - public Description getDescription() { - return description; + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + if (Host.isOnDocker()) { + return ConditionEvaluationResult.enabled("Broker running on Docker"); + } else { + return ConditionEvaluationResult.enabled("Broker not running on Docker"); + } } } + @Target({ElementType.TYPE, ElementType.METHOD}) + @Retention(RetentionPolicy.RUNTIME) + @Documented + @ExtendWith(DisabledIfBrokerRunningOnDockerCondition.class) + @interface DisabledIfBrokerRunningOnDocker {} } diff --git a/src/test/java/com/rabbitmq/client/test/TestUtilsTest.java b/src/test/java/com/rabbitmq/client/test/TestUtilsTest.java index b73e8033cc..897296938d 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtilsTest.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtilsTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2017-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,7 +17,7 @@ import com.rabbitmq.client.Connection; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/com/rabbitmq/client/test/TlsUtilsTest.java b/src/test/java/com/rabbitmq/client/test/TlsUtilsTest.java index f04d22dc1c..51a1b691e1 100644 --- a/src/test/java/com/rabbitmq/client/test/TlsUtilsTest.java +++ b/src/test/java/com/rabbitmq/client/test/TlsUtilsTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,7 @@ package com.rabbitmq.client.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.security.cert.CertificateParsingException; diff --git a/src/test/java/com/rabbitmq/client/test/TrafficListenerTest.java b/src/test/java/com/rabbitmq/client/test/TrafficListenerTest.java index ebc25349d4..db8d021194 100644 --- a/src/test/java/com/rabbitmq/client/test/TrafficListenerTest.java +++ b/src/test/java/com/rabbitmq/client/test/TrafficListenerTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -21,9 +21,8 @@ import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.TrafficListener; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import java.util.List; import java.util.UUID; @@ -32,20 +31,16 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * */ -@RunWith(Parameterized.class) public class TrafficListenerTest { - @Parameterized.Parameter - public Consumer configurator; - @Parameterized.Parameters - public static Object[] data() { + static Object[] trafficListenerIsCalled() { return new Object[] { automaticRecoveryEnabled(), automaticRecoveryDisabled() }; } @@ -57,8 +52,9 @@ static Consumer automaticRecoveryDisabled() { return cf -> cf.setAutomaticRecoveryEnabled(false); } - @Test - public void trafficListenerIsCalled() throws Exception { + @ParameterizedTest + @MethodSource + public void trafficListenerIsCalled(Consumer configurator) throws Exception { ConnectionFactory cf = TestUtils.connectionFactory(); TestTrafficListener testTrafficListener = new TestTrafficListener(); cf.setTrafficListener(testTrafficListener); diff --git a/src/test/java/com/rabbitmq/client/test/TruncatedInputStreamTest.java b/src/test/java/com/rabbitmq/client/test/TruncatedInputStreamTest.java index 3adc9492a0..5d4a9d1273 100644 --- a/src/test/java/com/rabbitmq/client/test/TruncatedInputStreamTest.java +++ b/src/test/java/com/rabbitmq/client/test/TruncatedInputStreamTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,15 +16,15 @@ package com.rabbitmq.client.test; import com.rabbitmq.client.impl.TruncatedInputStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Some basic (retroactive) tests for TruncatedInputStream. @@ -40,12 +40,12 @@ public class TruncatedInputStreamTest { /** what length to truncate it to */ private static final int TRUNCATED_LENGTH = 3; - @Before public void setUp() throws Exception { + @BeforeEach public void setUp() throws Exception { InputStream baseStream = new ByteArrayInputStream(TEST_BYTES); _truncStream = new TruncatedInputStream(baseStream, TRUNCATED_LENGTH); } - @After public void tearDown() throws Exception { + @AfterEach public void tearDown() throws Exception { _truncStream = null; } diff --git a/src/test/java/com/rabbitmq/client/test/ValueOrExceptionTest.java b/src/test/java/com/rabbitmq/client/test/ValueOrExceptionTest.java index 1ae80029be..ac9a38b767 100644 --- a/src/test/java/com/rabbitmq/client/test/ValueOrExceptionTest.java +++ b/src/test/java/com/rabbitmq/client/test/ValueOrExceptionTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,9 +17,9 @@ import com.rabbitmq.utility.SensibleClone; import com.rabbitmq.utility.ValueOrException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ValueOrExceptionTest { diff --git a/src/test/java/com/rabbitmq/client/test/functional/AbstractRejectTest.java b/src/test/java/com/rabbitmq/client/test/functional/AbstractRejectTest.java index 8c87db34f1..82b8b78035 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/AbstractRejectTest.java +++ b/src/test/java/com/rabbitmq/client/test/functional/AbstractRejectTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,9 +16,9 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.Arrays; @@ -29,27 +29,32 @@ import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.QueueingConsumer; import com.rabbitmq.client.test.BrokerTestCase; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.TestInfo; abstract class AbstractRejectTest extends BrokerTestCase { protected Channel secondaryChannel; + @BeforeEach @Override - public void setUp() + public void setUp(TestInfo info) throws IOException, TimeoutException { - super.setUp(); + super.setUp(info); secondaryChannel = connection.createChannel(); } + @AfterEach @Override - public void tearDown() + public void tearDown(TestInfo info) throws IOException, TimeoutException { if (secondaryChannel != null) { secondaryChannel.abort(); secondaryChannel = null; } - super.tearDown(); + super.tearDown(info); } protected long checkDelivery(QueueingConsumer.Delivery d, diff --git a/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java b/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java index 8f2dd6675a..816d9f70f5 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java +++ b/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,7 +16,7 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.HashMap; @@ -24,12 +24,14 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.ReturnListener; import com.rabbitmq.client.test.BrokerTestCase; +import org.junit.jupiter.api.TestInfo; public class AlternateExchange extends BrokerTestCase { @@ -59,8 +61,9 @@ private static boolean[] expected(String key) { return expected; } - @Override public void setUp() throws IOException, TimeoutException { - super.setUp(); + @BeforeEach + @Override public void setUp(TestInfo info) throws IOException, TimeoutException { + super.setUp(info); channel.addReturnListener(new ReturnListener() { public void handleReturn(int replyCode, String replyText, @@ -131,7 +134,7 @@ protected void checkGet(boolean[] expected) throws IOException { for (int i = 0; i < resources.length; i++) { String q = resources[i]; GetResponse r = channel.basicGet(q, true); - assertEquals("check " + q , expected[i], r != null); + assertEquals(expected[i], r != null, "check " + q); } } diff --git a/src/test/java/com/rabbitmq/client/test/functional/BasicConsume.java b/src/test/java/com/rabbitmq/client/test/functional/BasicConsume.java index 06b5fb588f..38adbf71ee 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/BasicConsume.java +++ b/src/test/java/com/rabbitmq/client/test/functional/BasicConsume.java @@ -5,13 +5,13 @@ import com.rabbitmq.client.DefaultConsumer; import com.rabbitmq.client.Envelope; import com.rabbitmq.client.test.BrokerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @@ -27,7 +27,7 @@ public class BasicConsume extends BrokerTestCase { channel.basicConsume(q, new CountDownLatchConsumer(channel, latch)); boolean nbOfExpectedMessagesHasBeenConsumed = latch.await(1, TimeUnit.SECONDS); - assertTrue("Not all the messages have been received", nbOfExpectedMessagesHasBeenConsumed); + assertTrue(nbOfExpectedMessagesHasBeenConsumed, "Not all the messages have been received"); } static class CountDownLatchConsumer extends DefaultConsumer { diff --git a/src/test/java/com/rabbitmq/client/test/functional/BasicGet.java b/src/test/java/com/rabbitmq/client/test/functional/BasicGet.java index e64dee9e9a..0956e8cc35 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/BasicGet.java +++ b/src/test/java/com/rabbitmq/client/test/functional/BasicGet.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,16 +15,16 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AlreadyClosedException; import com.rabbitmq.client.Channel; diff --git a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java index 91a5c54d49..a478748a7d 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java +++ b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,16 +16,16 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.GetResponse; @@ -53,7 +53,7 @@ public class BindingLifecycle extends BindingLifecycleBase { channel.queuePurge(binding.q); GetResponse response = channel.basicGet(binding.q, true); - assertNull("The response SHOULD BE null", response); + assertNull(response, "The response SHOULD BE null"); deleteExchangeAndQueue(binding); } @@ -71,24 +71,24 @@ public class BindingLifecycle extends BindingLifecycleBase { GetResponse response = channel.basicGet(binding.q, false); assertFalse(response.getEnvelope().isRedeliver()); - assertNotNull("The response SHOULD NOT BE null", response); + assertNotNull(response, "The response SHOULD NOT BE null"); // If we purge the queue the unacked message should still be there on // recover. channel.queuePurge(binding.q); response = channel.basicGet(binding.q, true); - assertNull("The response SHOULD BE null", response); + assertNull(response, "The response SHOULD BE null"); channel.basicRecover(); response = channel.basicGet(binding.q, false); channel.basicRecover(); assertTrue(response.getEnvelope().isRedeliver()); - assertNotNull("The response SHOULD NOT BE null", response); + assertNotNull(response, "The response SHOULD NOT BE null"); // If we recover then purge the message should go away channel.queuePurge(binding.q); response = channel.basicGet(binding.q, true); - assertNull("The response SHOULD BE null", response); + assertNull(response, "The response SHOULD BE null"); deleteExchangeAndQueue(binding); } diff --git a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycleBase.java b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycleBase.java index 51c0e93585..c3b7995c27 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycleBase.java +++ b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycleBase.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,9 +16,9 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.TimeoutException; @@ -120,13 +120,13 @@ protected void restart() throws IOException, TimeoutException { protected void sendRoutable(Binding binding) throws IOException { channel.basicPublish(binding.x, binding.k, null, payload); GetResponse response = channel.basicGet(binding.q, true); - assertNotNull("The response should not be null", response); + assertNotNull(response, "The response should not be null"); } protected void sendUnroutable(Binding binding) throws IOException { channel.basicPublish(binding.x, binding.k, null, payload); GetResponse response = channel.basicGet(binding.q, true); - assertNull("The response SHOULD BE null", response); + assertNull(response, "The response SHOULD BE null"); } protected Binding setupExchangeAndRouteMessage(boolean durable) throws IOException { diff --git a/src/test/java/com/rabbitmq/client/test/functional/CcRoutes.java b/src/test/java/com/rabbitmq/client/test/functional/CcRoutes.java index ebb54164a3..b65d2ad740 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/CcRoutes.java +++ b/src/test/java/com/rabbitmq/client/test/functional/CcRoutes.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,11 +15,11 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.*; @@ -27,12 +27,14 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.AMQP.BasicProperties; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.test.BrokerTestCase; +import org.junit.jupiter.api.TestInfo; public class CcRoutes extends BrokerTestCase { @@ -44,8 +46,9 @@ public class CcRoutes extends BrokerTestCase { private List ccList; private List bccList; - @Override public void setUp() throws IOException, TimeoutException { - super.setUp(); + @BeforeEach + @Override public void setUp(TestInfo info) throws IOException, TimeoutException { + super.setUp(info); propsBuilder = new BasicProperties.Builder(); headers = new HashMap<>(); ccList = new ArrayList<>(); diff --git a/src/test/java/com/rabbitmq/client/test/functional/ClusteredTestBase.java b/src/test/java/com/rabbitmq/client/test/functional/ClusteredTestBase.java index 06f53f715a..2580ed0daf 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ClusteredTestBase.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ClusteredTestBase.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/test/functional/Confirm.java b/src/test/java/com/rabbitmq/client/test/functional/Confirm.java index 0c427bd261..0dbf5950c8 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Confirm.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Confirm.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,8 +16,10 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.*; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; @@ -35,6 +37,7 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.concurrent.TimeoutException; +import org.junit.jupiter.api.TestInfo; public class Confirm extends BrokerTestCase { @@ -42,9 +45,10 @@ public class Confirm extends BrokerTestCase private static final String TTL_ARG = "x-message-ttl"; + @BeforeEach @Override - public void setUp() throws IOException, TimeoutException { - super.setUp(); + public void setUp(TestInfo info) throws IOException, TimeoutException { + super.setUp(info); channel.confirmSelect(); channel.queueDeclare("confirm-test", true, true, false, null); channel.queueDeclare("confirm-durable-nonexclusive", true, false, diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConnectionOpen.java b/src/test/java/com/rabbitmq/client/test/functional/ConnectionOpen.java index 22fe19e326..646f9e054d 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ConnectionOpen.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ConnectionOpen.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,9 +16,9 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.DataInputStream; import java.io.IOException; @@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException; import com.rabbitmq.client.test.TestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.ConnectionFactory; @@ -49,13 +49,12 @@ public class ConnectionOpen { while (!command.handleFrame(fh.readFrame())) { } Method m = command.getMethod(); - assertTrue("First command must be Connection.start", - m instanceof AMQP.Connection.Start); + assertTrue(m instanceof AMQP.Connection.Start, "First command must be Connection.start"); AMQP.Connection.Start start = (AMQP.Connection.Start) m; - assertTrue("Version in Connection.start is <= what we sent", - start.getVersionMajor() < AMQP.PROTOCOL.MAJOR || + assertTrue(start.getVersionMajor() < AMQP.PROTOCOL.MAJOR || (start.getVersionMajor() == AMQP.PROTOCOL.MAJOR && - start.getVersionMinor() <= AMQP.PROTOCOL.MINOR)); + start.getVersionMinor() <= AMQP.PROTOCOL.MINOR), + "Version in Connection.start is <= what we sent"); } @Test public void crazyProtocolHeader() throws IOException { diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java index f74ca5e3ae..0f9ff4a055 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -23,7 +23,7 @@ import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; import com.rabbitmq.tools.Host; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java b/src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java index 1c68176d76..7d8631a100 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -20,7 +20,7 @@ import com.rabbitmq.client.DefaultConsumer; import com.rabbitmq.client.ShutdownSignalException; import com.rabbitmq.client.test.BrokerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.concurrent.ArrayBlockingQueue; @@ -28,8 +28,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ConsumerCancelNotification extends BrokerTestCase { diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConsumerCount.java b/src/test/java/com/rabbitmq/client/test/functional/ConsumerCount.java index b0ba1c3206..eca4b57c48 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ConsumerCount.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ConsumerCount.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,11 +15,11 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.DefaultConsumer; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConsumerPriorities.java b/src/test/java/com/rabbitmq/client/test/functional/ConsumerPriorities.java index 10bde1f0f1..db0ebc1212 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ConsumerPriorities.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ConsumerPriorities.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,10 +16,10 @@ package com.rabbitmq.client.test.functional; import com.rabbitmq.client.test.BrokerTestCase; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.Arrays; @@ -75,15 +75,15 @@ private void assertFailValidation(Map args) throws IOException { assertContents(highConsumer, COUNT, "high"); channel.basicCancel(high); assertTrue( - "High priority consumer should have been cancelled", - highConsumer.cancelLatch.await(CANCEL_OK_TIMEOUT_MS, TimeUnit.MILLISECONDS) + highConsumer.cancelLatch.await(CANCEL_OK_TIMEOUT_MS, TimeUnit.MILLISECONDS), + "High priority consumer should have been cancelled" ); publish(queue, COUNT, "med"); assertContents(medConsumer, COUNT, "med"); channel.basicCancel(med); assertTrue( - "Medium priority consumer should have been cancelled", - medConsumer.cancelLatch.await(CANCEL_OK_TIMEOUT_MS, TimeUnit.MILLISECONDS) + medConsumer.cancelLatch.await(CANCEL_OK_TIMEOUT_MS, TimeUnit.MILLISECONDS), + "Medium priority consumer should have been cancelled" ); publish(queue, COUNT, "low"); assertContents(lowConsumer, COUNT, "low"); diff --git a/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java b/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java index b88794cc06..5ac9e20895 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java +++ b/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java @@ -20,7 +20,7 @@ import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.*; @@ -29,7 +29,7 @@ import static com.rabbitmq.client.test.TestUtils.safeDelete; import static com.rabbitmq.client.test.TestUtils.waitAtMost; import static java.time.Duration.ofSeconds; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DeadLetterExchange extends BrokerTestCase { @@ -424,8 +424,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, return responseRefeference.get() != null; }); GetResponse getResponse = responseRefeference.get(); - assertNotNull("Message not dead-lettered", - getResponse); + assertNotNull(getResponse, "Message not dead-lettered"); assertEquals("test message", new String(getResponse.getBody())); BasicProperties props = getResponse.getProps(); Map headers = props.getHeaders(); @@ -459,7 +458,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, return responseRefeference.get() != null; }); getResponse = responseRefeference.get(); - assertNotNull("Message not dead-lettered", getResponse); + assertNotNull(getResponse, "Message not dead-lettered"); assertEquals("test message", new String(getResponse.getBody())); headers = getResponse.getProps().getHeaders(); assertNotNull(headers); @@ -488,7 +487,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, }); getResponse = responseRefeference.get(); - assertNotNull("Message not dead-lettered", getResponse); + assertNotNull(getResponse, "Message not dead-lettered"); assertEquals("test message", new String(getResponse.getBody())); headers = getResponse.getProps().getHeaders(); assertNotNull(headers); @@ -587,14 +586,14 @@ private void checkPromptArrival(AccumulatingMessageConsumer c, long epsilon = TTL / 5; for (int i = 0; i < count; i++) { byte[] body = c.nextDelivery(TTL + TTL + latency + epsilon); - assertNotNull("message #" + i + " did not expire", body); + assertNotNull(body, "message #" + i + " did not expire"); long now = System.currentTimeMillis(); long publishTime = Long.valueOf(new String(body)); long targetTime = publishTime + TTL + latency; - assertTrue("expiry outside bounds (+/- " + epsilon + "): " + - (now - targetTime), - (now >= targetTime - epsilon) && - (now <= targetTime + epsilon)); + assertTrue((now >= targetTime - epsilon) && + (now <= targetTime + epsilon), + "expiry outside bounds (+/- " + epsilon + "): " + + (now - targetTime)); } } @@ -666,13 +665,12 @@ private static void consumeN(Channel channel, String queue, int n, WithResponse for(int x = 0; x < n; x++) { GetResponse getResponse = channel.basicGet(queue, true); - assertNotNull("Messages not dead-lettered (" + (n-x) + " left)", - getResponse); + assertNotNull(getResponse, "Messages not dead-lettered (" + (n-x) + " left)"); assertEquals("test message", new String(getResponse.getBody())); withResponse.process(getResponse); } GetResponse getResponse = channel.basicGet(queue, true); - assertNull("expected empty queue", getResponse); + assertNull(getResponse, "expected empty queue"); } @SuppressWarnings("unchecked") diff --git a/src/test/java/com/rabbitmq/client/test/functional/DefaultExchange.java b/src/test/java/com/rabbitmq/client/test/functional/DefaultExchange.java index 7d0e9f7899..72c2793f9b 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/DefaultExchange.java +++ b/src/test/java/com/rabbitmq/client/test/functional/DefaultExchange.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,11 +15,11 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/DirectReplyTo.java b/src/test/java/com/rabbitmq/client/test/functional/DirectReplyTo.java index 2cef783ba1..84911f447c 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/DirectReplyTo.java +++ b/src/test/java/com/rabbitmq/client/test/functional/DirectReplyTo.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,11 +15,11 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.BlockingQueue; @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; import com.rabbitmq.client.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.test.BrokerTestCase; @@ -92,7 +92,7 @@ private void declare(Connection connection, String q, boolean expectedExists) th } } - @Test public void consumeSuccess() throws IOException, InterruptedException { + @Test public void consumeSuccess() throws IOException { DefaultConsumer c = new DefaultConsumer(channel); String ctag = channel.basicConsume(QUEUE, true, c); channel.basicCancel(ctag); diff --git a/src/test/java/com/rabbitmq/client/test/functional/DoubleDeletion.java b/src/test/java/com/rabbitmq/client/test/functional/DoubleDeletion.java index 14f6dee293..c28bab794c 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/DoubleDeletion.java +++ b/src/test/java/com/rabbitmq/client/test/functional/DoubleDeletion.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -18,7 +18,7 @@ import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java index cfc00d7b0a..3732ff55ac 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java +++ b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,11 +16,11 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.MessageProperties; diff --git a/src/test/java/com/rabbitmq/client/test/functional/ExceptionHandling.java b/src/test/java/com/rabbitmq/client/test/functional/ExceptionHandling.java index 611a8eea82..700a6dda52 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ExceptionHandling.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ExceptionHandling.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,8 +15,8 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.CountDownLatch; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException; import com.rabbitmq.client.test.TestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; diff --git a/src/test/java/com/rabbitmq/client/test/functional/ExceptionMessages.java b/src/test/java/com/rabbitmq/client/test/functional/ExceptionMessages.java index 68f4da2204..672db4dfa8 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ExceptionMessages.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ExceptionMessages.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,13 +15,13 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AlreadyClosedException; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeclare.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeclare.java index 7c1e6f2e76..b6976ee873 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeclare.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeclare.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,7 +16,7 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.HashMap; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException; import com.rabbitmq.client.test.TestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.BuiltinExchangeType; import com.rabbitmq.client.Channel; @@ -101,7 +101,7 @@ public void releaseResources() throws IOException { } private void doTestExchangeDeclaredWithEnumerationEquivalent(Channel channel) throws IOException, InterruptedException { - assertEquals("There are 4 standard exchange types", 4, BuiltinExchangeType.values().length); + assertEquals(4, BuiltinExchangeType.values().length, "There are 4 standard exchange types"); for (BuiltinExchangeType exchangeType : BuiltinExchangeType.values()) { channel.exchangeDeclare(NAME, exchangeType); verifyEquivalent(NAME, exchangeType.getType(), false, false, null); diff --git a/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java index bbaf6b323c..299d95567f 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,12 +16,12 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeletePredeclared.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeletePredeclared.java index 28d4d667f6..4229c888ed 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeletePredeclared.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ExchangeDeletePredeclared.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/test/functional/ExchangeEquivalenceBase.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeEquivalenceBase.java index 830a2b89e5..cfeed037d4 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ExchangeEquivalenceBase.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ExchangeEquivalenceBase.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,7 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.Map; diff --git a/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindings.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindings.java index cc50182001..3416b334d6 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindings.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindings.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,12 +16,12 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.QueueingConsumer; import com.rabbitmq.client.QueueingConsumer.Delivery; diff --git a/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindingsAutoDelete.java b/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindingsAutoDelete.java index ff8cb0a846..a6f01e20c4 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindingsAutoDelete.java +++ b/src/test/java/com/rabbitmq/client/test/functional/ExchangeExchangeBindingsAutoDelete.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,11 +16,11 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/FrameMax.java b/src/test/java/com/rabbitmq/client/test/functional/FrameMax.java index bfe1bcd826..bafceed32d 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/FrameMax.java +++ b/src/test/java/com/rabbitmq/client/test/functional/FrameMax.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,9 +16,9 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -32,7 +32,7 @@ import com.rabbitmq.client.impl.AMQBasicProperties; import com.rabbitmq.client.test.TestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Address; diff --git a/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java b/src/test/java/com/rabbitmq/client/test/functional/FunctionalTestSuite.java similarity index 84% rename from src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java rename to src/test/java/com/rabbitmq/client/test/functional/FunctionalTestSuite.java index 892f4977ba..bbf06691e1 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/FunctionalTests.java +++ b/src/test/java/com/rabbitmq/client/test/functional/FunctionalTestSuite.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,14 +17,12 @@ package com.rabbitmq.client.test.functional; import com.rabbitmq.client.impl.WorkPoolTests; -import com.rabbitmq.client.test.AbstractRMQTestSuite; import com.rabbitmq.client.test.Bug20004Test; -import com.rabbitmq.client.test.RequiredPropertiesSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(RequiredPropertiesSuite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ ConnectionOpen.class, Heartbeat.class, Tables.class, @@ -81,11 +79,6 @@ TopologyRecoveryFiltering.class, TopologyRecoveryRetry.class }) -public class FunctionalTests { - - // initialize system properties - static{ - new AbstractRMQTestSuite(){}; - } +public class FunctionalTestSuite { } diff --git a/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java b/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java index c82ed749b6..49b0779c8c 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java +++ b/src/test/java/com/rabbitmq/client/test/functional/HeadersExchangeValidation.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,13 +15,13 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import com.rabbitmq.client.test.TestUtils; import java.io.IOException; import java.util.HashMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; diff --git a/src/test/java/com/rabbitmq/client/test/functional/Heartbeat.java b/src/test/java/com/rabbitmq/client/test/functional/Heartbeat.java index 62611f2a35..002c60b487 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Heartbeat.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Heartbeat.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -19,11 +19,11 @@ import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.impl.recovery.AutorecoveringConnection; import com.rabbitmq.client.test.BrokerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class Heartbeat extends BrokerTestCase { diff --git a/src/test/java/com/rabbitmq/client/test/functional/InternalExchange.java b/src/test/java/com/rabbitmq/client/test/functional/InternalExchange.java index 43a571afc8..12bfc7c76d 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/InternalExchange.java +++ b/src/test/java/com/rabbitmq/client/test/functional/InternalExchange.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,12 +16,12 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.GetResponse; diff --git a/src/test/java/com/rabbitmq/client/test/functional/InvalidAcks.java b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcks.java index 217c55e1c9..08dc083f6f 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/InvalidAcks.java +++ b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcks.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksBase.java b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksBase.java index 1c249007bd..f24e848c63 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksBase.java +++ b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksBase.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -20,7 +20,7 @@ import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * See bug 21846: diff --git a/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksTx.java b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksTx.java index 81fc7e61f7..2df62e23ed 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksTx.java +++ b/src/test/java/com/rabbitmq/client/test/functional/InvalidAcksTx.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/test/functional/MessageCount.java b/src/test/java/com/rabbitmq/client/test/functional/MessageCount.java index 3cb81344af..8ccef02846 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/MessageCount.java +++ b/src/test/java/com/rabbitmq/client/test/functional/MessageCount.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,11 +15,11 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/Metrics.java b/src/test/java/com/rabbitmq/client/test/functional/Metrics.java index fdd8d64c00..0c745ebdff 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Metrics.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Metrics.java @@ -31,9 +31,7 @@ import com.rabbitmq.client.test.TestUtils; import com.rabbitmq.tools.Host; import java.util.UUID; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.lang.reflect.Field; @@ -49,6 +47,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import static com.rabbitmq.client.test.TestUtils.waitAtMost; import static org.assertj.core.api.Assertions.assertThat; @@ -56,17 +56,12 @@ /** * */ -@RunWith(Parameterized.class) public class Metrics extends BrokerTestCase { - @Parameterized.Parameters public static Object[] data() { return new Object[] { createConnectionFactory(), createAutoRecoveryConnectionFactory() }; } - @Parameterized.Parameter - public ConnectionFactory connectionFactory; - static final String QUEUE = "metrics.queue"; @Override @@ -79,7 +74,9 @@ protected void releaseResources() throws IOException { channel.queueDelete(QUEUE); } - @Test public void metrics() throws IOException, TimeoutException { + @ParameterizedTest + @MethodSource("data") + public void metrics(ConnectionFactory connectionFactory) throws IOException, TimeoutException { StandardMetricsCollector metrics = new StandardMetricsCollector(); connectionFactory.setMetricsCollector(metrics); Connection connection1 = null; @@ -138,7 +135,9 @@ protected void releaseResources() throws IOException { } } - @Test public void metricsPublisherUnrouted() throws IOException, TimeoutException { + @ParameterizedTest + @MethodSource("data") + public void metricsPublisherUnrouted(ConnectionFactory connectionFactory) throws IOException, TimeoutException { StandardMetricsCollector metrics = new StandardMetricsCollector(); connectionFactory.setMetricsCollector(metrics); Connection connection = null; @@ -162,7 +161,9 @@ protected void releaseResources() throws IOException { } } - @Test public void metricsPublisherAck() throws IOException, TimeoutException, InterruptedException { + @ParameterizedTest + @MethodSource("data") + public void metricsPublisherAck(ConnectionFactory connectionFactory) throws IOException, TimeoutException, InterruptedException { StandardMetricsCollector metrics = new StandardMetricsCollector(); connectionFactory.setMetricsCollector(metrics); Connection connection = null; @@ -182,7 +183,9 @@ protected void releaseResources() throws IOException { } } - @Test public void metricsAck() throws IOException, TimeoutException { + @ParameterizedTest + @MethodSource("data") + public void metricsAck(ConnectionFactory connectionFactory) throws IOException, TimeoutException { StandardMetricsCollector metrics = new StandardMetricsCollector(); connectionFactory.setMetricsCollector(metrics); @@ -248,7 +251,9 @@ protected void releaseResources() throws IOException { } } - @Test public void metricsReject() throws IOException, TimeoutException { + @ParameterizedTest + @MethodSource("data") + public void metricsReject(ConnectionFactory connectionFactory) throws IOException, TimeoutException { StandardMetricsCollector metrics = new StandardMetricsCollector(); connectionFactory.setMetricsCollector(metrics); @@ -275,7 +280,9 @@ protected void releaseResources() throws IOException { } } - @Test public void multiThreadedMetricsStandardConnection() throws InterruptedException, TimeoutException, IOException { + @ParameterizedTest + @MethodSource("data") + public void multiThreadedMetricsStandardConnection(ConnectionFactory connectionFactory) throws InterruptedException, TimeoutException, IOException { StandardMetricsCollector metrics = new StandardMetricsCollector(); connectionFactory.setMetricsCollector(metrics); int nbConnections = 3; @@ -385,7 +392,9 @@ protected void releaseResources() throws IOException { } } - @Test public void errorInChannel() throws IOException, TimeoutException { + @ParameterizedTest + @MethodSource("data") + public void errorInChannel(ConnectionFactory connectionFactory) throws IOException, TimeoutException { StandardMetricsCollector metrics = new StandardMetricsCollector(); connectionFactory.setMetricsCollector(metrics); diff --git a/src/test/java/com/rabbitmq/client/test/functional/Nack.java b/src/test/java/com/rabbitmq/client/test/functional/Nack.java index ce9b70ddd0..6bd47e6067 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Nack.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Nack.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,8 +16,8 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.rabbitmq.client.Channel; import com.rabbitmq.client.test.TestUtils; @@ -27,17 +27,14 @@ import java.util.Set; import java.util.UUID; -import org.junit.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.QueueingConsumer; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) public class Nack extends AbstractRejectTest { - @Parameterized.Parameters public static Object[] queueCreators() { return new Object[] { (CallableFunction) channel -> { @@ -52,9 +49,9 @@ public static Object[] queueCreators() { }}; } - @Parameterized.Parameter public TestUtils.CallableFunction queueCreator; - - @Test public void singleNack() throws Exception { + @ParameterizedTest + @MethodSource("queueCreators") + public void singleNack(TestUtils.CallableFunction queueCreator) throws Exception { String q = queueCreator.apply(channel); byte[] m1 = "1".getBytes(); @@ -89,7 +86,9 @@ public static Object[] queueCreators() { expectError(AMQP.PRECONDITION_FAILED); } - @Test public void multiNack() throws Exception { + @ParameterizedTest + @MethodSource("queueCreators") + public void multiNack(TestUtils.CallableFunction queueCreator) throws Exception { String q = queueCreator.apply(channel); byte[] m1 = "1".getBytes(); @@ -134,7 +133,9 @@ public static Object[] queueCreators() { expectError(AMQP.PRECONDITION_FAILED); } - @Test public void nackAll() throws Exception { + @ParameterizedTest + @MethodSource("queueCreators") + public void nackAll(TestUtils.CallableFunction queueCreator) throws Exception { String q = queueCreator.apply(channel); byte[] m1 = "1".getBytes(); @@ -173,7 +174,7 @@ private long checkDeliveries(QueueingConsumer c, byte[]... messages) for(int x = 0; x < messages.length; x++) { QueueingConsumer.Delivery delivery = c.nextDelivery(); String m = new String(delivery.getBody()); - assertTrue("Unexpected message", msgSet.remove(m)); + assertTrue(msgSet.remove(m), "Unexpected message"); checkDelivery(delivery, m.getBytes(), true); lastTag = delivery.getEnvelope().getDeliveryTag(); } diff --git a/src/test/java/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java b/src/test/java/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java index 41d68d94d5..f93f8f591b 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java +++ b/src/test/java/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,16 +16,16 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import com.rabbitmq.client.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/Nowait.java b/src/test/java/com/rabbitmq/client/test/functional/Nowait.java index 5f713fff61..b795f02482 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Nowait.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Nowait.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/test/functional/PerConsumerPrefetch.java b/src/test/java/com/rabbitmq/client/test/functional/PerConsumerPrefetch.java index 4a36a22052..51149c613f 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/PerConsumerPrefetch.java +++ b/src/test/java/com/rabbitmq/client/test/functional/PerConsumerPrefetch.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.QueueingConsumer; diff --git a/src/test/java/com/rabbitmq/client/test/functional/PerMessageTTL.java b/src/test/java/com/rabbitmq/client/test/functional/PerMessageTTL.java index 1a93e6abe4..2b6bb3ed99 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/PerMessageTTL.java +++ b/src/test/java/com/rabbitmq/client/test/functional/PerMessageTTL.java @@ -16,12 +16,12 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.MessageProperties; @@ -58,8 +58,8 @@ protected AMQP.Queue.DeclareOk declareQueue(String name, Object ttlValue) throws QueueingConsumer c = new QueueingConsumer(channel); channel.basicConsume(TTL_QUEUE_NAME, c); - assertNotNull("Message unexpectedly expired", c.nextDelivery(100)); - assertNull("Message should have been expired!!", c.nextDelivery(100)); + assertNotNull(c.nextDelivery(100), "Message unexpectedly expired"); + assertNull(c.nextDelivery(100), "Message should have been expired!!"); } @Test public void restartingExpiry() throws Exception { @@ -74,7 +74,7 @@ protected AMQP.Queue.DeclareOk declareQueue(String name, Object ttlValue) throws restart(); Thread.sleep(Integer.parseInt(expiryDelay)); try { - assertNull("Message should have expired after broker restart", get()); + assertNull(get(), "Message should have expired after broker restart"); } finally { deleteQueue(TTL_QUEUE_NAME); } diff --git a/src/test/java/com/rabbitmq/client/test/functional/PerQueueTTL.java b/src/test/java/com/rabbitmq/client/test/functional/PerQueueTTL.java index 506ea50c8f..177a67cd58 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/PerQueueTTL.java +++ b/src/test/java/com/rabbitmq/client/test/functional/PerQueueTTL.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,13 +16,13 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.Collections; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.MessageProperties; diff --git a/src/test/java/com/rabbitmq/client/test/functional/PerQueueVsPerMessageTTL.java b/src/test/java/com/rabbitmq/client/test/functional/PerQueueVsPerMessageTTL.java index 58475877be..e835b42c0f 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/PerQueueVsPerMessageTTL.java +++ b/src/test/java/com/rabbitmq/client/test/functional/PerQueueVsPerMessageTTL.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,13 +15,13 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.util.Collections; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; @@ -35,7 +35,7 @@ public class PerQueueVsPerMessageTTL extends PerMessageTTL { Thread.sleep(100); - assertNull("per-queue ttl should have removed message after 10ms!", get()); + assertNull(get(), "per-queue ttl should have removed message after 10ms"); } @Override diff --git a/src/test/java/com/rabbitmq/client/test/functional/Policies.java b/src/test/java/com/rabbitmq/client/test/functional/Policies.java index f4d1dd4988..602e2b57c4 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Policies.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Policies.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,9 +15,9 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.HashMap; @@ -25,12 +25,11 @@ import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.Channel; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.test.BrokerTestCase; -import com.rabbitmq.client.test.server.HATests; import com.rabbitmq.tools.Host; public class Policies extends BrokerTestCase { @@ -184,7 +183,7 @@ private void setPolicy(String name, String pattern, String definition) throws IO // We need to override the HA policy that we use in HATests, so // priority 1. But we still want a valid test of HA, so add the // ha-mode definition. - if (HATests.HA_TESTS_RUNNING) { + if (ha()) { definition += ",\"ha-mode\":\"all\""; } Host.rabbitmqctl("set_policy --priority 1 " + name + " " + pattern + diff --git a/src/test/java/com/rabbitmq/client/test/functional/QosTests.java b/src/test/java/com/rabbitmq/client/test/functional/QosTests.java index 276a363f4e..b14d5526c3 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/QosTests.java +++ b/src/test/java/com/rabbitmq/client/test/functional/QosTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,10 +16,10 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.ArrayList; @@ -31,7 +31,7 @@ import java.util.Map; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; diff --git a/src/test/java/com/rabbitmq/client/test/functional/QueueExclusivity.java b/src/test/java/com/rabbitmq/client/test/functional/QueueExclusivity.java index 6148ebab27..83df293a10 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/QueueExclusivity.java +++ b/src/test/java/com/rabbitmq/client/test/functional/QueueExclusivity.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,13 +16,13 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.HashMap; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; diff --git a/src/test/java/com/rabbitmq/client/test/functional/QueueLease.java b/src/test/java/com/rabbitmq/client/test/functional/QueueLease.java index 284f6bd67d..46a31f8b3e 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/QueueLease.java +++ b/src/test/java/com/rabbitmq/client/test/functional/QueueLease.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,13 +16,13 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Consumer; diff --git a/src/test/java/com/rabbitmq/client/test/functional/QueueLifecycle.java b/src/test/java/com/rabbitmq/client/test/functional/QueueLifecycle.java index 8ee54671dc..ceedb520ad 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/QueueLifecycle.java +++ b/src/test/java/com/rabbitmq/client/test/functional/QueueLifecycle.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -20,14 +20,14 @@ import com.rabbitmq.client.Consumer; import com.rabbitmq.client.DefaultConsumer; import com.rabbitmq.client.test.BrokerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test queue auto-delete and exclusive semantics. diff --git a/src/test/java/com/rabbitmq/client/test/functional/QueueSizeLimit.java b/src/test/java/com/rabbitmq/client/test/functional/QueueSizeLimit.java index 8d34862543..c0c9350173 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/QueueSizeLimit.java +++ b/src/test/java/com/rabbitmq/client/test/functional/QueueSizeLimit.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,9 +16,9 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.util.ArrayList; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/Recover.java b/src/test/java/com/rabbitmq/client/test/functional/Recover.java index 61d48973ce..a83c75c9ca 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Recover.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Recover.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,10 +16,10 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.Arrays; @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicReference; import com.rabbitmq.client.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.test.BrokerTestCase; @@ -56,14 +56,12 @@ void verifyRedeliverOnRecover(RecoverCallback call) channel.basicConsume(queue, false, consumer); // require acks. channel.basicPublish("", queue, new AMQP.BasicProperties.Builder().build(), body); QueueingConsumer.Delivery delivery = consumer.nextDelivery(); - assertTrue("consumed message body not as sent", - Arrays.equals(body, delivery.getBody())); + assertTrue(Arrays.equals(body, delivery.getBody()), "consumed message body not as sent"); // Don't ack it, and get it redelivered to the same consumer call.recover(channel); QueueingConsumer.Delivery secondDelivery = consumer.nextDelivery(5000); - assertNotNull("timed out waiting for redelivered message", secondDelivery); - assertTrue("consumed (redelivered) message body not as sent", - Arrays.equals(body, delivery.getBody())); + assertNotNull(secondDelivery, "timed out waiting for redelivered message"); + assertTrue(Arrays.equals(body, delivery.getBody()), "consumed (redelivered) message body not as sent"); } void verifyNoRedeliveryWithAutoAck(RecoverCallback call) @@ -80,10 +78,9 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp channel.basicConsume(queue, true, consumer); // auto ack. channel.basicPublish("", queue, new AMQP.BasicProperties.Builder().build(), body); assertTrue(latch.await(5, TimeUnit.SECONDS)); - assertTrue("consumed message body not as sent", - Arrays.equals(body, bodyReference.get())); + assertTrue(Arrays.equals(body, bodyReference.get()), "consumed message body not as sent"); call.recover(channel); - assertNull("should be no message available", channel.basicGet(queue, true)); + assertNull(channel.basicGet(queue, true), "should be no message available"); } final RecoverCallback recoverSync = new RecoverCallback() { diff --git a/src/test/java/com/rabbitmq/client/test/functional/Reject.java b/src/test/java/com/rabbitmq/client/test/functional/Reject.java index c2c5dd76bd..b8abaf0779 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Reject.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Reject.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,7 +16,7 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import com.rabbitmq.client.Channel; import com.rabbitmq.client.test.TestUtils; @@ -24,19 +24,16 @@ import java.util.Collections; import java.util.UUID; -import org.junit.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.QueueingConsumer; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) public class Reject extends AbstractRejectTest { - @Parameterized.Parameters - public static Object[] queueCreators() { + public static Object[] reject() { return new Object[] { (CallableFunction) channel -> { String q = UUID.randomUUID().toString(); @@ -50,9 +47,9 @@ public static Object[] queueCreators() { }}; } - @Parameterized.Parameter public TestUtils.CallableFunction queueCreator; - - @Test public void reject() + @ParameterizedTest + @MethodSource + public void reject(TestUtils.CallableFunction queueCreator) throws Exception { String q = queueCreator.apply(channel); diff --git a/src/test/java/com/rabbitmq/client/test/functional/RequeueOnChannelClose.java b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnChannelClose.java index 8e6c0c6f9e..250b74acf0 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/RequeueOnChannelClose.java +++ b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnChannelClose.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/test/functional/RequeueOnClose.java b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnClose.java index e86ed31bdf..7fee64f715 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/RequeueOnClose.java +++ b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnClose.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,8 +15,8 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.*; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.test.BrokerTestCase; @@ -84,9 +84,9 @@ private void publishAndGet(int count, boolean doAck) close(); open(); if (doAck) { - assertNull("Expected missing second basicGet (repeat="+repeat+")", getMessage()); + assertNull(getMessage(), "Expected missing second basicGet (repeat="+repeat+")"); } else { - assertNotNull("Expected present second basicGet (repeat="+repeat+")", getMessage()); + assertNotNull(getMessage(), "Expected present second basicGet (repeat="+repeat+")"); } close(); } @@ -146,10 +146,10 @@ private void publishLotsAndGet() close(); open(); for (int i = 0; i < MESSAGE_COUNT; i++) { - assertNotNull("only got " + i + " out of " + MESSAGE_COUNT + - " messages", channel.basicGet(Q, true)); + assertNotNull(channel.basicGet(Q, true), "only got " + i + " out of " + MESSAGE_COUNT + + " messages"); } - assertNull("got more messages than " + MESSAGE_COUNT + " expected", channel.basicGet(Q, true)); + assertNull(channel.basicGet(Q, true), "got more messages than " + MESSAGE_COUNT + " expected"); channel.queueDelete(Q); close(); closeConnection(); @@ -232,14 +232,13 @@ private void publishLotsAndConsumeSome(boolean ack, boolean cancelBeforeFinish) open(); int requeuedMsgCount = (ack) ? MESSAGE_COUNT - MESSAGES_TO_CONSUME : MESSAGE_COUNT; for (int i = 0; i < requeuedMsgCount; i++) { - assertNotNull("only got " + i + " out of " + requeuedMsgCount + " messages", - channel.basicGet(Q, true)); + assertNotNull(channel.basicGet(Q, true), "only got " + i + " out of " + requeuedMsgCount + " messages"); } int countMoreMsgs = 0; while (null != channel.basicGet(Q, true)) { countMoreMsgs++; } - assertTrue("got " + countMoreMsgs + " more messages than " + requeuedMsgCount + " expected", 0==countMoreMsgs); + assertTrue(0==countMoreMsgs, "got " + countMoreMsgs + " more messages than " + requeuedMsgCount + " expected"); channel.queueDelete(Q); close(); closeConnection(); diff --git a/src/test/java/com/rabbitmq/client/test/functional/RequeueOnConnectionClose.java b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnConnectionClose.java index c212512a95..126c1bd71a 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/RequeueOnConnectionClose.java +++ b/src/test/java/com/rabbitmq/client/test/functional/RequeueOnConnectionClose.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/client/test/functional/Routing.java b/src/test/java/com/rabbitmq/client/test/functional/Routing.java index 30a643a918..9f681d75e6 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Routing.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Routing.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,14 +16,13 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; -import com.rabbitmq.client.test.TestUtils.BrokerAtLeast310Condition; -import com.rabbitmq.client.test.TestUtils.ExecutionConditionRule; -import com.rabbitmq.client.test.TestUtils.TestExecutionCondition; +import com.rabbitmq.client.test.TestUtils.BrokerVersion; +import com.rabbitmq.client.test.TestUtils.BrokerVersionAtLeast; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -31,8 +30,7 @@ import java.util.Map; import java.util.concurrent.TimeoutException; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.AlreadyClosedException; @@ -40,13 +38,10 @@ import com.rabbitmq.client.ReturnListener; import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.utility.BlockingCell; -import org.junit.rules.TestRule; public class Routing extends BrokerTestCase { - @Rule public TestRule executionConditionRule = new ExecutionConditionRule(); - protected final String E = "MRDQ"; protected final String Q1 = "foo"; protected final String Q2 = "bar"; @@ -253,7 +248,7 @@ private void checkGet(String queue, boolean messageExpected) } @Test - @TestExecutionCondition(BrokerAtLeast310Condition.class) + @BrokerVersionAtLeast(BrokerVersion.RABBITMQ_3_10) public void headersWithXRouting() throws Exception { Map spec = new HashMap(); spec.put("x-key-1", "value-1"); diff --git a/src/test/java/com/rabbitmq/client/test/functional/SaslMechanisms.java b/src/test/java/com/rabbitmq/client/test/functional/SaslMechanisms.java index 631d21a2a5..c40718f732 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/SaslMechanisms.java +++ b/src/test/java/com/rabbitmq/client/test/functional/SaslMechanisms.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,7 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.Arrays; @@ -23,7 +23,7 @@ import java.util.concurrent.TimeoutException; import com.rabbitmq.client.test.TestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AuthenticationFailureException; import com.rabbitmq.client.Connection; diff --git a/src/test/java/com/rabbitmq/client/test/functional/TTLHandling.java b/src/test/java/com/rabbitmq/client/test/functional/TTLHandling.java index c07a675882..8d50b7e059 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/TTLHandling.java +++ b/src/test/java/com/rabbitmq/client/test/functional/TTLHandling.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,15 +15,15 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import com.rabbitmq.client.ShutdownSignalException; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.GetResponse; @@ -112,7 +112,7 @@ protected void releaseResources() throws IOException { Thread.sleep(1000); String what = get(); - assertNull("expected message " + what + " to have been removed", what); + assertNull(what, "expected message " + what + " to have been removed"); } @Test public void publishAndGetWithExpiry() throws Exception { @@ -183,7 +183,7 @@ protected void releaseResources() throws IOException { Thread.sleep(150); openChannel(); - assertNull("Re-queued message not expired", get()); + assertNull(get(), "Re-queued message not expired"); } @Test public void zeroTTLDelivery() throws Exception { diff --git a/src/test/java/com/rabbitmq/client/test/functional/Tables.java b/src/test/java/com/rabbitmq/client/test/functional/Tables.java index 6f8f1854a8..a1e405c7f8 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Tables.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Tables.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,8 +16,8 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.math.BigDecimal; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.AMQP.BasicProperties; @@ -87,18 +87,17 @@ private static void assertMapsEqual(Map a, Object va = a.get(k); Object vb = b.get(k); if (va instanceof byte[] && vb instanceof byte[]) { - assertTrue("unequal entry for key " + k, - Arrays.equals((byte[])va, (byte[])vb)); + assertTrue(Arrays.equals((byte[])va, (byte[])vb), "unequal entry for key " + k); } else if (va instanceof List && vb instanceof List) { Iterator vbi = ((List)vb).iterator(); for (Object vaEntry : (List)va) { Object vbEntry = vbi.next(); - assertEquals("arrays unequal at key " + k, vaEntry, vbEntry); + assertEquals(vaEntry, vbEntry, "arrays unequal at key " + k); } } else { - assertEquals("unequal entry for key " + k, va, vb); + assertEquals(va, vb, "unequal entry for key " + k); } } } diff --git a/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryFiltering.java b/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryFiltering.java index 3879359959..1af68242b4 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryFiltering.java +++ b/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryFiltering.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -30,7 +30,7 @@ import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.Duration; @@ -40,8 +40,8 @@ import java.util.concurrent.atomic.AtomicInteger; import static com.rabbitmq.client.test.TestUtils.*; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @@ -117,12 +117,12 @@ public void topologyRecoveryFilteringBindings() throws Exception { closeAndWaitForRecovery((RecoverableConnection) c); - assertTrue("The message should have been received by now", sendAndConsumeMessage( + assertTrue(sendAndConsumeMessage( "topology.recovery.exchange", "recovered.binding", "topology.recovery.queue.1", c - )); - assertFalse("Binding shouldn't recover, no messages should have been received", sendAndConsumeMessage( + ), "The message should have been received by now"); + assertFalse(sendAndConsumeMessage( "topology.recovery.exchange", "filtered.binding", "topology.recovery.queue.2", c - )); + ), "Binding shouldn't recover, no messages should have been received"); } @Test @@ -166,8 +166,8 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp waitAtMost(Duration.ofSeconds(5), () -> recoveredConsumerMessageCount.get() == initialCount + 1); ch.basicPublish("topology.recovery.exchange", "filtered.consumer", null, "".getBytes()); - assertFalse("Consumer shouldn't recover, no extra messages should have been received", - filteredConsumerLatch.await(5, TimeUnit.SECONDS)); + assertFalse(filteredConsumerLatch.await(5, TimeUnit.SECONDS), + "Consumer shouldn't recover, no extra messages should have been received"); } private static class SimpleTopologyRecoveryFilter implements TopologyRecoveryFilter { diff --git a/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryRetry.java b/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryRetry.java index c8d9c894a9..91a777ad1b 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryRetry.java +++ b/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryRetry.java @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2018-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -27,9 +27,9 @@ import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; import com.rabbitmq.tools.Host; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.HashMap; import java.util.UUID; @@ -39,7 +39,7 @@ import static com.rabbitmq.client.impl.recovery.TopologyRecoveryRetryLogic.RETRY_ON_QUEUE_NOT_FOUND_RETRY_HANDLER; import static com.rabbitmq.client.test.TestUtils.closeAllConnectionsAndWaitForRecovery; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @@ -48,7 +48,7 @@ public class TopologyRecoveryRetry extends BrokerTestCase { private volatile Consumer backoffConsumer; - @Before + @BeforeEach public void init() { this.backoffConsumer = attempt -> { }; } diff --git a/src/test/java/com/rabbitmq/client/test/functional/Transactions.java b/src/test/java/com/rabbitmq/client/test/functional/Transactions.java index 3e3d66883b..b7890aed45 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/Transactions.java +++ b/src/test/java/com/rabbitmq/client/test/functional/Transactions.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,14 +16,14 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.GetResponse; @@ -324,8 +324,7 @@ private long[] publishSelectAndGet(int n) basicAck(); channel.basicRecover(true); - assertNull("Acked uncommitted message redelivered", - basicGet(true)); + assertNull(basicGet(true), "Acked uncommitted message redelivered"); } @Test public void commitWithDeletedQueue() diff --git a/src/test/java/com/rabbitmq/client/test/functional/UnbindAutoDeleteExchange.java b/src/test/java/com/rabbitmq/client/test/functional/UnbindAutoDeleteExchange.java index 29c4faa2b4..08e0b8fbac 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/UnbindAutoDeleteExchange.java +++ b/src/test/java/com/rabbitmq/client/test/functional/UnbindAutoDeleteExchange.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,11 +15,11 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/functional/UnexpectedFrames.java b/src/test/java/com/rabbitmq/client/test/functional/UnexpectedFrames.java index e028c3cf47..fd36d11026 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/UnexpectedFrames.java +++ b/src/test/java/com/rabbitmq/client/test/functional/UnexpectedFrames.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -22,7 +22,7 @@ import com.rabbitmq.client.impl.recovery.AutorecoveringConnection; import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.net.SocketFactory; import java.io.IOException; diff --git a/src/test/java/com/rabbitmq/client/test/functional/UserIDHeader.java b/src/test/java/com/rabbitmq/client/test/functional/UserIDHeader.java index d776029df5..1f0383fbde 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/UserIDHeader.java +++ b/src/test/java/com/rabbitmq/client/test/functional/UserIDHeader.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,14 +15,14 @@ package com.rabbitmq.client.test.functional; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.TimeoutException; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.AlreadyClosedException; diff --git a/src/test/java/com/rabbitmq/client/test/server/AbsentQueue.java b/src/test/java/com/rabbitmq/client/test/server/AbsentQueue.java index a0e857d828..e304a71db6 100644 --- a/src/test/java/com/rabbitmq/client/test/server/AbsentQueue.java +++ b/src/test/java/com/rabbitmq/client/test/server/AbsentQueue.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -19,14 +19,17 @@ import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; import com.rabbitmq.client.test.functional.ClusteredTestBase; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.TimeoutException; +import org.junit.jupiter.api.TestInfo; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; /** * This tests whether 'absent' queues - durable queues whose home node @@ -36,16 +39,18 @@ public class AbsentQueue extends ClusteredTestBase { private static final String Q = "absent-queue"; - @Override public void setUp() throws IOException, TimeoutException { - super.setUp(); + @BeforeEach + @Override public void setUp(TestInfo info) throws IOException, TimeoutException { + super.setUp(info); if (clusteredConnection != null) stopSecondary(); } - @Override public void tearDown() throws IOException, TimeoutException { + @AfterEach + @Override public void tearDown(TestInfo info) throws IOException, TimeoutException { if (clusteredConnection != null) startSecondary(); - super.tearDown(); + super.tearDown(info); } @Override protected void createResources() throws IOException { @@ -57,7 +62,7 @@ public class AbsentQueue extends ClusteredTestBase { } @Test public void notFound() throws Exception { - if (!HATests.HA_TESTS_RUNNING) { + if (!ha()) { // we don't care about this test in normal mode return; } @@ -73,9 +78,9 @@ protected void assertNotFound(Callable t) throws Exception { if (clusteredChannel == null) return; try { t.call(); - if (!HATests.HA_TESTS_RUNNING) fail("expected not_found"); + if (!ha()) fail("expected not_found"); } catch (IOException ioe) { - assertFalse(HATests.HA_TESTS_RUNNING); + assertFalse(ha()); checkShutdownSignal(AMQP.NOT_FOUND, ioe); channel = connection.createChannel(); } @@ -84,7 +89,7 @@ protected void assertNotFound(Callable t) throws Exception { private void waitPropagationInHa() throws IOException, InterruptedException { // can be necessary to wait a bit in HA mode - if (HATests.HA_TESTS_RUNNING) { + if (ha()) { long waited = 0; while(waited < 5000) { Channel tempChannel = connection.createChannel(); diff --git a/src/test/java/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java b/src/test/java/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java index 676dac7015..a978d06a48 100644 --- a/src/test/java/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java +++ b/src/test/java/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.test.functional.ExchangeEquivalenceBase; diff --git a/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java b/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java index 4856ea151b..a80b12387d 100644 --- a/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,7 +16,7 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.CountDownLatch; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException; import com.rabbitmq.client.test.TestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.BlockedListener; import com.rabbitmq.client.Channel; diff --git a/src/test/java/com/rabbitmq/client/test/server/Bug19219Test.java b/src/test/java/com/rabbitmq/client/test/server/Bug19219Test.java index e16d40d731..2506ef075a 100644 --- a/src/test/java/com/rabbitmq/client/test/server/Bug19219Test.java +++ b/src/test/java/com/rabbitmq/client/test/server/Bug19219Test.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,14 +15,14 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; diff --git a/src/test/java/com/rabbitmq/client/test/server/ChannelLimitNegotiation.java b/src/test/java/com/rabbitmq/client/test/server/ChannelLimitNegotiation.java index a890f2ca66..a008c5b44d 100644 --- a/src/test/java/com/rabbitmq/client/test/server/ChannelLimitNegotiation.java +++ b/src/test/java/com/rabbitmq/client/test/server/ChannelLimitNegotiation.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,10 +15,10 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.Executors; @@ -27,7 +27,7 @@ import com.rabbitmq.client.impl.recovery.AutorecoveringConnection; import com.rabbitmq.client.test.TestUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Connection; diff --git a/src/test/java/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java b/src/test/java/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java index 312ce61810..f280408fa8 100644 --- a/src/test/java/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java +++ b/src/test/java/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,13 +15,13 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.MessageProperties; import com.rabbitmq.client.test.BrokerTestCase; @@ -51,7 +51,7 @@ protected void releaseResources() throws IOException { @Test public void deadLetterQueueTTLExpiredWhileDown() throws Exception { // This test is nonsensical (and often breaks) in HA mode. - if (HATests.HA_TESTS_RUNNING) return; + if (ha()) return; for(int x = 0; x < DeadLetterExchange.MSG_COUNT; x++) { channel.basicPublish("amq.direct", "test", MessageProperties.MINIMAL_PERSISTENT_BASIC, "test message".getBytes()); diff --git a/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java index 5146cac8fb..0b5d19d529 100644 --- a/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java +++ b/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -18,13 +18,13 @@ import static com.rabbitmq.client.test.TestUtils.waitAtMost; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.test.functional.BindingLifecycleBase; @@ -55,9 +55,9 @@ protected void restart() throws IOException, TimeoutException { } private void restartPrimary() throws IOException, TimeoutException { - tearDown(); + tearDown(this.testInfo); bareRestart(); - setUp(); + setUp(this.testInfo); } /** @@ -120,7 +120,7 @@ private void restartPrimary() throws IOException, TimeoutException { } GetResponse response = channel.basicGet(Q, true); - assertNull("The initial response SHOULD BE null", response); + assertNull(response, "The initial response SHOULD BE null"); deleteQueue(Q); deleteExchange(X); diff --git a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java index bf3c56bf58..db5d63ef7a 100644 --- a/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java +++ b/src/test/java/com/rabbitmq/client/test/server/EffectVisibilityCrossNodeTest.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,12 +15,12 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.test.functional.ClusteredTestBase; @@ -79,8 +79,7 @@ protected void releaseResources() throws IOException { Thread.sleep(10); waited += 10; } - assertEquals("Queue " + queue + " should have been purged after 10 seconds", - MESSAGES_PER_BATCH, purged); + assertEquals(MESSAGES_PER_BATCH, purged, "Queue " + queue + " should have been purged after 10 seconds"); } } return null; diff --git a/src/test/java/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java b/src/test/java/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java index 7bae91467b..6671be803c 100644 --- a/src/test/java/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java +++ b/src/test/java/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java @@ -17,12 +17,12 @@ package com.rabbitmq.client.test.server; import static com.rabbitmq.client.test.TestUtils.safeDelete; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; @@ -69,7 +69,7 @@ private void restartPrimaryAbruptly() throws IOException, TimeoutException { connection = null; channel = null; bareRestart(); - setUp(); + setUp(this.testInfo); } /* diff --git a/src/test/java/com/rabbitmq/client/test/server/Firehose.java b/src/test/java/com/rabbitmq/client/test/server/Firehose.java index 28064a1383..63389b5384 100644 --- a/src/test/java/com/rabbitmq/client/test/server/Firehose.java +++ b/src/test/java/com/rabbitmq/client/test/server/Firehose.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,15 +15,15 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.util.List; import java.util.Map; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/server/HATests.java b/src/test/java/com/rabbitmq/client/test/server/HATests.java deleted file mode 100644 index d4078c4ac2..0000000000 --- a/src/test/java/com/rabbitmq/client/test/server/HATests.java +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. -// -// This software, the RabbitMQ Java client library, is triple-licensed under the -// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 -// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see -// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, -// please see LICENSE-APACHE2. -// -// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, -// either express or implied. See the LICENSE file for specific language governing -// rights and limitations of this software. -// -// If you have any questions regarding licensing, please contact us at -// info@rabbitmq.com. - -package com.rabbitmq.client.test.server; - -import com.rabbitmq.client.test.AbstractRMQTestSuite; -import com.rabbitmq.client.test.RequiredPropertiesSuite; -import com.rabbitmq.client.test.functional.FunctionalTests; -import com.rabbitmq.tools.Host; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(RequiredPropertiesSuite.class) -@Suite.SuiteClasses({ - HATests.SetUp.class, - FunctionalTests.class, - ServerTests.class, - HATests.TearDown.class -}) -public class HATests { - - // initialize system properties - static{ - new AbstractRMQTestSuite(){}; - } - - // this is horrific - public static boolean HA_TESTS_RUNNING = false; - - // This is of course an abuse of the TestCase concept - but I don't want to - // run this command on every test case. And there's no hook for "before / - // after this test suite". - public static class SetUp { - - @Test public void setUp() throws Exception { - Host.rabbitmqctl("set_policy HA '.*' '{\"ha-mode\":\"all\"}'"); - HA_TESTS_RUNNING = true; - } - - @Test public void testNothing() {} - } - - public static class TearDown { - - @Test public void tearDown() throws Exception { - Host.rabbitmqctl("clear_policy HA"); - HA_TESTS_RUNNING = false; - } - - @Test public void testNothing() {} - } -} diff --git a/src/test/java/com/rabbitmq/client/test/server/HaTestSuite.java b/src/test/java/com/rabbitmq/client/test/server/HaTestSuite.java new file mode 100644 index 0000000000..12f88c6612 --- /dev/null +++ b/src/test/java/com/rabbitmq/client/test/server/HaTestSuite.java @@ -0,0 +1,30 @@ +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. +// +// This software, the RabbitMQ Java client library, is triple-licensed under the +// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 +// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see +// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, +// please see LICENSE-APACHE2. +// +// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, +// either express or implied. See the LICENSE file for specific language governing +// rights and limitations of this software. +// +// If you have any questions regarding licensing, please contact us at +// info@rabbitmq.com. + +package com.rabbitmq.client.test.server; + +import com.rabbitmq.client.test.functional.FunctionalTestSuite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +@Suite +@SelectClasses({ + FunctionalTestSuite.class, + ServerTestSuite.class, + LastHaTestSuite.class, +}) +public class HaTestSuite { + +} diff --git a/src/test/java/com/rabbitmq/client/test/server/LastHaTestSuite.java b/src/test/java/com/rabbitmq/client/test/server/LastHaTestSuite.java new file mode 100644 index 0000000000..12aa495ae0 --- /dev/null +++ b/src/test/java/com/rabbitmq/client/test/server/LastHaTestSuite.java @@ -0,0 +1,37 @@ +// Copyright (c) 2023 VMware, Inc. or its affiliates. All rights reserved. +// +// This software, the RabbitMQ Java client library, is triple-licensed under the +// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 +// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see +// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, +// please see LICENSE-APACHE2. +// +// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, +// either express or implied. See the LICENSE file for specific language governing +// rights and limitations of this software. +// +// If you have any questions regarding licensing, please contact us at +// info@rabbitmq.com. + +package com.rabbitmq.client.test.server; + +import com.rabbitmq.client.test.server.LastHaTestSuite.DummyTest; +import org.junit.jupiter.api.Test; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +/** + * Marker test suite to signal the end of the HA test suite. + */ +@Suite +@SelectClasses(DummyTest.class) +public class LastHaTestSuite { + + static class DummyTest { + @Test + void noOp() { + + } + } + +} diff --git a/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java b/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java index a1e26b3d1b..e758b65c9e 100644 --- a/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java +++ b/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,7 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.net.Inet4Address; @@ -26,9 +26,9 @@ import java.util.concurrent.TimeoutException; import com.rabbitmq.client.test.TestUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AuthenticationFailureException; import com.rabbitmq.client.ConnectionFactory; @@ -36,12 +36,12 @@ public class LoopbackUsers { - @Before public void setUp() throws IOException { + @BeforeEach public void setUp() throws IOException { Host.rabbitmqctl("add_user test test"); Host.rabbitmqctl("set_permissions test '.*' '.*' '.*'"); } - @After public void tearDown() throws IOException { + @AfterEach public void tearDown() throws IOException { Host.rabbitmqctl("delete_user test"); } diff --git a/src/test/java/com/rabbitmq/client/test/server/MemoryAlarms.java b/src/test/java/com/rabbitmq/client/test/server/MemoryAlarms.java index 690a77ddcd..d6be4534de 100644 --- a/src/test/java/com/rabbitmq/client/test/server/MemoryAlarms.java +++ b/src/test/java/com/rabbitmq/client/test/server/MemoryAlarms.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,18 +15,21 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; import com.rabbitmq.client.test.BrokerTestCase; +import org.junit.jupiter.api.TestInfo; public class MemoryAlarms extends BrokerTestCase { @@ -35,18 +38,20 @@ public class MemoryAlarms extends BrokerTestCase { private Connection connection2; private Channel channel2; + @BeforeEach @Override - public void setUp() throws IOException, TimeoutException { + public void setUp(TestInfo info) throws IOException, TimeoutException { connectionFactory.setRequestedHeartbeat(1); - super.setUp(); + super.setUp(info); if (connection2 == null) { connection2 = connectionFactory.newConnection(); } channel2 = connection2.createChannel(); } + @AfterEach @Override - public void tearDown() throws IOException, TimeoutException { + public void tearDown(TestInfo info) throws IOException, TimeoutException { clearAllResourceAlarms(); if (channel2 != null) { channel2.abort(); @@ -56,7 +61,7 @@ public void tearDown() throws IOException, TimeoutException { connection2.abort(); connection2 = null; } - super.tearDown(); + super.tearDown(info); connectionFactory.setRequestedHeartbeat(0); } diff --git a/src/test/java/com/rabbitmq/client/test/server/MessageRecovery.java b/src/test/java/com/rabbitmq/client/test/server/MessageRecovery.java index f59e4ced96..c17ef018c9 100644 --- a/src/test/java/com/rabbitmq/client/test/server/MessageRecovery.java +++ b/src/test/java/com/rabbitmq/client/test/server/MessageRecovery.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,12 +17,12 @@ import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.MessageProperties; import com.rabbitmq.client.test.ConfirmBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MessageRecovery extends ConfirmBase { @@ -56,7 +56,7 @@ public class MessageRecovery extends ConfirmBase // with slave(s). // NB: this wont work when running against a single node broker // and running the test individually outside of the HA suite - boolean expectDelivered = HATests.HA_TESTS_RUNNING; + boolean expectDelivered = ha(); try { channel.queueDeclarePassive(Q2); channel.queueDelete(Q2); diff --git a/src/test/java/com/rabbitmq/client/test/server/Permissions.java b/src/test/java/com/rabbitmq/client/test/server/Permissions.java index c67d0cc0c6..2204f9c9ce 100644 --- a/src/test/java/com/rabbitmq/client/test/server/Permissions.java +++ b/src/test/java/com/rabbitmq/client/test/server/Permissions.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -22,14 +22,17 @@ import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.client.test.TestUtils; import com.rabbitmq.tools.Host; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeoutException; +import org.junit.jupiter.api.TestInfo; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class Permissions extends BrokerTestCase { @@ -45,16 +48,20 @@ public Permissions() connectionFactory = factory; } - public void setUp() + @BeforeEach + @Override + public void setUp(TestInfo info) throws IOException, TimeoutException { deleteRestrictedAccount(); addRestrictedAccount(); - super.setUp(); + super.setUp(info); } - public void tearDown() + @AfterEach + @Override + public void tearDown(TestInfo info) throws IOException, TimeoutException { - super.tearDown(); + super.tearDown(info); deleteRestrictedAccount(); } @@ -124,8 +131,7 @@ protected void withNames(WithName action) } catch (IOException e) { assertTrue(e instanceof AuthenticationFailureException); String msg = e.getMessage(); - assertTrue("Exception message should contain 'auth'", - msg.toLowerCase().contains("auth")); + assertTrue(msg.toLowerCase().contains("auth"), "Exception message should contain 'auth'"); } } @@ -366,13 +372,13 @@ protected void runTest(boolean exp, String name, WithName test) String msg = "'" + name + "' -> " + exp; try { test.with(name); - assertTrue(msg, exp); + assertTrue(exp, msg); } catch (IOException e) { - assertFalse(msg, exp); + assertFalse(exp, msg); checkShutdownSignal(AMQP.ACCESS_REFUSED, e); openChannel(); } catch (AlreadyClosedException e) { - assertFalse(msg, exp); + assertFalse(exp, msg); checkShutdownSignal(AMQP.ACCESS_REFUSED, e); openChannel(); } diff --git a/src/test/java/com/rabbitmq/client/test/server/PersistenceGuarantees.java b/src/test/java/com/rabbitmq/client/test/server/PersistenceGuarantees.java index 69bc8093b4..e0547ca786 100644 --- a/src/test/java/com/rabbitmq/client/test/server/PersistenceGuarantees.java +++ b/src/test/java/com/rabbitmq/client/test/server/PersistenceGuarantees.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,12 +15,12 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import com.rabbitmq.client.impl.nio.NioParams; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.MessageProperties; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/server/PriorityQueues.java b/src/test/java/com/rabbitmq/client/test/server/PriorityQueues.java index 76c34dbbeb..1fba1684d7 100644 --- a/src/test/java/com/rabbitmq/client/test/server/PriorityQueues.java +++ b/src/test/java/com/rabbitmq/client/test/server/PriorityQueues.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,8 +15,8 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.ArrayList; @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.DefaultConsumer; diff --git a/src/test/java/com/rabbitmq/client/test/server/ServerTests.java b/src/test/java/com/rabbitmq/client/test/server/ServerTestSuite.java similarity index 69% rename from src/test/java/com/rabbitmq/client/test/server/ServerTests.java rename to src/test/java/com/rabbitmq/client/test/server/ServerTestSuite.java index a532586e40..c850a31faf 100644 --- a/src/test/java/com/rabbitmq/client/test/server/ServerTests.java +++ b/src/test/java/com/rabbitmq/client/test/server/ServerTestSuite.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,14 +16,12 @@ package com.rabbitmq.client.test.server; -import com.rabbitmq.client.test.AbstractRMQTestSuite; -import com.rabbitmq.client.test.RequiredPropertiesSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(RequiredPropertiesSuite.class) -@Suite.SuiteClasses({ - Permissions.class, +@Suite +@SelectClasses({ + Permissions.class, DurableBindingLifecycle.class, DeadLetterExchangeDurable.class, EffectVisibilityCrossNodeTest.class, @@ -38,15 +36,10 @@ BlockedConnection.class, ChannelLimitNegotiation.class, LoopbackUsers.class, - XDeathHeaderGrowth.class, - PriorityQueues.class, - TopicPermissions.class + XDeathHeaderGrowth.class, + PriorityQueues.class, + TopicPermissions.class }) -public class ServerTests { - - // initialize system properties - static{ - new AbstractRMQTestSuite(){}; - } +public class ServerTestSuite { } diff --git a/src/test/java/com/rabbitmq/client/test/server/Shutdown.java b/src/test/java/com/rabbitmq/client/test/server/Shutdown.java index 8d7194bd38..9e861bdc9e 100644 --- a/src/test/java/com/rabbitmq/client/test/server/Shutdown.java +++ b/src/test/java/com/rabbitmq/client/test/server/Shutdown.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,7 +15,7 @@ package com.rabbitmq.client.test.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.test.BrokerTestCase; diff --git a/src/test/java/com/rabbitmq/client/test/server/TopicPermissions.java b/src/test/java/com/rabbitmq/client/test/server/TopicPermissions.java index 323b9cba65..d48f6ea952 100644 --- a/src/test/java/com/rabbitmq/client/test/server/TopicPermissions.java +++ b/src/test/java/com/rabbitmq/client/test/server/TopicPermissions.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -20,7 +20,7 @@ import com.rabbitmq.client.BuiltinExchangeType; import com.rabbitmq.client.test.BrokerTestCase; import com.rabbitmq.tools.Host; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.concurrent.Callable; @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TopicPermissions extends BrokerTestCase { diff --git a/src/test/java/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java b/src/test/java/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java index fb65d954b3..0a0537330d 100644 --- a/src/test/java/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java +++ b/src/test/java/com/rabbitmq/client/test/server/XDeathHeaderGrowth.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,8 +15,8 @@ package com.rabbitmq.client.test.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; diff --git a/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java index f5af43b4d6..748bb9f883 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/BadVerifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,27 +15,24 @@ package com.rabbitmq.client.test.ssl; -import com.rabbitmq.client.test.TestUtils; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLHandshakeException; import java.io.IOException; import java.util.concurrent.TimeoutException; -import org.junit.rules.TestRule; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for bug 19356 - SSL Support in rabbitmq * */ +@EnabledForJreRange(min = JRE.JAVA_11) public class BadVerifiedConnection extends UnverifiedConnection { - @ClassRule - public static TestRule atLeastJava11TestRule = TestUtils.atLeastJava11(); - public void openConnection() throws IOException, TimeoutException { try { diff --git a/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java b/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java index dde98277d4..1a03a02420 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,28 +16,27 @@ package com.rabbitmq.client.test.ssl; import com.rabbitmq.client.ConnectionFactory; -import junit.framework.TestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ConnectionFactoryDefaultTlsVersion { @Test public void defaultTlsVersionJdk16ShouldTakeFallback() { String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1"}; String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols); - Assert.assertEquals("TLSv1",tlsProtocol); + Assertions.assertEquals("TLSv1",tlsProtocol); } @Test public void defaultTlsVersionJdk17ShouldTakePrefered() { String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"}; String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols); - Assert.assertEquals("TLSv1.2",tlsProtocol); + Assertions.assertEquals("TLSv1.2",tlsProtocol); } @Test public void defaultTlsVersionJdk18ShouldTakePrefered() { String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"}; String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols); - Assert.assertEquals("TLSv1.2",tlsProtocol); + Assertions.assertEquals("TLSv1.2",tlsProtocol); } } diff --git a/src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java b/src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java index 46ad6c5a2a..f8febe4614 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/HostnameVerification.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -19,32 +19,25 @@ import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.test.TestUtils; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLHandshakeException; import java.util.function.Consumer; import static java.util.Collections.singletonList; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(Parameterized.class) +@EnabledForJreRange(min = JRE.JAVA_11) public class HostnameVerification { - @ClassRule - public static TestRule atLeastJava11TestRule = TestUtils.atLeastJava11(); - static SSLContext sslContext; - @Parameterized.Parameter - public Consumer customizer; - @Parameterized.Parameters public static Object[] data() { return new Object[] { blockingIo(enableHostnameVerification()), @@ -70,23 +63,26 @@ private static Consumer enableHostnameVerification() { return connectionFactory -> connectionFactory.enableHostnameVerification(); } - @BeforeClass + @BeforeAll public static void initCrypto() throws Exception { sslContext = TlsTestUtils.verifiedSslContext(); } - @Test(expected = SSLHandshakeException.class) - public void hostnameVerificationFailsBecauseCertificateNotIssuedForLoopbackInterface() throws Exception { + @ParameterizedTest + @MethodSource("data") + public void hostnameVerificationFailsBecauseCertificateNotIssuedForLoopbackInterface(Consumer customizer) throws Exception { ConnectionFactory connectionFactory = TestUtils.connectionFactory(); connectionFactory.useSslProtocol(sslContext); customizer.accept(connectionFactory); - connectionFactory.newConnection( - () -> singletonList(new Address("127.0.0.1", ConnectionFactory.DEFAULT_AMQP_OVER_SSL_PORT))); - fail("The server certificate isn't issued for 127.0.0.1, the TLS handshake should have failed"); + Assertions.assertThatThrownBy(() -> connectionFactory.newConnection( + () -> singletonList(new Address("127.0.0.1", ConnectionFactory.DEFAULT_AMQP_OVER_SSL_PORT)))) + .isInstanceOf(SSLHandshakeException.class) + .as("The server certificate isn't issued for 127.0.0.1, the TLS handshake should have failed"); } - @Test - public void hostnameVerificationSucceeds() throws Exception { + @ParameterizedTest + @MethodSource("data") + public void hostnameVerificationSucceeds(Consumer customizer) throws Exception { ConnectionFactory connectionFactory = TestUtils.connectionFactory(); connectionFactory.useSslProtocol(sslContext); customizer.accept(connectionFactory); diff --git a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java index 4010bc444e..884ca4db9a 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/NioTlsUnverifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,8 +17,8 @@ import static com.rabbitmq.client.test.TestUtils.basicGetBasicConsume; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; @@ -42,7 +42,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.TrustManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.netcrusher.core.reactor.NioReactor; import org.netcrusher.tcp.TcpCrusher; import org.netcrusher.tcp.TcpCrusherBuilder; @@ -90,7 +90,7 @@ public void connectionGetConsume() throws Exception { CountDownLatch latch = new CountDownLatch(1); basicGetBasicConsume(connection, QUEUE, latch, 100 * 1000); boolean messagesReceived = latch.await(5, TimeUnit.SECONDS); - assertTrue("Message has not been received", messagesReceived); + assertTrue(messagesReceived, "Message has not been received"); } @Test @@ -113,7 +113,7 @@ public void connectionGetConsumeProtocols() throws Exception { CountDownLatch latch = new CountDownLatch(1); basicGetBasicConsume(c, QUEUE, latch, 100); boolean messagesReceived = latch.await(5, TimeUnit.SECONDS); - assertTrue("Message has not been received", messagesReceived); + assertTrue(messagesReceived, "Message has not been received"); assertThat(engine.get()).isNotNull(); assertThat(engine.get().getEnabledProtocols()).contains(protocol); } @@ -133,7 +133,7 @@ public void connectionGetConsumeProtocols() throws Exception { Connection connection = null; try { connection = connectionFactory.newConnection(); - assertTrue("The SSL engine configurator should have called", sslEngineHasBeenCalled.get()); + assertTrue(sslEngineHasBeenCalled.get(), "The SSL engine configurator should have called"); } finally { if (connection != null) { connection.close(); @@ -213,7 +213,7 @@ public void connectionShouldEnforceConnectionTimeout() throws Exception { private void sendAndVerifyMessage(int size) throws Exception { CountDownLatch latch = new CountDownLatch(1); boolean messageReceived = basicGetBasicConsume(connection, QUEUE, latch, size); - assertTrue("Message has not been received", messageReceived); + assertTrue(messageReceived, "Message has not been received"); } } diff --git a/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java b/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java deleted file mode 100644 index 758d87118a..0000000000 --- a/src/test/java/com/rabbitmq/client/test/ssl/SSLTests.java +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. -// -// This software, the RabbitMQ Java client library, is triple-licensed under the -// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 -// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see -// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, -// please see LICENSE-APACHE2. -// -// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, -// either express or implied. See the LICENSE file for specific language governing -// rights and limitations of this software. -// -// If you have any questions regarding licensing, please contact us at -// info@rabbitmq.com. - - -package com.rabbitmq.client.test.ssl; - -import com.rabbitmq.client.test.AbstractRMQTestSuite; -import com.rabbitmq.client.test.SslContextFactoryTest; -import org.junit.runner.RunWith; -import org.junit.runner.Runner; -import org.junit.runner.notification.RunNotifier; -import org.junit.runners.Suite; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.RunnerBuilder; - -import java.util.ArrayList; -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(SSLTests.SslSuite.class) -@Suite.SuiteClasses({ - UnverifiedConnection.class, - VerifiedConnection.class, - BadVerifiedConnection.class, - ConnectionFactoryDefaultTlsVersion.class, - NioTlsUnverifiedConnection.class, - HostnameVerification.class, - TlsConnectionLogging.class, - SslContextFactoryTest.class -}) -public class SSLTests { - - private static final Logger LOGGER = LoggerFactory.getLogger(SSLTests.class); - - // initialize system properties - static{ - new AbstractRMQTestSuite(){}; - } - - public static class SslSuite extends Suite { - - public SslSuite(Class klass, RunnerBuilder builder) throws InitializationError { - super(klass, builder); - } - - public SslSuite(RunnerBuilder builder, Class[] classes) throws InitializationError { - super(builder, classes); - } - - protected SslSuite(Class klass, Class[] suiteClasses) throws InitializationError { - super(klass, suiteClasses); - } - - protected SslSuite(RunnerBuilder builder, Class klass, Class[] suiteClasses) throws InitializationError { - super(builder, klass, suiteClasses); - } - - protected SslSuite(Class klass, List runners) throws InitializationError { - super(klass, runners); - } - - @Override - protected List getChildren() { - if(!AbstractRMQTestSuite.requiredProperties() && !AbstractRMQTestSuite.isSSLAvailable()) { - return new ArrayList<>(); - } else { - return super.getChildren(); - } - } - - @Override - protected void runChild(Runner runner, RunNotifier notifier) { - LOGGER.info("Running test {}", runner.getDescription().getDisplayName()); - super.runChild(runner, notifier); - } - } - -} diff --git a/src/test/java/com/rabbitmq/client/test/ssl/SslTestSuite.java b/src/test/java/com/rabbitmq/client/test/ssl/SslTestSuite.java new file mode 100644 index 0000000000..05160db0f9 --- /dev/null +++ b/src/test/java/com/rabbitmq/client/test/ssl/SslTestSuite.java @@ -0,0 +1,37 @@ +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. +// +// This software, the RabbitMQ Java client library, is triple-licensed under the +// Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 +// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see +// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. For the ASL, +// please see LICENSE-APACHE2. +// +// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, +// either express or implied. See the LICENSE file for specific language governing +// rights and limitations of this software. +// +// If you have any questions regarding licensing, please contact us at +// info@rabbitmq.com. + + +package com.rabbitmq.client.test.ssl; + +import com.rabbitmq.client.test.SslContextFactoryTest; + +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +@Suite +@SelectClasses({ + UnverifiedConnection.class, + VerifiedConnection.class, + BadVerifiedConnection.class, + ConnectionFactoryDefaultTlsVersion.class, + NioTlsUnverifiedConnection.class, + HostnameVerification.class, + TlsConnectionLogging.class, + SslContextFactoryTest.class +}) +public class SslTestSuite { + +} diff --git a/src/test/java/com/rabbitmq/client/test/ssl/TlsConnectionLogging.java b/src/test/java/com/rabbitmq/client/test/ssl/TlsConnectionLogging.java index 4298f18a9a..81360a3815 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/TlsConnectionLogging.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/TlsConnectionLogging.java @@ -1,4 +1,4 @@ -// Copyright (c) 2019-2021 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2019-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -21,9 +21,8 @@ import com.rabbitmq.client.impl.nio.NioParams; import com.rabbitmq.client.test.TestUtils; import org.assertj.core.api.Assertions; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import javax.net.ssl.*; import java.security.cert.X509Certificate; @@ -31,16 +30,11 @@ import java.util.function.Function; import java.util.function.Supplier; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; -@RunWith(Parameterized.class) public class TlsConnectionLogging { - @Parameterized.Parameter - public Function> configurer; - - @Parameterized.Parameters - public static Object[] data() { + public static Object[] certificateInfoAreProperlyExtracted() { return new Object[]{blockingIo(), nio()}; } @@ -64,8 +58,9 @@ public static Function> nio() { }; } - @Test - public void certificateInfoAreProperlyExtracted() throws Exception { + @ParameterizedTest + @MethodSource + public void certificateInfoAreProperlyExtracted(Function> configurer) throws Exception { SSLContext sslContext = TlsTestUtils.getSSLContext(); sslContext.init(null, new TrustManager[]{new AlwaysTrustTrustManager()}, null); ConnectionFactory connectionFactory = TestUtils.connectionFactory(); diff --git a/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java b/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java index 6e633ce664..51702c4a6e 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java @@ -15,7 +15,7 @@ package com.rabbitmq.client.test.ssl; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.FileInputStream; import java.security.KeyStore; diff --git a/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java index 39e1e90ba5..5a0af90463 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/UnverifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -17,13 +17,13 @@ import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.test.BrokerTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Test for bug 19356 - SSL Support in rabbitmq diff --git a/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java index d52a44e2e1..e53a83b2f0 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/VerifiedConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -16,8 +16,8 @@ package com.rabbitmq.client.test.ssl; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.rabbitmq.client.Connection; import com.rabbitmq.client.impl.nio.NioParams; @@ -36,20 +36,18 @@ import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.test.TestUtils; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TestRule; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; import org.slf4j.LoggerFactory; /** * Test for bug 19356 - SSL Support in rabbitmq * */ +@EnabledForJreRange(min = JRE.JAVA_11) public class VerifiedConnection extends UnverifiedConnection { - @ClassRule - public static TestRule atLeastJava11TestRule = TestUtils.atLeastJava11(); - public void openConnection() throws IOException, TimeoutException { try { @@ -103,7 +101,7 @@ public void connectionGetConsumeProtocols() throws Exception { CountDownLatch latch = new CountDownLatch(1); TestUtils.basicGetBasicConsume(c, VerifiedConnection.class.getName(), latch, 100); boolean messagesReceived = latch.await(5, TimeUnit.SECONDS); - assertTrue("Message has not been received", messagesReceived); + assertTrue(messagesReceived, "Message has not been received"); assertThat(protocolsSupplier.get()).isNotNull(); assertThat(protocolsSupplier.get().get()).contains(protocol); } diff --git a/src/test/java/com/rabbitmq/tools/Host.java b/src/test/java/com/rabbitmq/tools/Host.java index ee3b6a59f3..8e950cb27e 100644 --- a/src/test/java/com/rabbitmq/tools/Host.java +++ b/src/test/java/com/rabbitmq/tools/Host.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2022 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 diff --git a/src/test/java/com/rabbitmq/utility/IntAllocatorTests.java b/src/test/java/com/rabbitmq/utility/IntAllocatorTests.java index d29e134442..5e468a60e3 100644 --- a/src/test/java/com/rabbitmq/utility/IntAllocatorTests.java +++ b/src/test/java/com/rabbitmq/utility/IntAllocatorTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -15,14 +15,14 @@ package com.rabbitmq.utility; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.Iterator; import java.util.Random; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class IntAllocatorTests { @@ -41,38 +41,38 @@ public class IntAllocatorTests { iAll.free(trial); set.remove(trial); } else { - assertTrue("Did not reserve free integer " + trial, iAll.reserve(trial)); + assertTrue(iAll.reserve(trial), "Did not reserve free integer " + trial); set.add(trial); } } for (int trial : set) { - assertFalse("Integer " + trial + " not allocated!", iAll.reserve(trial)); + assertFalse(iAll.reserve(trial), "Integer " + trial + " not allocated!"); } } - @Test public void allocateAndFree() throws Exception { + @Test public void allocateAndFree() { Set set = new HashSet(); for (int i=0; i < TEST_ITERATIONS; ++i) { if (getBool(rand)) { int trial = iAll.allocate(); - assertFalse("Already allocated " + trial, set.contains(trial)); + assertFalse(set.contains(trial), "Already allocated " + trial); set.add(trial); } else { if (!set.isEmpty()) { int trial = extractOne(set); - assertFalse("Allocator agreed to reserve " + trial, iAll.reserve(trial)); + assertFalse(iAll.reserve(trial), "Allocator agreed to reserve " + trial); iAll.free(trial); } } } for (int trial : set) { - assertFalse("Integer " + trial + " should be allocated!", iAll.reserve(trial)); + assertFalse(iAll.reserve(trial), "Integer " + trial + " should be allocated!"); } } - @Test public void testToString() throws Exception { + @Test public void testToString() { IntAllocator ibs = new IntAllocator(LO_RANGE, HI_RANGE); assertEquals("IntAllocator{allocated = []}", ibs.toString()); ibs.allocate(); diff --git a/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension new file mode 100644 index 0000000000..5d5a5c135a --- /dev/null +++ b/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -0,0 +1 @@ +com.rabbitmq.client.AmqpClientTestExtension \ No newline at end of file diff --git a/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties new file mode 100644 index 0000000000..b059a65dc4 --- /dev/null +++ b/src/test/resources/junit-platform.properties @@ -0,0 +1 @@ +junit.jupiter.extensions.autodetection.enabled=true \ No newline at end of file diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 5874c1c8c4..f47371567e 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -5,10 +5,8 @@ - - - + From 10b2ca302fe0458761b64f30ee7cc2e1cb1a8c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 6 Jan 2023 11:04:36 +0100 Subject: [PATCH 188/657] Fix test condition (cherry picked from commit 41f0804052d62140065ba8466c3c05189161fbff) --- src/test/java/com/rabbitmq/client/test/TestUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java index 8897bf23a9..cbb2885f22 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtils.java @@ -478,7 +478,7 @@ static class DisabledIfBrokerRunningOnDockerCondition implements @Override public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { if (Host.isOnDocker()) { - return ConditionEvaluationResult.enabled("Broker running on Docker"); + return ConditionEvaluationResult.disabled("Broker running on Docker"); } else { return ConditionEvaluationResult.enabled("Broker not running on Docker"); } From 300f92791f4f9bef3eb8de8ffa181c8542794db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 6 Jan 2023 11:47:28 +0100 Subject: [PATCH 189/657] Fix tests after JUnit 5 upgrade They were not in main. --- .../java/com/rabbitmq/client/DefaultJsonRpcTest.java | 12 ++++++------ .../java/com/rabbitmq/client/test/ChannelNTest.java | 5 +++-- .../com/rabbitmq/client/test/JSONReadWriteTest.java | 11 ++++++----- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/DefaultJsonRpcTest.java b/src/test/java/com/rabbitmq/client/DefaultJsonRpcTest.java index 42cd9cfa66..7f231d1bd3 100644 --- a/src/test/java/com/rabbitmq/client/DefaultJsonRpcTest.java +++ b/src/test/java/com/rabbitmq/client/DefaultJsonRpcTest.java @@ -15,17 +15,17 @@ package com.rabbitmq.client; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import com.rabbitmq.tools.jsonrpc.DefaultJsonRpcMapper; import com.rabbitmq.tools.jsonrpc.JsonRpcException; import com.rabbitmq.tools.jsonrpc.JsonRpcMapper; -import org.junit.Test; import java.lang.reflect.UndeclaredThrowableException; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.Test; public class DefaultJsonRpcTest extends AbstractJsonRpcTest { diff --git a/src/test/java/com/rabbitmq/client/test/ChannelNTest.java b/src/test/java/com/rabbitmq/client/test/ChannelNTest.java index c615c3bfe0..448f94ee02 100644 --- a/src/test/java/com/rabbitmq/client/test/ChannelNTest.java +++ b/src/test/java/com/rabbitmq/client/test/ChannelNTest.java @@ -56,11 +56,12 @@ public void serverBasicCancelForUnknownConsumerDoesNotThrowException() throws Ex channel.processAsync(new AMQCommand(method)); } - @Test(expected = IOException.class) + @Test public void callingBasicCancelForUnknownConsumerThrowsException() throws Exception { AMQConnection connection = Mockito.mock(AMQConnection.class); ChannelN channel = new ChannelN(connection, 1, consumerWorkService); - channel.basicCancel("does-not-exist"); + assertThatThrownBy(() -> channel.basicCancel("does-not-exist")) + .isInstanceOf(IOException.class); } @Test diff --git a/src/test/java/com/rabbitmq/client/test/JSONReadWriteTest.java b/src/test/java/com/rabbitmq/client/test/JSONReadWriteTest.java index 3c71951aab..8aed35fb80 100644 --- a/src/test/java/com/rabbitmq/client/test/JSONReadWriteTest.java +++ b/src/test/java/com/rabbitmq/client/test/JSONReadWriteTest.java @@ -16,16 +16,17 @@ package com.rabbitmq.client.test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import com.rabbitmq.tools.json.JSONReader; import com.rabbitmq.tools.json.JSONWriter; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.Test; public class JSONReadWriteTest { - @Test public void readWriteSimple() throws Exception { + @Test + public void readWriteSimple() throws Exception { Object myRet; String myJson; From b85968553e2a4ea89e9efb13830291c2f694ce81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 01:17:00 +0000 Subject: [PATCH 190/657] Bump opentelemetry.version from 1.21.0 to 1.22.0 Bumps `opentelemetry.version` from 1.21.0 to 1.22.0. Updates `opentelemetry-api` from 1.21.0 to 1.22.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.21.0...v1.22.0) Updates `opentelemetry-sdk-testing` from 1.21.0 to 1.22.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.21.0...v1.22.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk-testing dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 621755dd86..5fd4765d1a 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.7.36 4.2.15 1.10.2 - 1.21.0 + 1.22.0 2.14.1 1.2.11 5.9.1 From 2b80224aed5ee837f78358e21513a033d6a86aea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 01:17:09 +0000 Subject: [PATCH 191/657] Bump assertj-core from 3.24.0 to 3.24.1 Bumps assertj-core from 3.24.0 to 3.24.1. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 621755dd86..58e751c304 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.2.11 5.9.1 4.11.0 - 3.24.0 + 3.24.1 9.4.50.v20221201 1.70 0.10 From f3ffc89b4e8009bbfb877db5860e0d44192e93f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 00:28:12 +0000 Subject: [PATCH 192/657] Bump junit-bom from 5.9.1 to 5.9.2 Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc27a15978..2981f6d2e8 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 1.22.0 2.14.1 1.2.11 - 5.9.1 + 5.9.2 4.11.0 3.24.1 9.4.50.v20221201 From fb761665ebd88f1139a903d5e142e50330ee6dbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 00:28:25 +0000 Subject: [PATCH 193/657] Bump micrometer-core from 1.10.2 to 1.10.3 Bumps [micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.10.2 to 1.10.3. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.10.2...v1.10.3) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc27a15978..7a7d48a860 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.36 4.2.15 - 1.10.2 + 1.10.3 1.22.0 2.14.1 1.2.11 From 49f5c051c13b5986696d68c7e36eff8d0b498b0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 00:46:36 +0000 Subject: [PATCH 194/657] Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M7 to 3.0.0-M8. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M7...surefire-3.0.0-M8) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c656716846..f1b8bb4b7e 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 1.6

3.3.0

3.10.1 - 3.0.0-M7 + 3.0.0-M8 3.0.0-M7 3.0.1 3.3.0 From 678d35fe57a0f3207b07ade49960eb575cfb88d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 02:09:18 +0000 Subject: [PATCH 195/657] Bump maven-failsafe-plugin from 3.0.0-M7 to 3.0.0-M8 Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M7 to 3.0.0-M8. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M7...surefire-3.0.0-M8) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1b8bb4b7e..eafe1fe317 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 3.3.0 3.10.1 3.0.0-M8 - 3.0.0-M7 + 3.0.0-M8 3.0.1 3.3.0 5.1.8 From 45b4c48eaf5c3e0157b372f661e4aff101fb2ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 16 Jan 2023 09:52:37 +0100 Subject: [PATCH 196/657] Bump Mockito to 5.0.0, stick to 4.x on Java 8 (cherry picked from commit 28d59d2cbc102ef01bf7a356c1db6d87176fd215) Conflicts: .github/dependabot.yml --- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eafe1fe317..97a229bab8 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.14.1 1.2.11 5.9.2 - 4.11.0 + 5.0.0 3.24.1 9.4.50.v20221201 1.70 @@ -684,6 +684,15 @@ + + mockito-4-on-java-8 + + 1.8 + + + 4.11.0 + + From 7d7c1cde3397a929bbb66914da9ef954cb068e52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 00:14:45 +0000 Subject: [PATCH 197/657] Bump assertj-core from 3.24.1 to 3.24.2 Bumps assertj-core from 3.24.1 to 3.24.2. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97a229bab8..d21a7d1d3f 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.2.11 5.9.2 5.0.0 - 3.24.1 + 3.24.2 9.4.50.v20221201 1.70 0.10 From 52f26f87fea89f45c2fd2df3163923e7976c75ab Mon Sep 17 00:00:00 2001 From: Nikita Nefedov Date: Mon, 23 Jan 2023 15:18:27 +0100 Subject: [PATCH 198/657] Report publish failures for the closed channel as well (cherry picked from commit a1860788d38a6caf30702531ddb596c23df83cb3) --- src/main/java/com/rabbitmq/client/impl/ChannelN.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/ChannelN.java b/src/main/java/com/rabbitmq/client/impl/ChannelN.java index 8a769a0d45..3c97d339e8 100644 --- a/src/main/java/com/rabbitmq/client/impl/ChannelN.java +++ b/src/main/java/com/rabbitmq/client/impl/ChannelN.java @@ -708,7 +708,7 @@ public void basicPublish(String exchange, String routingKey, .build(), props, body); try { transmit(command); - } catch (IOException e) { + } catch (IOException | AlreadyClosedException e) { metricsCollector.basicPublishFailure(this, e); throw e; } @@ -1489,7 +1489,7 @@ public Consumer transformReply(AMQCommand replyCommand) { rpc(m, k); - + try { if(_rpcTimeout == NO_RPC_TIMEOUT) { k.getReply(); // discard result From 69d807ee6f0f237d152036cef6c9a102877fc444 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 01:15:19 +0000 Subject: [PATCH 199/657] Bump mockito-core from 5.0.0 to 5.1.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.0.0...v5.1.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d21a7d1d3f..fd42c00e78 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.14.1 1.2.11 5.9.2 - 5.0.0 + 5.1.0 3.24.2 9.4.50.v20221201 1.70 From 06a4efa45547ad5bf2ecbb15dcf87ccfa4cccc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 30 Jan 2023 09:40:12 +0100 Subject: [PATCH 200/657] Execute multi-Java test suite on Wednesday and Sunday only Used to be every day. It may be too much for our GHA quota, so we reduce the frequency. It should do the job as well. (cherry picked from commit 84ddee03c25392bd449bc9d34135d026761f26e8) --- .github/workflows/test-3.11-alpha.yml | 2 +- .github/workflows/test-native-image.yml | 2 +- .github/workflows/test-supported-java-versions-5.x.yml | 2 +- .github/workflows/test-supported-java-versions-main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-3.11-alpha.yml b/.github/workflows/test-3.11-alpha.yml index c43a5dd34d..9617a9ed0c 100644 --- a/.github/workflows/test-3.11-alpha.yml +++ b/.github/workflows/test-3.11-alpha.yml @@ -2,7 +2,7 @@ name: Test against RabbitMQ 3.11 alpha on: schedule: - - cron: '0 4 * * *' + - cron: '0 4 ? * SUN,WED' pull_request: branches: - 5.x.x-stable diff --git a/.github/workflows/test-native-image.yml b/.github/workflows/test-native-image.yml index 05737ba90b..d1390252b3 100644 --- a/.github/workflows/test-native-image.yml +++ b/.github/workflows/test-native-image.yml @@ -2,7 +2,7 @@ name: Test GraalVM native image on: schedule: - - cron: '0 4 * * *' + - cron: '0 4 ? * SUN,WED' workflow_dispatch: env: diff --git a/.github/workflows/test-supported-java-versions-5.x.yml b/.github/workflows/test-supported-java-versions-5.x.yml index 1885402a4b..b9b906254d 100644 --- a/.github/workflows/test-supported-java-versions-5.x.yml +++ b/.github/workflows/test-supported-java-versions-5.x.yml @@ -2,7 +2,7 @@ name: Test against supported Java versions (5.x) on: schedule: - - cron: '0 4 * * *' + - cron: '0 4 ? * SUN,WED' workflow_dispatch: env: diff --git a/.github/workflows/test-supported-java-versions-main.yml b/.github/workflows/test-supported-java-versions-main.yml index d1ead48e7c..21667df7e1 100644 --- a/.github/workflows/test-supported-java-versions-main.yml +++ b/.github/workflows/test-supported-java-versions-main.yml @@ -2,7 +2,7 @@ name: Test against supported Java versions (main) on: schedule: - - cron: '0 4 * * *' + - cron: '0 4 ? * SUN,WED' workflow_dispatch: env: From af73621e94e879e219d67857fff407411c5c445e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Jan 2023 00:09:44 +0000 Subject: [PATCH 201/657] Bump mockito-core from 5.1.0 to 5.1.1 Bumps [mockito-core](https://github.com/mockito/mockito) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.1.0...v5.1.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd42c00e78..2775ae46fb 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.14.1 1.2.11 5.9.2 - 5.1.0 + 5.1.1 3.24.2 9.4.50.v20221201 1.70 From 458ac1d22b7e3f4c59cb5cff7b12ba3e9a49c196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Tue, 31 Jan 2023 14:41:43 +0100 Subject: [PATCH 202/657] Fix NPE in metrics collector if channel is null Fixes #944 (cherry picked from commit 20e641e1b53dec785b4da9b5f65fb6423b5d16aa) --- .../com/rabbitmq/client/impl/AMQConnection.java | 10 +++++++--- .../client/impl/AbstractMetricsCollector.java | 14 ++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java index 61b7a678a9..dc077080a3 100644 --- a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java +++ b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -605,7 +605,9 @@ public Channel createChannel(int channelNumber) throws IOException { ChannelManager cm = _channelManager; if (cm == null) return null; Channel channel = cm.createChannel(this, channelNumber); - metricsCollector.newChannel(channel); + if (channel != null) { + metricsCollector.newChannel(channel); + } return channel; } @@ -616,7 +618,9 @@ public Channel createChannel() throws IOException { ChannelManager cm = _channelManager; if (cm == null) return null; Channel channel = cm.createChannel(this); - metricsCollector.newChannel(channel); + if (channel != null) { + metricsCollector.newChannel(channel); + } return channel; } diff --git a/src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java b/src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java index 44cf1aff9e..7ece72ad4c 100644 --- a/src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java +++ b/src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java @@ -72,12 +72,14 @@ public void closeConnection(Connection connection) { @Override public void newChannel(final Channel channel) { - try { - incrementChannelCount(channel); - channel.addShutdownListener(cause -> closeChannel(channel)); - connectionState(channel.getConnection()).channelState.put(channel.getChannelNumber(), new ChannelState(channel)); - } catch(Exception e) { - LOGGER.info("Error while computing metrics in newChannel: " + e.getMessage()); + if (channel != null) { + try { + incrementChannelCount(channel); + channel.addShutdownListener(cause -> closeChannel(channel)); + connectionState(channel.getConnection()).channelState.put(channel.getChannelNumber(), new ChannelState(channel)); + } catch(Exception e) { + LOGGER.info("Error while computing metrics in newChannel: " + e.getMessage()); + } } } From bc8f2faee04614938c278000bb0d04e9dee812d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 1 Feb 2023 09:44:26 +0100 Subject: [PATCH 203/657] Execute multi-Java test suite on Thursday morning Better balanced in the week than on Wednesday morning. (cherry picked from commit cc44e222ced8b76e14240dc9d5a92e702e5fce89) --- .github/workflows/test-3.11-alpha.yml | 2 +- .github/workflows/test-native-image.yml | 2 +- .github/workflows/test-supported-java-versions-5.x.yml | 2 +- .github/workflows/test-supported-java-versions-main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-3.11-alpha.yml b/.github/workflows/test-3.11-alpha.yml index 9617a9ed0c..20cecc4359 100644 --- a/.github/workflows/test-3.11-alpha.yml +++ b/.github/workflows/test-3.11-alpha.yml @@ -2,7 +2,7 @@ name: Test against RabbitMQ 3.11 alpha on: schedule: - - cron: '0 4 ? * SUN,WED' + - cron: '0 4 ? * SUN,THU' pull_request: branches: - 5.x.x-stable diff --git a/.github/workflows/test-native-image.yml b/.github/workflows/test-native-image.yml index d1390252b3..0a7fc33e9e 100644 --- a/.github/workflows/test-native-image.yml +++ b/.github/workflows/test-native-image.yml @@ -2,7 +2,7 @@ name: Test GraalVM native image on: schedule: - - cron: '0 4 ? * SUN,WED' + - cron: '0 4 ? * SUN,THU' workflow_dispatch: env: diff --git a/.github/workflows/test-supported-java-versions-5.x.yml b/.github/workflows/test-supported-java-versions-5.x.yml index b9b906254d..7b24cd3406 100644 --- a/.github/workflows/test-supported-java-versions-5.x.yml +++ b/.github/workflows/test-supported-java-versions-5.x.yml @@ -2,7 +2,7 @@ name: Test against supported Java versions (5.x) on: schedule: - - cron: '0 4 ? * SUN,WED' + - cron: '0 4 ? * SUN,THU' workflow_dispatch: env: diff --git a/.github/workflows/test-supported-java-versions-main.yml b/.github/workflows/test-supported-java-versions-main.yml index 21667df7e1..8687dbdd32 100644 --- a/.github/workflows/test-supported-java-versions-main.yml +++ b/.github/workflows/test-supported-java-versions-main.yml @@ -2,7 +2,7 @@ name: Test against supported Java versions (main) on: schedule: - - cron: '0 4 ? * SUN,WED' + - cron: '0 4 ? * SUN,THU' workflow_dispatch: env: From bb79c99b00bd0ac2d0956304feac6fff732345f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 02:19:37 +0000 Subject: [PATCH 204/657] Bump opentelemetry.version from 1.22.0 to 1.23.0 Bumps `opentelemetry.version` from 1.22.0 to 1.23.0. Updates `opentelemetry-api` from 1.22.0 to 1.23.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.22.0...v1.23.0) Updates `opentelemetry-sdk-testing` from 1.22.0 to 1.23.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.22.0...v1.23.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk-testing dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2775ae46fb..9abf91924f 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.7.36 4.2.15 1.10.3 - 1.22.0 + 1.23.0 2.14.1 1.2.11 5.9.2 From 99392a95c862fe8e83d744145fc2c4658df77a17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 01:07:41 +0000 Subject: [PATCH 205/657] Bump metrics-core from 4.2.15 to 4.2.16 Bumps [metrics-core](https://github.com/dropwizard/metrics) from 4.2.15 to 4.2.16. - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.15...v4.2.16) --- updated-dependencies: - dependency-name: io.dropwizard.metrics:metrics-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9abf91924f..ee77aba1a6 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ UTF-8 1.7.36 - 4.2.15 + 4.2.16 1.10.3 1.23.0 2.14.1 From 3713f4de9b43c1f8b7a51331748f07bebbf4c4cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 01:07:53 +0000 Subject: [PATCH 206/657] Bump maven-surefire-plugin from 3.0.0-M8 to 3.0.0-M9 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M8 to 3.0.0-M9. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.0.0-M9) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9abf91924f..d60ef4b61c 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 1.6

3.3.0

3.10.1 - 3.0.0-M8 + 3.0.0-M9 3.0.0-M8 3.0.1 3.3.0 From ee797df51a6ba4c994fad06ec38399edf5950e31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 01:21:17 +0000 Subject: [PATCH 207/657] Bump maven-failsafe-plugin from 3.0.0-M8 to 3.0.0-M9 Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M8 to 3.0.0-M9. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.0.0-M9) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab7d04ec8f..d246417e19 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 3.3.0 3.10.1 3.0.0-M9 - 3.0.0-M8 + 3.0.0-M9 3.0.1 3.3.0 5.1.8 From ce6dfdd8bdcbb083a95627c5e8c197a21b2d6df7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 01:07:25 +0000 Subject: [PATCH 208/657] Bump micrometer-core from 1.10.3 to 1.10.4 Bumps [micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.10.3 to 1.10.4. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.10.3...v1.10.4) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d246417e19..46c7cba7f2 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.36 4.2.16 - 1.10.3 + 1.10.4 1.23.0 2.14.1 1.2.11 From 3b3f97d7677f4ae3de7ffa4ac9f3cb3ce1e23d5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 01:08:26 +0000 Subject: [PATCH 209/657] Bump opentelemetry.version from 1.23.0 to 1.23.1 Bumps `opentelemetry.version` from 1.23.0 to 1.23.1. Updates `opentelemetry-api` from 1.23.0 to 1.23.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.23.0...v1.23.1) Updates `opentelemetry-sdk-testing` from 1.23.0 to 1.23.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.23.0...v1.23.1) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.opentelemetry:opentelemetry-sdk-testing dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46c7cba7f2..120aa45662 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.7.36 4.2.16 1.10.4 - 1.23.0 + 1.23.1 2.14.1 1.2.11 5.9.2 From ec454c81ab0164c67e2b5935faab219d936c7a75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 01:08:43 +0000 Subject: [PATCH 210/657] Bump maven-javadoc-plugin from 3.4.1 to 3.5.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46c7cba7f2..5ace3426df 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.70 0.10 - 3.4.1 + 3.5.0 2.5.3 2.14.2 3.3.0 From 71ed3b4773785ef5aa38653d64a7ea0de4dbe2bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 00:52:28 +0000 Subject: [PATCH 211/657] Bump versions-maven-plugin from 2.14.2 to 2.15.0 Bumps [versions-maven-plugin](https://github.com/mojohaus/versions) from 2.14.2 to 2.15.0. - [Release notes](https://github.com/mojohaus/versions/releases) - [Changelog](https://github.com/mojohaus/versions/blob/master/ReleaseNotes.md) - [Commits](https://github.com/mojohaus/versions/compare/2.14.2...2.15.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:versions-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a88773c039..bb607d336d 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 3.5.0 2.5.3 - 2.14.2 + 2.15.0 3.3.0 3.2.1 2.1.1 From c2aa506ffdd5b26a0b59e22c370cff1c42ed4474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 23 Feb 2023 09:23:20 +0100 Subject: [PATCH 212/657] Add test to parse OAuth2 token with GSON Instead of Jackson. The requirement is very small, and GSON is a much smaller dependency than Jackson. (cherry picked from commit af8036d1a6e4853582152559d1910708f19f7ca3) --- pom.xml | 7 ++++ ...edentialsGrantCredentialsProviderTest.java | 33 ++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb607d336d..4b4cfaacde 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,7 @@ 9.4.50.v20221201 1.70 0.10 + 2.10.1 3.5.0 2.5.3 @@ -784,6 +785,12 @@ ${opentelemetry.version} test + + com.google.code.gson + gson + ${gson.version} + test + diff --git a/src/test/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProviderTest.java b/src/test/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProviderTest.java index 33614d78bd..f717cbcf27 100644 --- a/src/test/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProviderTest.java +++ b/src/test/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProviderTest.java @@ -15,6 +15,7 @@ package com.rabbitmq.client.impl; +import com.google.gson.Gson; import com.rabbitmq.client.test.TestUtils; import org.bouncycastle.asn1.x500.X500NameBuilder; import org.bouncycastle.asn1.x500.style.BCStyle; @@ -195,7 +196,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques } @Test - public void parseToken() { + public void parseTokenDefault() { OAuth2ClientCredentialsGrantCredentialsProvider provider = new OAuth2ClientCredentialsGrantCredentialsProvider( "http://localhost:8080/uaa/oauth/token/", "rabbit_client", "rabbit_secret", @@ -211,6 +212,36 @@ public void parseToken() { assertThat(token.getTimeBeforeExpiration()).isBetween(Duration.ofSeconds(expiresIn - 10), Duration.ofSeconds(expiresIn + 1)); } + @Test + public void parseTokenGson() { + Gson gson = new Gson(); + OAuth2ClientCredentialsGrantCredentialsProvider provider = new OAuth2ClientCredentialsGrantCredentialsProvider( + "http://localhost:8080/uaa/oauth/token/", + "rabbit_client", "rabbit_secret", + "client_credentials" + ) { + @Override + protected Token parseToken(String response) { + try { + Map map = gson.fromJson(response, Map.class); + int expiresIn = ((Number) map.get("expires_in")).intValue(); + Instant receivedAt = Instant.now(); + return new Token(map.get("access_token").toString(), expiresIn, receivedAt); + } catch (Exception e) { + throw new OAuthTokenManagementException("Error while parsing OAuth 2 token", e); + } + } + }; + + String accessToken = "18c1b1dfdda04382a8bcc14d077b71dd"; + int expiresIn = 43199; + String response = sampleJsonToken(accessToken, expiresIn); + + OAuth2ClientCredentialsGrantCredentialsProvider.Token token = provider.parseToken(response); + assertThat(token.getAccess()).isEqualTo("18c1b1dfdda04382a8bcc14d077b71dd"); + assertThat(token.getTimeBeforeExpiration()).isBetween(Duration.ofSeconds(expiresIn - 10), Duration.ofSeconds(expiresIn + 1)); + } + String sampleJsonToken(String accessToken, int expiresIn) { String json = "{\n" + " \"access_token\" : \"{accessToken}\",\n" + From e7e0ac034e43ee92fdb7d9861aae6ac5f0e59b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 23 Feb 2023 14:12:08 +0100 Subject: [PATCH 213/657] Remove hard dependency on Jackson in OAuth 2 support It's possible to override the token parsing method, to avoid using Jackson, but the class would have a Jackson mapper in its properties. This commit introduces an abstraction to parse the token and the default Jackson implementation is instantianted on the fly. (cherry picked from commit c0811fa13b02883166630d299bc48a21640cef55) Conflicts: src/main/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProvider.java --- ...ntCredentialsGrantCredentialsProvider.java | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProvider.java b/src/main/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProvider.java index 5e9618317d..65cd9ef2da 100644 --- a/src/main/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProvider.java +++ b/src/main/java/com/rabbitmq/client/impl/OAuth2ClientCredentialsGrantCredentialsProvider.java @@ -18,6 +18,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.rabbitmq.client.TrustEverythingTrustManager; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; import javax.net.ssl.*; import java.io.*; import java.net.HttpURLConnection; @@ -72,7 +74,7 @@ public class OAuth2ClientCredentialsGrantCredentialsProvider extends RefreshProt private final Map parameters; - private final ObjectMapper objectMapper = new ObjectMapper(); + private final AtomicReference> tokenExtractor = new AtomicReference<>(); private final String id; @@ -214,14 +216,8 @@ protected String usernameFromToken(Token token) { } protected Token parseToken(String response) { - try { - Map map = objectMapper.readValue(response, Map.class); - int expiresIn = ((Number) map.get("expires_in")).intValue(); - Instant receivedAt = Instant.now(); - return new Token(map.get("access_token").toString(), expiresIn, receivedAt); - } catch (IOException e) { - throw new OAuthTokenManagementException("Error while parsing OAuth 2 token", e); - } + return this.tokenExtractor.updateAndGet(current -> + current == null ? new JacksonTokenLookup() : current).apply(response); } @Override @@ -595,5 +591,21 @@ private SSLSocketFactory sslSocketFactory() { } } + + private static class JacksonTokenLookup implements Function { + + private final ObjectMapper objectMapper = new ObjectMapper(); + @Override + public Token apply(String response) { + try { + Map map = objectMapper.readValue(response, Map.class); + int expiresIn = ((Number) map.get("expires_in")).intValue(); + Instant receivedAt = Instant.now(); + return new Token(map.get("access_token").toString(), expiresIn, receivedAt); + } catch (IOException e) { + throw new OAuthTokenManagementException("Error while parsing OAuth 2 token", e); + } + } + } } \ No newline at end of file From 4c4a043c43299d78d7266171465746cb2c6dafb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 23 Feb 2023 15:43:54 +0100 Subject: [PATCH 214/657] Add GHA release scripts (cherry picked from commit 2dd331f1a8f4677bff9b187b6057ed79433a24ea) --- .github/workflows/release.yml | 50 +++++++++++++++++++++++++++++++++++ ci/evaluate-release.sh | 14 ++++++++++ ci/release-java-client.sh | 27 +++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 .github/workflows/release.yml create mode 100755 ci/evaluate-release.sh create mode 100755 ci/release-java-client.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..f69d596fd4 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,50 @@ +name: Release AMQP Java Client + +on: + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v3 + - name: Evaluate release type + run: ci/evaluate-release.sh + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.x' + - name: Set up JDK + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '8' + cache: 'maven' + server-id: ${{ env.maven_server_id }} + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE + - name: Get dependencies + run: make deps + - name: Release AMQP Java Client (GA) + if: ${{ env.ga_release == 'true' }} + run: | + git config user.name "rabbitmq-ci" + git config user.email "rabbitmq-ci@users.noreply.github.com" + ci/release-java-client.sh + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + - name: Release AMQP Java Client (Milestone/RC) + if: ${{ env.ga_release != 'true' }} + run: | + git config user.name "rabbitmq-ci" + git config user.email "rabbitmq-ci@users.noreply.github.com" + ci/release-java-client.sh + env: + MAVEN_USERNAME: '' + MAVEN_PASSWORD: ${{ secrets.PACKAGECLOUD_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} \ No newline at end of file diff --git a/ci/evaluate-release.sh b/ci/evaluate-release.sh new file mode 100755 index 0000000000..4ad656d7a0 --- /dev/null +++ b/ci/evaluate-release.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +source ./release-versions.txt + +if [[ $RELEASE_VERSION == *[RCM]* ]] +then + echo "prerelease=true" >> $GITHUB_ENV + echo "ga_release=false" >> $GITHUB_ENV + echo "maven_server_id=packagecloud-rabbitmq-maven-milestones" >> $GITHUB_ENV +else + echo "prerelease=false" >> $GITHUB_ENV + echo "ga_release=true" >> $GITHUB_ENV + echo "maven_server_id=ossrh" >> $GITHUB_ENV +fi \ No newline at end of file diff --git a/ci/release-java-client.sh b/ci/release-java-client.sh new file mode 100755 index 0000000000..d3fd7df952 --- /dev/null +++ b/ci/release-java-client.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +source ./release-versions.txt +git checkout $RELEASE_BRANCH + +./mvnw release:clean release:prepare -DdryRun=true -Darguments="-DskipTests" --no-transfer-progress \ + --batch-mode -Dtag="v$RELEASE_VERSION" \ + -DreleaseVersion=$RELEASE_VERSION \ + -DdevelopmentVersion=$DEVELOPMENT_VERSION \ + +./mvnw release:clean release:prepare -Darguments="-DskipTests" --no-transfer-progress \ + --batch-mode -Dtag="v$RELEASE_VERSION" \ + -DreleaseVersion=$RELEASE_VERSION \ + -DdevelopmentVersion=$DEVELOPMENT_VERSION + +git checkout "v$RELEASE_VERSION" + +if [[ $RELEASE_VERSION == *[RCM]* ]] +then + MAVEN_PROFILE="milestone" + echo "prerelease=true" >> $GITHUB_ENV +else + MAVEN_PROFILE="release" + echo "prerelease=false" >> $GITHUB_ENV +fi + +./mvnw clean deploy -P $MAVEN_PROFILE -DskipTests --no-transfer-progress \ No newline at end of file From cb5ce5c4a1590ff5283c6a04d95333438496e6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 23 Feb 2023 16:32:40 +0100 Subject: [PATCH 215/657] Use HTTPS in Maven dev connection To avoid key exchange in GHA. (cherry picked from commit bcf93a8297070c8b8ed94aaaafbbce52bea8fee7) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b4cfaacde..19131ee6a9 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git - scm:git:git@github.com:rabbitmq/rabbitmq-java-client.git + scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git HEAD From f7faaefa4cabe85c2429ed465dcbd44a184dd9e6 Mon Sep 17 00:00:00 2001 From: rabbitmq-ci Date: Thu, 23 Feb 2023 15:35:17 +0000 Subject: [PATCH 216/657] [maven-release-plugin] prepare release v5.17.0.RC1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 19131ee6a9..a832f67508 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.17.0-SNAPSHOT + 5.17.0.RC1 jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git - HEAD + v5.17.0.RC1 From 72e9820d8eefc4bc6026aca678ca98e0ca52d5da Mon Sep 17 00:00:00 2001 From: rabbitmq-ci Date: Thu, 23 Feb 2023 15:35:19 +0000 Subject: [PATCH 217/657] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a832f67508..19131ee6a9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.17.0.RC1 + 5.17.0-SNAPSHOT jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git - v5.17.0.RC1 + HEAD From 32c0147d65a5f2a07a1cdc2f756c5899efc597d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Thu, 23 Feb 2023 16:46:48 +0100 Subject: [PATCH 218/657] Set release version to 5.17.0.RC2 --- release-versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-versions.txt b/release-versions.txt index ddbfbaf7af..d19addd36d 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.17.0.RC1" +RELEASE_VERSION="5.17.0.RC2" DEVELOPMENT_VERSION="5.17.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From 6724d1c046a3e8ad978973d3f6ce4755cee3cc50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 00:43:36 +0000 Subject: [PATCH 219/657] Bump metrics-core from 4.2.16 to 4.2.17 Bumps [metrics-core](https://github.com/dropwizard/metrics) from 4.2.16 to 4.2.17. - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.16...v4.2.17) --- updated-dependencies: - dependency-name: io.dropwizard.metrics:metrics-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19131ee6a9..9ded68738e 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ UTF-8 1.7.36 - 4.2.16 + 4.2.17 1.10.4 1.23.1 2.14.1 From 1d233ce4068befbedee07ee89f0198dd2313f543 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 01:07:25 +0000 Subject: [PATCH 220/657] Bump jetty-servlet from 9.4.50.v20221201 to 9.4.51.v20230217 Bumps [jetty-servlet](https://github.com/eclipse/jetty.project) from 9.4.50.v20221201 to 9.4.51.v20230217. - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.50.v20221201...jetty-9.4.51.v20230217) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-servlet dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ded68738e..90d85f05b6 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 5.9.2 5.1.1 3.24.2 - 9.4.50.v20221201 + 9.4.51.v20230217 1.70 0.10 2.10.1 From 7ab4b53e68ecfdebe130c95f6f91880a9d2eac0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 01:07:31 +0000 Subject: [PATCH 221/657] Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ded68738e..a2c124ce1e 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 2.4.21 1.6 3.3.0 - 3.10.1 + 3.11.0 3.0.0-M9 3.0.0-M9 3.0.1 From f987d50c1226fca3f56ffabb79ed6fea3cd4b1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 8 Mar 2023 16:55:03 +0100 Subject: [PATCH 222/657] Use matrix to test broker alphas (cherry picked from commit aeb3efa4471c6403646b6af301ce72acb6641e22) --- .github/workflows/test-native-image.yml | 5 ++--- ...test-3.11-alpha.yml => test-rabbitmq-alphas.yml} | 13 +++++++------ .../workflows/test-supported-java-versions-5.x.yml | 5 ++--- .../workflows/test-supported-java-versions-main.yml | 5 ++--- .../workflows/{test-3.11-stable.yml => test.yml} | 5 ++--- ci/start-broker.sh | 9 ++++----- ci/start-cluster.sh | 11 +++++------ 7 files changed, 24 insertions(+), 29 deletions(-) rename .github/workflows/{test-3.11-alpha.yml => test-rabbitmq-alphas.yml} (84%) rename .github/workflows/{test-3.11-stable.yml => test.yml} (97%) diff --git a/.github/workflows/test-native-image.yml b/.github/workflows/test-native-image.yml index 0a7fc33e9e..e92fe19b11 100644 --- a/.github/workflows/test-native-image.yml +++ b/.github/workflows/test-native-image.yml @@ -6,8 +6,7 @@ on: workflow_dispatch: env: - RABBITMQ_IMAGE_TAG: 3.11 - RABBITMQ_IMAGE: rabbitmq + RABBITMQ_IMAGE: 'rabbitmq:3.11' jobs: build: @@ -64,4 +63,4 @@ jobs: working-directory: rabbitmq-graal-vm-test run: ./rabbitmq-graal-vm-test-full - name: Stop broker - run: docker stop rabbitmq && docker rm rabbitmq \ No newline at end of file + run: docker stop rabbitmq && docker rm rabbitmq diff --git a/.github/workflows/test-3.11-alpha.yml b/.github/workflows/test-rabbitmq-alphas.yml similarity index 84% rename from .github/workflows/test-3.11-alpha.yml rename to .github/workflows/test-rabbitmq-alphas.yml index 20cecc4359..5e981ade59 100644 --- a/.github/workflows/test-3.11-alpha.yml +++ b/.github/workflows/test-rabbitmq-alphas.yml @@ -11,14 +11,13 @@ on: - 5.x.x-stable workflow_dispatch: -env: - RABBITMQ_IMAGE_TAG: 3.11 - RABBITMQ_IMAGE: pivotalrabbitmq/rabbitmq-dev - jobs: build: runs-on: ubuntu-22.04 - + strategy: + matrix: + rabbitmq-image: [ 'pivotalrabbitmq/rabbitmq:v3.11.x-otp-max-bazel', 'pivotalrabbitmq/rabbitmq:v3.12.x-otp-max-bazel' ] + name: Test against ${{ matrix.rabbitmq-image }} steps: - uses: actions/checkout@v3 - name: Checkout tls-gen @@ -38,6 +37,8 @@ jobs: cache: 'maven' - name: Start cluster run: ci/start-cluster.sh + env: + RABBITMQ_IMAGE: ${{ matrix.rabbitmq-image }} - name: Get dependencies run: make deps - name: Test with NIO @@ -57,4 +58,4 @@ jobs: - name: Stop broker A run: docker stop rabbitmq && docker rm rabbitmq - name: Stop broker B - run: docker stop hare && docker rm hare \ No newline at end of file + run: docker stop hare && docker rm hare diff --git a/.github/workflows/test-supported-java-versions-5.x.yml b/.github/workflows/test-supported-java-versions-5.x.yml index 7b24cd3406..5696a4db3d 100644 --- a/.github/workflows/test-supported-java-versions-5.x.yml +++ b/.github/workflows/test-supported-java-versions-5.x.yml @@ -6,8 +6,7 @@ on: workflow_dispatch: env: - RABBITMQ_IMAGE_TAG: 3.11 - RABBITMQ_IMAGE: rabbitmq + RABBITMQ_IMAGE: 'rabbitmq:3.11' jobs: build: @@ -56,4 +55,4 @@ jobs: -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \ --no-transfer-progress - name: Stop broker - run: docker stop rabbitmq && docker rm rabbitmq \ No newline at end of file + run: docker stop rabbitmq && docker rm rabbitmq diff --git a/.github/workflows/test-supported-java-versions-main.yml b/.github/workflows/test-supported-java-versions-main.yml index 8687dbdd32..6d8b473a09 100644 --- a/.github/workflows/test-supported-java-versions-main.yml +++ b/.github/workflows/test-supported-java-versions-main.yml @@ -6,8 +6,7 @@ on: workflow_dispatch: env: - RABBITMQ_IMAGE_TAG: 3.11 - RABBITMQ_IMAGE: rabbitmq + RABBITMQ_IMAGE: 'rabbitmq:3.11' jobs: build: @@ -54,4 +53,4 @@ jobs: -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \ --no-transfer-progress - name: Stop broker - run: docker stop rabbitmq && docker rm rabbitmq \ No newline at end of file + run: docker stop rabbitmq && docker rm rabbitmq diff --git a/.github/workflows/test-3.11-stable.yml b/.github/workflows/test.yml similarity index 97% rename from .github/workflows/test-3.11-stable.yml rename to .github/workflows/test.yml index d9f13bbf3e..d5cc0eb029 100644 --- a/.github/workflows/test-3.11-stable.yml +++ b/.github/workflows/test.yml @@ -10,8 +10,7 @@ on: workflow_dispatch: env: - RABBITMQ_IMAGE_TAG: 3.11 - RABBITMQ_IMAGE: rabbitmq + RABBITMQ_IMAGE: 'rabbitmq:3.11' jobs: build: @@ -67,4 +66,4 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} \ No newline at end of file + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/ci/start-broker.sh b/ci/start-broker.sh index 17e4987ff4..c178e63784 100755 --- a/ci/start-broker.sh +++ b/ci/start-broker.sh @@ -2,8 +2,7 @@ LOCAL_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -RABBITMQ_IMAGE_TAG=${RABBITMQ_IMAGE_TAG:-3.11} -RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq} +RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:3.11} wait_for_message() { while ! docker logs "$1" | grep -q "$2"; @@ -27,15 +26,15 @@ chmod -R o+r rabbitmq-configuration/tls/* ./mvnw -q clean resources:testResources -Dtest-tls-certs.dir=/etc/rabbitmq/tls cp target/test-classes/rabbit@localhost.config rabbitmq-configuration/rabbitmq.config -echo "Running RabbitMQ ${RABBITMQ_IMAGE}:${RABBITMQ_IMAGE_TAG}" +echo "Running RabbitMQ ${RABBITMQ_IMAGE}" docker rm -f rabbitmq 2>/dev/null || echo "rabbitmq was not running" docker run -d --name rabbitmq \ --network host \ -v "${PWD}"/rabbitmq-configuration:/etc/rabbitmq \ - "${RABBITMQ_IMAGE}":"${RABBITMQ_IMAGE_TAG}" + "${RABBITMQ_IMAGE}" wait_for_message rabbitmq "completed with" docker exec rabbitmq rabbitmq-diagnostics erlang_version -docker exec rabbitmq rabbitmqctl version \ No newline at end of file +docker exec rabbitmq rabbitmqctl version diff --git a/ci/start-cluster.sh b/ci/start-cluster.sh index d397d97212..c1dbac0786 100755 --- a/ci/start-cluster.sh +++ b/ci/start-cluster.sh @@ -2,8 +2,7 @@ LOCAL_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -RABBITMQ_IMAGE_TAG=${RABBITMQ_IMAGE_TAG:-3.11} -RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq} +RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:3.11} wait_for_message() { while ! docker logs "$1" | grep -q "$2"; @@ -28,7 +27,7 @@ chmod -R o+r rabbitmq-configuration/tls/* cp target/test-classes/rabbit@localhost.config rabbitmq-configuration/rabbit@localhost.config cp target/test-classes/hare@localhost.config rabbitmq-configuration/hare@localhost.config -echo "Running RabbitMQ ${RABBITMQ_IMAGE}:${RABBITMQ_IMAGE_TAG}" +echo "Running RabbitMQ ${RABBITMQ_IMAGE}" docker rm -f rabbitmq 2>/dev/null || echo "rabbitmq was not running" docker run -d --name rabbitmq \ @@ -38,7 +37,7 @@ docker run -d --name rabbitmq \ --env RABBITMQ_NODENAME=rabbit@$(hostname) \ --env RABBITMQ_NODE_PORT=5672 \ --env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \ - "${RABBITMQ_IMAGE}":"${RABBITMQ_IMAGE_TAG}" + "${RABBITMQ_IMAGE}" # for CLI commands to share the same cookie docker exec rabbitmq bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie" @@ -53,7 +52,7 @@ docker run -d --name hare \ --env RABBITMQ_NODENAME=hare@$(hostname) \ --env RABBITMQ_NODE_PORT=5673 \ --env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \ - "${RABBITMQ_IMAGE}":"${RABBITMQ_IMAGE_TAG}" + "${RABBITMQ_IMAGE}" # for CLI commands to share the same cookie docker exec hare bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie" @@ -77,4 +76,4 @@ docker exec hare rabbitmqctl --node hare@$(hostname) await_startup docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status -docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) cluster_status \ No newline at end of file +docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) cluster_status From 4aa2552f4126353158d8e92b1f814f7d8fc54d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Wed, 8 Mar 2023 16:57:19 +0100 Subject: [PATCH 223/657] Change GHA job label (cherry picked from commit 04b02d2fdd6f46500fd2fcc3ed034716cbfdc672) --- .github/workflows/test-rabbitmq-alphas.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-rabbitmq-alphas.yml b/.github/workflows/test-rabbitmq-alphas.yml index 5e981ade59..2e25fd5e00 100644 --- a/.github/workflows/test-rabbitmq-alphas.yml +++ b/.github/workflows/test-rabbitmq-alphas.yml @@ -1,4 +1,4 @@ -name: Test against RabbitMQ 3.11 alpha +name: Test against RabbitMQ alphas on: schedule: From 99bd44db700201b2ecaaff111d575ad2c1923c88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 01:15:08 +0000 Subject: [PATCH 224/657] Bump mockito-core from 5.1.1 to 5.2.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.1.1...v5.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e32a6648b6..fbc404f982 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.14.1 1.2.11 5.9.2 - 5.1.1 + 5.2.0 3.24.2 9.4.51.v20230217 1.70 From 745fef4729ac229b0ca1b99a9a978d782df49aa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 01:38:28 +0000 Subject: [PATCH 225/657] Bump opentelemetry.version from 1.23.1 to 1.24.0 Bumps `opentelemetry.version` from 1.23.1 to 1.24.0. Updates `opentelemetry-api` from 1.23.1 to 1.24.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.23.1...v1.24.0) Updates `opentelemetry-sdk-testing` from 1.23.1 to 1.24.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.23.1...v1.24.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk-testing dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fbc404f982..d621159eb1 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.7.36 4.2.17 1.10.4 - 1.23.1 + 1.24.0 2.14.1 1.2.11 5.9.2 From 5e189f9a3b2d780c17e5c7c00b515fd2c5f50150 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 01:02:40 +0000 Subject: [PATCH 226/657] Bump micrometer-core from 1.10.4 to 1.10.5 Bumps [micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.10.4 to 1.10.5. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.10.4...v1.10.5) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d621159eb1..8c8100641a 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.36 4.2.17 - 1.10.4 + 1.10.5 1.24.0 2.14.1 1.2.11 From 3d8b27ae0e8772eeb29cc63ced37a2e238a042aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 01:02:51 +0000 Subject: [PATCH 227/657] Bump maven-surefire-plugin from 3.0.0-M9 to 3.0.0 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M9 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d621159eb1..f2db7c2f2c 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 1.6

3.3.0

3.11.0 - 3.0.0-M9 + 3.0.0 3.0.0-M9 3.0.1 3.3.0 From 47d357f3a6a94ba3860f64f82955475c3e7bac67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 01:02:57 +0000 Subject: [PATCH 228/657] Bump keytool-maven-plugin from 1.6 to 1.7 Bumps [keytool-maven-plugin](https://github.com/mojohaus/keytool) from 1.6 to 1.7. - [Release notes](https://github.com/mojohaus/keytool/releases) - [Commits](https://github.com/mojohaus/keytool/compare/keytool-1.6...keytool-1.7) --- updated-dependencies: - dependency-name: org.codehaus.mojo:keytool-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d621159eb1..3e9039d879 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 3.2.1 2.1.1 2.4.21 - 1.6 + 1.7

3.3.0

3.11.0 3.0.0-M9 From a68efe5909be0c2891856cac5d3c308658de52e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 03:18:01 +0000 Subject: [PATCH 229/657] Bump maven-failsafe-plugin from 3.0.0-M9 to 3.0.0 Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M9 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7fe2eef21..3612d7275c 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 3.3.0 3.11.0 3.0.0 - 3.0.0-M9 + 3.0.0 3.0.1 3.3.0 5.1.8 From 34e9c8c73ac4d9c3f002aded8076ebf08fe4afd7 Mon Sep 17 00:00:00 2001 From: rabbitmq-ci Date: Fri, 17 Mar 2023 07:56:50 +0000 Subject: [PATCH 230/657] [maven-release-plugin] prepare release v5.17.0.RC2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1306a526f3..37c0c935d9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.17.0-SNAPSHOT + 5.17.0.RC2 jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git - HEAD + v5.17.0.RC2 From eff0aa844388fa6ccc2cf6940ec6cf99b1c9ae3b Mon Sep 17 00:00:00 2001 From: rabbitmq-ci Date: Fri, 17 Mar 2023 07:56:51 +0000 Subject: [PATCH 231/657] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 37c0c935d9..1306a526f3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.17.0.RC2 + 5.17.0-SNAPSHOT jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git - v5.17.0.RC2 + HEAD From 95969839854bdfc1b9d5e1fbf27e720ecb901039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Fri, 17 Mar 2023 09:01:25 +0100 Subject: [PATCH 232/657] Set release version to 5.17.0.RC3 --- release-versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-versions.txt b/release-versions.txt index d19addd36d..bcfd76826f 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.17.0.RC2" +RELEASE_VERSION="5.17.0.RC3" DEVELOPMENT_VERSION="5.17.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From a8c9c02fe9b009cfc64f7723127cc8b0647ed3d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 01:35:16 +0000 Subject: [PATCH 233/657] Bump metrics-core from 4.2.17 to 4.2.18 Bumps [metrics-core](https://github.com/dropwizard/metrics) from 4.2.17 to 4.2.18. - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.17...v4.2.18) --- updated-dependencies: - dependency-name: io.dropwizard.metrics:metrics-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1306a526f3..64ab10479c 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ UTF-8 1.7.36 - 4.2.17 + 4.2.18 1.10.5 1.24.0 2.14.1 From 98a0b45cb9829abed3d744d50855ff069c0202e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Mon, 20 Mar 2023 09:05:08 +0100 Subject: [PATCH 234/657] Back to metrics 4.2.17 No dependency upgrades during RC phase. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64ab10479c..1306a526f3 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ UTF-8 1.7.36 - 4.2.18 + 4.2.17 1.10.5 1.24.0 2.14.1 From be54463e1558f1961db4144e9d151aaf3872f145 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 01:01:21 +0000 Subject: [PATCH 235/657] Bump maven-release-plugin from 2.5.3 to 3.0.0 Bumps [maven-release-plugin](https://github.com/apache/maven-release) from 2.5.3 to 3.0.0. - [Release notes](https://github.com/apache/maven-release/releases) - [Commits](https://github.com/apache/maven-release/compare/maven-release-2.5.3...maven-release-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-release-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1306a526f3..a317e7440a 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 2.10.1 3.5.0 - 2.5.3 + 3.0.0 2.15.0 3.3.0 3.2.1 From f88bc036602e2d1429a6ea967a265c90d193a381 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 01:01:32 +0000 Subject: [PATCH 236/657] Bump metrics-core from 4.2.17 to 4.2.18 Bumps [metrics-core](https://github.com/dropwizard/metrics) from 4.2.17 to 4.2.18. - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.17...v4.2.18) --- updated-dependencies: - dependency-name: io.dropwizard.metrics:metrics-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1306a526f3..64ab10479c 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ UTF-8 1.7.36 - 4.2.17 + 4.2.18 1.10.5 1.24.0 2.14.1 From 79007637ee1e7fae1f181291add5a083e8694b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Tue, 21 Mar 2023 17:22:06 +0100 Subject: [PATCH 237/657] Set release version to 5.17.0 --- release-versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-versions.txt b/release-versions.txt index bcfd76826f..71321492ca 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.17.0.RC3" -DEVELOPMENT_VERSION="5.17.0-SNAPSHOT" +RELEASE_VERSION="5.17.0" +DEVELOPMENT_VERSION="5.18.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From adf79b6f6e4cfac48be6edf4ed6690abea7ac60d Mon Sep 17 00:00:00 2001 From: rabbitmq-ci Date: Tue, 21 Mar 2023 16:24:30 +0000 Subject: [PATCH 238/657] [maven-release-plugin] prepare release v5.17.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a317e7440a..ef12e84d72 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.17.0-SNAPSHOT + 5.17.0 jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git - HEAD + v5.17.0 From 3e9405ce2528bac8d04f5af208908c78d33d8508 Mon Sep 17 00:00:00 2001 From: rabbitmq-ci Date: Tue, 21 Mar 2023 16:24:32 +0000 Subject: [PATCH 239/657] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ef12e84d72..5de75d16f1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rabbitmq amqp-client - 5.17.0 + 5.18.0-SNAPSHOT jar RabbitMQ Java Client @@ -42,7 +42,7 @@ https://github.com/rabbitmq/rabbitmq-java-client scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git - v5.17.0 + HEAD From bdf28013e86aa3bc52c1f360a70f857c19472d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Tue, 21 Mar 2023 17:40:31 +0100 Subject: [PATCH 240/657] Set release version to 5.18.0.RC1 --- release-versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-versions.txt b/release-versions.txt index 71321492ca..5189a6d325 100644 --- a/release-versions.txt +++ b/release-versions.txt @@ -1,3 +1,3 @@ -RELEASE_VERSION="5.17.0" +RELEASE_VERSION="5.18.0.RC1" DEVELOPMENT_VERSION="5.18.0-SNAPSHOT" RELEASE_BRANCH="5.x.x-stable" From d1b2dfa7ce1731756e157768e23b8a919c4deff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 01:02:10 +0000 Subject: [PATCH 241/657] Bump logback-classic from 1.2.11 to 1.2.12 Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.2.11 to 1.2.12. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.11...v_1.2.12) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b620392b6..04cfa2f8ff 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 1.10.5 1.24.0 2.14.1 - 1.2.11 + 1.2.12 5.9.2 5.2.0 3.24.2 From 1289fd9e0c5e80f38b74c719bbbd314113c84e68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 01:39:00 +0000 Subject: [PATCH 242/657] Bump maven-resources-plugin from 3.3.0 to 3.3.1 Bumps [maven-resources-plugin](https://github.com/apache/maven-resources-plugin) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-resources-plugin/releases) - [Commits](https://github.com/apache/maven-resources-plugin/compare/maven-resources-plugin-3.3.0...maven-resources-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-resources-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04cfa2f8ff..12a0aa9e84 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 3.5.0 3.0.0 2.15.0 - 3.3.0 + 3.3.1 3.2.1 2.1.1 2.4.21 From 7cbf33448019ad293afd51602a1ccb8950ec6ec3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 01:14:31 +0000 Subject: [PATCH 243/657] Bump opentelemetry.version from 1.24.0 to 1.25.0 Bumps `opentelemetry.version` from 1.24.0 to 1.25.0. Updates `opentelemetry-api` from 1.24.0 to 1.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.24.0...v1.25.0) Updates `opentelemetry-sdk-testing` from 1.24.0 to 1.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.24.0...v1.25.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk-testing dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 12a0aa9e84..1da4610f93 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.7.36 4.2.18 1.10.5 - 1.24.0 + 1.25.0 2.14.1 1.2.12 5.9.2 From fabdea820998699c10481e10a103d7eb271c08de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 01:00:52 +0000 Subject: [PATCH 244/657] Bump micrometer-core from 1.10.5 to 1.10.6 Bumps [micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.10.5 to 1.10.6. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.10.5...v1.10.6) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1da4610f93..218d053a43 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.36 4.2.18 - 1.10.5 + 1.10.6 1.25.0 2.14.1 1.2.12 From 6c04eacfe19b26217797b2a7b34aed9f4a430585 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 01:05:33 +0000 Subject: [PATCH 245/657] Bump mockito-core from 5.2.0 to 5.3.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.2.0...v5.3.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 218d053a43..56b0391650 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.14.1 1.2.12 5.9.2 - 5.2.0 + 5.3.0 3.24.2 9.4.51.v20230217 1.70 From 6ab2885afa6d314aa8865f640696bb8246715b02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 01:15:25 +0000 Subject: [PATCH 246/657] Bump jackson-databind from 2.14.1 to 2.15.0 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.14.1 to 2.15.0. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56b0391650..61899cd913 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 4.2.18 1.10.6 1.25.0 - 2.14.1 + 2.15.0 1.2.12 5.9.2 5.3.0 From e6cf599a0ad17ae4a843ac8396dffdf6e33cc10a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 01:15:46 +0000 Subject: [PATCH 247/657] Bump mockito-core from 5.3.0 to 5.3.1 Bumps [mockito-core](https://github.com/mockito/mockito) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.3.0...v5.3.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56b0391650..0d335d9f7c 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.14.1 1.2.12 5.9.2 - 5.3.0 + 5.3.1 3.24.2 9.4.51.v20230217 1.70 From 57abf40cb1ea0642fcfe2dd2e7defe27ffaf35c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 01:00:45 +0000 Subject: [PATCH 248/657] Bump junit-bom from 5.9.2 to 5.9.3 Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 279b7bb5fa..b18428e603 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 1.25.0 2.15.0 1.2.12 - 5.9.2 + 5.9.3 5.3.1 3.24.2 9.4.51.v20230217 From 1074496a4c157b9f2112a2c6a7ee45e6fcf427c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 01:10:04 +0000 Subject: [PATCH 249/657] Bump opentelemetry.version from 1.25.0 to 1.26.0 Bumps `opentelemetry.version` from 1.25.0 to 1.26.0. Updates `opentelemetry-api` from 1.25.0 to 1.26.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.25.0...v1.26.0) Updates `opentelemetry-sdk-testing` from 1.25.0 to 1.26.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.25.0...v1.26.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk-testing dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b18428e603..61f097147a 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.7.36 4.2.18 1.10.6 - 1.25.0 + 1.26.0 2.15.0 1.2.12 5.9.3 From e99d234bd415b913e11bba7447487201e4269af8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 01:10:19 +0000 Subject: [PATCH 250/657] Bump maven-failsafe-plugin from 3.0.0 to 3.1.0 Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b18428e603..c34cd1ecbf 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 3.3.0 3.11.0 3.0.0 - 3.0.0 + 3.1.0 3.0.1 3.3.0 5.1.8 From cd7fc9d1559201a89259f9e29f6094bd5fe0c6e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 05:33:08 +0000 Subject: [PATCH 251/657] Bump maven-surefire-plugin from 3.0.0 to 3.1.0 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c34cd1ecbf..0e6a22d3b9 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 1.7

3.3.0

3.11.0 - 3.0.0 + 3.1.0 3.1.0 3.0.1 3.3.0 From 7004e07435fed97ef7b83adc3962cd38d7cff9b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 05:33:20 +0000 Subject: [PATCH 252/657] Bump maven-gpg-plugin from 3.0.1 to 3.1.0 Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.0.1 to 3.1.0. - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.0.1...maven-gpg-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c34cd1ecbf..5f302c9af3 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 3.11.0 3.0.0 3.1.0 - 3.0.1 + 3.1.0 3.3.0 5.1.8 0.0.6 From 2cbc200a0d7b294447e90436eb69869d170f0ae3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 01:15:28 +0000 Subject: [PATCH 253/657] Bump micrometer-core from 1.10.6 to 1.11.0 Bumps [micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.10.6 to 1.11.0. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.10.6...v1.11.0) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c8f4ac7ed..2fdc6cae56 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.36 4.2.18 - 1.10.6 + 1.11.0 1.26.0 2.15.0 1.2.12 From 5563b7edda710ff8dc279af117b71e3aa4e33dfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 01:10:59 +0000 Subject: [PATCH 254/657] Bump build-helper-maven-plugin from 3.3.0 to 3.4.0 Bumps [build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/build-helper-maven-plugin-3.3.0...3.4.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fdc6cae56..a3775ebd07 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 2.1.1 2.4.21 1.7 - 3.3.0 + 3.4.0 3.11.0 3.1.0 3.1.0 From 49c57cfd24e5a2e1927b91e030b56c1d912ee081 Mon Sep 17 00:00:00 2001 From: Johannes Hahn Date: Mon, 15 May 2023 17:55:24 +0200 Subject: [PATCH 255/657] make RpcClient implement java.io.Closeable (cherry picked from commit 75a94f6374d3ca9ec45322dcfe82df5576a1efd5) --- src/main/java/com/rabbitmq/client/RpcClient.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/RpcClient.java b/src/main/java/com/rabbitmq/client/RpcClient.java index 9d42e60d09..1566662ac7 100644 --- a/src/main/java/com/rabbitmq/client/RpcClient.java +++ b/src/main/java/com/rabbitmq/client/RpcClient.java @@ -18,6 +18,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.Closeable; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.EOFException; @@ -44,7 +45,7 @@ * It simply provides a mechanism for sending a message to an exchange with a given routing key, * and waiting for a response. */ -public class RpcClient { +public class RpcClient implements Closeable { private static final Logger LOGGER = LoggerFactory.getLogger(RpcClient.class); @@ -236,10 +237,13 @@ public void checkConsumer() throws IOException { * Public API - cancels the consumer, thus deleting the temporary queue, and marks the RpcClient as closed. * @throws IOException if an error is encountered */ + @Override public void close() throws IOException { if (_consumer != null) { - _channel.basicCancel(_consumer.getConsumerTag()); + final String consumerTag = _consumer.getConsumerTag(); + // set it null before calling basicCancel to make this method idempotent in case of IOException _consumer = null; + _channel.basicCancel(consumerTag); } } From 22a21bf3a7f179168994efd4e511a235f237b0a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= Date: Tue, 16 May 2023 10:37:04 +0200 Subject: [PATCH 256/657] Use atomic boolean to track state of RpcClient Instead of using the consumer property. Avoids race conditions during closing. References #1033 (cherry picked from commit 22530174398460ef8bd87d431c8ec28aeea8df7c) --- .../java/com/rabbitmq/client/RpcClient.java | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/RpcClient.java b/src/main/java/com/rabbitmq/client/RpcClient.java index 1566662ac7..793c8aa99c 100644 --- a/src/main/java/com/rabbitmq/client/RpcClient.java +++ b/src/main/java/com/rabbitmq/client/RpcClient.java @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2020 VMware, Inc. or its affiliates. All rights reserved. +// Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved. // // This software, the RabbitMQ Java client library, is triple-licensed under the // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2 @@ -13,12 +13,10 @@ // If you have any questions regarding licensing, please contact us at // info@rabbitmq.com. - package com.rabbitmq.client; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.Closeable; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.EOFException; @@ -28,6 +26,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; import java.util.function.Supplier; @@ -45,7 +44,7 @@ * It simply provides a mechanism for sending a message to an exchange with a given routing key, * and waiting for a response. */ -public class RpcClient implements Closeable { +public class RpcClient implements AutoCloseable { private static final Logger LOGGER = LoggerFactory.getLogger(RpcClient.class); @@ -63,6 +62,8 @@ public class RpcClient implements Closeable { protected final static int NO_TIMEOUT = -1; /** Whether to publish RPC requests with the mandatory flag or not. */ private final boolean _useMandatory; + /** closed flag */ + private final AtomicBoolean closed = new AtomicBoolean(false); public final static Function DEFAULT_REPLY_HANDLER = reply -> { if (reply instanceof ShutdownSignalException) { @@ -96,7 +97,7 @@ public class RpcClient implements Closeable { private String lastCorrelationId = "0"; /** Consumer attached to our reply queue */ - private DefaultConsumer _consumer; + private final DefaultConsumer _consumer; /** * Construct a {@link RpcClient} with the passed-in {@link RpcClientParams}. @@ -227,8 +228,8 @@ public RpcClient(Channel channel, String exchange, String routingKey, int timeou * Private API - ensures the RpcClient is correctly open. * @throws IOException if an error is encountered */ - public void checkConsumer() throws IOException { - if (_consumer == null) { + private void checkNotClosed() throws IOException { + if (this.closed.get()) { throw new EOFException("RpcClient is closed"); } } @@ -239,11 +240,8 @@ public void checkConsumer() throws IOException { */ @Override public void close() throws IOException { - if (_consumer != null) { - final String consumerTag = _consumer.getConsumerTag(); - // set it null before calling basicCancel to make this method idempotent in case of IOException - _consumer = null; - _channel.basicCancel(consumerTag); + if (this.closed.compareAndSet(false, true)) { + _channel.basicCancel(_consumer.getConsumerTag()); } } @@ -261,7 +259,7 @@ public void handleShutdownSignal(String consumerTag, for (Entry> entry : _continuationMap.entrySet()) { entry.getValue().set(signal); } - _consumer = null; + closed.set(true); } } @@ -269,8 +267,7 @@ public void handleShutdownSignal(String consumerTag, public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, - byte[] body) - throws IOException { + byte[] body) { synchronized (_continuationMap) { String replyId = properties.getCorrelationId(); BlockingCell

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.