You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/07/23 12:43:00 UTC
git commit: CAMEL-6534: Polished the new RabbitMQ component codebase
a bit.
Updated Branches:
refs/heads/master 961c54fe5 -> 23d0452ff
CAMEL-6534: Polished the new RabbitMQ component codebase a bit.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23d0452f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23d0452f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23d0452f
Branch: refs/heads/master
Commit: 23d0452ff7f8552dcece8f47a011e59f19f46c04
Parents: 961c54f
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Jul 23 12:42:54 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Jul 23 12:42:54 2013 +0200
----------------------------------------------------------------------
components/camel-rabbitmq/pom.xml | 15 ++-------------
.../camel/component/rabbitmq/RabbitMQEndpoint.java | 5 ++---
.../camel/component/rabbitmq/RabbitMQProducer.java | 6 ++----
.../component/rabbitmq/RabbitMQConsumerTest.java | 2 +-
.../component/rabbitmq/RabbitMQEndpointTest.java | 8 +++-----
5 files changed, 10 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/23d0452f/components/camel-rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/pom.xml b/components/camel-rabbitmq/pom.xml
index cedce02..4218b03 100644
--- a/components/camel-rabbitmq/pom.xml
+++ b/components/camel-rabbitmq/pom.xml
@@ -44,28 +44,17 @@
<version>${rabbitmq-amqp-client-version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+
+ <!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/camel/blob/23d0452f/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index d43a73e..a62ad9c 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -23,7 +23,6 @@ import java.net.URISyntaxException;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadPoolExecutor;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
@@ -196,7 +195,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
this.vhost = vhost;
}
- public ThreadPoolExecutor createExecutor() {
- return (ThreadPoolExecutor) Executors.newFixedThreadPool(getThreadPoolSize());
+ public ExecutorService createExecutor() {
+ return Executors.newFixedThreadPool(getThreadPoolSize());
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23d0452f/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
index 69086f6..3cf7233 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
@@ -31,13 +31,11 @@ import org.apache.camel.impl.DefaultProducer;
public class RabbitMQProducer extends DefaultProducer {
- private final RabbitMQEndpoint endpoint;
- private Connection conn;
- private Channel channel;
+ private final Connection conn;
+ private final Channel channel;
public RabbitMQProducer(RabbitMQEndpoint endpoint) throws IOException {
super(endpoint);
- this.endpoint = endpoint;
this.conn = endpoint.connect(Executors.newSingleThreadExecutor());
this.channel = conn.createChannel();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23d0452f/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
index 4cb75f2..5a17480 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
@@ -58,7 +58,7 @@ public class RabbitMQConsumerTest {
public void testStoppingConsumerShutsdownConnection() throws Exception {
RabbitMQConsumer consumer = new RabbitMQConsumer(endpoint, processor);
- Mockito.when(endpoint.createExecutor()).thenReturn((ThreadPoolExecutor) Executors.newFixedThreadPool(3));
+ Mockito.when(endpoint.createExecutor()).thenReturn(Executors.newFixedThreadPool(3));
Mockito.when(endpoint.connect(Matchers.any(ExecutorService.class))).thenReturn(conn);
Mockito.when(conn.createChannel()).thenReturn(channel);
http://git-wip-us.apache.org/repos/asf/camel/blob/23d0452f/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
index a65ecb2..7db87ea 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
@@ -23,13 +23,11 @@ import java.util.concurrent.ThreadPoolExecutor;
import com.rabbitmq.client.Envelope;
import org.apache.camel.Exchange;
+import org.apache.camel.test.junit4.TestSupport;
import org.junit.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class RabbitMQEndpointTest {
+public class RabbitMQEndpointTest extends TestSupport {
private Envelope envelope = Mockito.mock(Envelope.class);
@@ -58,8 +56,8 @@ public class RabbitMQEndpointTest {
RabbitMQEndpoint endpoint =
new RabbitMQEndpoint("rabbitmq:localhost/exchange", "localhost/exchange", new RabbitMQComponent());
endpoint.setThreadPoolSize(400);
- ThreadPoolExecutor executor = endpoint.createExecutor();
+ ThreadPoolExecutor executor = assertIsInstanceOf(ThreadPoolExecutor.class, endpoint.createExecutor());
assertEquals(400, executor.getCorePoolSize());
}