This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 8fa086c7402c288db97b41e0f075e0c252fccc3b
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Thu Aug 1 14:30:09 2019 +0200
JAMES-2813 move RabbitMQ channel pool to rabbitmq backend project
---
backends-common/rabbitmq/pom.xml | 6 +++++-
.../apache/james/backend/rabbitmq}/ReactorRabbitMQChannelPool.java | 6 +++---
.../org/apache/james/backend/rabbitmq}/ChannelPoolContract.java | 2 +-
.../james/backend/rabbitmq}/ReactorRabbitMQChannelPoolTest.java | 3 ++-
.../main/java/org/apache/james/mailbox/events/RabbitMQEventBus.java | 1 +
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/backends-common/rabbitmq/pom.xml b/backends-common/rabbitmq/pom.xml
index 48dd167..564fbf1 100644
--- a/backends-common/rabbitmq/pom.xml
+++ b/backends-common/rabbitmq/pom.xml
@@ -86,6 +86,10 @@
<artifactId>commons-configuration2</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -127,4 +131,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git
a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPool.java
b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/ReactorRabbitMQChannelPool.java
similarity index 96%
rename from
mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPool.java
rename to
backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/ReactorRabbitMQChannelPool.java
index 19ddf7e..f05a307 100644
---
a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPool.java
+++
b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/ReactorRabbitMQChannelPool.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.events;
+package org.apache.james.backend.rabbitmq;
import java.time.Duration;
import java.util.Comparator;
@@ -40,7 +40,7 @@ import reactor.core.publisher.SignalType;
import reactor.core.scheduler.Schedulers;
import reactor.rabbitmq.ChannelPool;
-class ReactorRabbitMQChannelPool implements ChannelPool {
+public class ReactorRabbitMQChannelPool implements ChannelPool {
static class ChannelFactory extends BasePooledObjectFactory<Channel> {
@@ -90,7 +90,7 @@ class ReactorRabbitMQChannelPool implements ChannelPool {
private final GenericObjectPool<Channel> pool;
private final ConcurrentSkipListSet<Channel> borrowedChannels;
- ReactorRabbitMQChannelPool(Mono<Connection> connectionMono, int poolSize) {
+ public ReactorRabbitMQChannelPool(Mono<Connection> connectionMono, int
poolSize) {
ChannelFactory channelFactory = new ChannelFactory(connectionMono);
GenericObjectPoolConfig<Channel> config = new
GenericObjectPoolConfig<>();
diff --git
a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ChannelPoolContract.java
b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/ChannelPoolContract.java
similarity index 98%
rename from
mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ChannelPoolContract.java
rename to
backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/ChannelPoolContract.java
index 8843f28..7543883 100644
---
a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ChannelPoolContract.java
+++
b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/ChannelPoolContract.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.events;
+package org.apache.james.backend.rabbitmq;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git
a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPoolTest.java
b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/ReactorRabbitMQChannelPoolTest.java
similarity index 97%
rename from
mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPoolTest.java
rename to
backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/ReactorRabbitMQChannelPoolTest.java
index 3ee78f7..24146dc 100644
---
a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/ReactorRabbitMQChannelPoolTest.java
+++
b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/ReactorRabbitMQChannelPoolTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.events;
+package org.apache.james.backend.rabbitmq;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutionException;
import org.apache.james.backend.rabbitmq.RabbitMQExtension;
+import org.apache.james.backend.rabbitmq.ReactorRabbitMQChannelPool;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RabbitMQEventBus.java
b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RabbitMQEventBus.java
index 7c6fd8f..bd53e93 100644
---
a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RabbitMQEventBus.java
+++
b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RabbitMQEventBus.java
@@ -24,6 +24,7 @@ import java.util.Set;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
+import org.apache.james.backend.rabbitmq.ReactorRabbitMQChannelPool;
import org.apache.james.backend.rabbitmq.SimpleConnectionPool;
import org.apache.james.event.json.EventSerializer;
import org.apache.james.lifecycle.api.Startable;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
