JAMES-2551 use SimpleChannelPool as default in RabbitMQExtension
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/790a203c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/790a203c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/790a203c Branch: refs/heads/master Commit: 790a203ce459e8886fb01cc5ae2e018ff61c5603 Parents: 0e8dd58 Author: duc <[email protected]> Authored: Thu Oct 11 13:57:25 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Thu Oct 25 15:07:52 2018 +0700 ---------------------------------------------------------------------- .../apache/james/backend/rabbitmq/RabbitMQExtension.java | 9 +-------- .../james/backend/rabbitmq/RabbitMQHealthCheckTest.java | 2 +- .../rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java | 2 +- .../apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java | 2 +- .../james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/790a203c/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java ---------------------------------------------------------------------- diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java index 3822e69..2b47bc8 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQExtension.java @@ -37,7 +37,6 @@ import com.nurkiewicz.asyncretry.AsyncRetryExecutor; public class RabbitMQExtension implements BeforeAllCallback, BeforeEachCallback, AfterAllCallback, AfterEachCallback, ParameterResolver { private DockerRabbitMQ rabbitMQ; - private RabbitChannelPoolImpl rabbitChannelPoolImpl; private SimpleChannelPool simpleChannelPool; @Override @@ -49,14 +48,12 @@ public class RabbitMQExtension implements BeforeAllCallback, BeforeEachCallback, @Override public void beforeEach(ExtensionContext extensionContext) throws Exception { RabbitMQConnectionFactory connectionFactory = createRabbitConnectionFactory(); - this.rabbitChannelPoolImpl = new RabbitChannelPoolImpl(connectionFactory); this.simpleChannelPool = new SimpleChannelPool(connectionFactory); } @Override public void afterEach(ExtensionContext context) throws Exception { simpleChannelPool.close(); - rabbitChannelPoolImpl.close(); rabbitMQ.reset(); } @@ -75,11 +72,7 @@ public class RabbitMQExtension implements BeforeAllCallback, BeforeEachCallback, return rabbitMQ; } - public RabbitChannelPoolImpl getRabbitChannelPoolImpl() { - return rabbitChannelPoolImpl; - } - - public SimpleChannelPool getSimpleChannelPool() { + public RabbitMQChannelPool getRabbitChannelPool() { return simpleChannelPool; } http://git-wip-us.apache.org/repos/asf/james-project/blob/790a203c/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQHealthCheckTest.java ---------------------------------------------------------------------- diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQHealthCheckTest.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQHealthCheckTest.java index 0ba57e1..ff85217 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQHealthCheckTest.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQHealthCheckTest.java @@ -35,7 +35,7 @@ class RabbitMQHealthCheckTest { @BeforeEach void setUp() throws Exception { - healthCheck = new RabbitMQHealthCheck(rabbitMQExtension.getRabbitChannelPoolImpl()); + healthCheck = new RabbitMQHealthCheck(rabbitMQExtension.getRabbitChannelPool()); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/790a203c/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java index 860973e..5645bef 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java @@ -106,7 +106,7 @@ class RabbitMQMailQueueConfigurationChangeTest { .managementUri(rabbitMQExtension.getRabbitMQ().managementUri()) .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL) .build(); - rabbitClient = new RabbitClient(rabbitMQExtension.getRabbitChannelPoolImpl()); + rabbitClient = new RabbitClient(rabbitMQExtension.getRabbitChannelPool()); mqManagementApi = new RabbitMQManagementApi(rabbitMQConfiguration); } http://git-wip-us.apache.org/repos/asf/james-project/blob/790a203c/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java index 1c94efb..909e787 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java @@ -121,7 +121,7 @@ public class RabbitMQMailQueueTest implements ManageableMailQueueContract, MailQ .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL) .build(); - RabbitClient rabbitClient = new RabbitClient(rabbitMQExtension.getSimpleChannelPool()); + RabbitClient rabbitClient = new RabbitClient(rabbitMQExtension.getRabbitChannelPool()); RabbitMQMailQueueFactory.PrivateFactory factory = new RabbitMQMailQueueFactory.PrivateFactory( metricTestSystem.getSpyMetricFactory(), metricTestSystem.getSpyGaugeRegistry(), http://git-wip-us.apache.org/repos/asf/james-project/blob/790a203c/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java index 311bafd..0fa4e5a 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMqMailQueueFactoryTest.java @@ -66,7 +66,7 @@ class RabbitMqMailQueueFactoryTest implements MailQueueFactoryContract<RabbitMQM .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL) .build(); - RabbitClient rabbitClient = new RabbitClient(rabbitMQExtension.getRabbitChannelPoolImpl()); + RabbitClient rabbitClient = new RabbitClient(rabbitMQExtension.getRabbitChannelPool()); RabbitMQMailQueueFactory.PrivateFactory factory = new RabbitMQMailQueueFactory.PrivateFactory( new NoopMetricFactory(), new NoopGaugeRegistry(), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
