You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/06/14 13:43:21 UTC
[1/3] camel git commit: CAMEL-8868 Camel-Hazelcast: Add
remainingCapacity operation to queue
Repository: camel
Updated Branches:
refs/heads/master e20ae861b -> 359bf0e45
CAMEL-8868 Camel-Hazelcast: Add remainingCapacity operation to queue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8f71ae3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8f71ae3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8f71ae3
Branch: refs/heads/master
Commit: a8f71ae32366087d6e8e5cdc559eaa9d04cec786
Parents: e20ae86
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Jun 14 13:30:13 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Jun 14 13:30:42 2015 +0200
----------------------------------------------------------------------
.../camel/component/hazelcast/HazelcastConstants.java | 3 ++-
.../hazelcast/queue/HazelcastQueueProducer.java | 8 ++++++++
.../component/hazelcast/HazelcastQueueProducerTest.java | 11 +++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a8f71ae3/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
index fcc7256..11c775e 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
@@ -83,9 +83,10 @@ public final class HazelcastConstants {
public static final int OFFER_OPERATION = 32;
public static final int PEEK_OPERATION = 33;
public static final int POLL_OPERATION = 34;
+ public static final int REMAINING_CAPACITY_OPERATION = 35;
// topic
- public static final int PUBLISH_OPERATION = 35;
+ public static final int PUBLISH_OPERATION = 36;
/*
* header values
http://git-wip-us.apache.org/repos/asf/camel/blob/a8f71ae3/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
index 46c7488..4575439 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
@@ -69,6 +69,10 @@ public class HazelcastQueueProducer extends HazelcastDefaultProducer {
this.remove(exchange);
break;
+ case HazelcastConstants.REMAINING_CAPACITY_OPERATION:
+ this.remainingCapacity(exchange);
+ break;
+
default:
throw new IllegalArgumentException(String.format("The value '%s' is not allowed for parameter '%s' on the QUEUE cache.", operation, HazelcastConstants.OPERATION));
}
@@ -109,4 +113,8 @@ public class HazelcastQueueProducer extends HazelcastDefaultProducer {
this.queue.remove();
}
}
+
+ private void remainingCapacity(Exchange exchange) {
+ exchange.getOut().setBody(this.queue.remainingCapacity());
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a8f71ae3/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
index 76e47ef..3807e98 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
@@ -114,6 +114,14 @@ public class HazelcastQueueProducerTest extends HazelcastCamelTestSupport {
verify(queue).peek();
assertEquals("foo", answer);
}
+
+ @Test
+ public void remainingCapacity() throws InterruptedException {
+ when(queue.remainingCapacity()).thenReturn(10);
+ int answer = template.requestBody("direct:remainingCapacity", null, Integer.class);
+ verify(queue).remainingCapacity();
+ assertEquals(10, answer);
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -137,6 +145,9 @@ public class HazelcastQueueProducerTest extends HazelcastCamelTestSupport {
from("direct:removevalue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMOVEVALUE_OPERATION)).to(
String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX));
+ from("direct:remainingCapacity").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMAINING_CAPACITY_OPERATION)).to(
+ String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX));
+
from("direct:putWithOperationNumber").toF(String.format("hazelcast:%sbar?operation=%s", HazelcastConstants.QUEUE_PREFIX, HazelcastConstants.PUT_OPERATION));
from("direct:putWithOperationName").toF(String.format("hazelcast:%sbar?operation=put", HazelcastConstants.QUEUE_PREFIX));
[2/3] camel git commit: CAMEL-8868 Add remainingCapacity operation to
HazelcastComponentHelper mapping
Posted by ac...@apache.org.
CAMEL-8868 Add remainingCapacity operation to HazelcastComponentHelper mapping
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2acb2a05
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2acb2a05
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2acb2a05
Branch: refs/heads/master
Commit: 2acb2a05fd6ff2d0ee8aca1d09a18d3b67d0b684
Parents: a8f71ae
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Jun 14 13:33:26 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Jun 14 13:33:26 2015 +0200
----------------------------------------------------------------------
.../apache/camel/component/hazelcast/HazelcastComponentHelper.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2acb2a05/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
index b1b876d..448bc56 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
@@ -116,6 +116,7 @@ public final class HazelcastComponentHelper {
addMapping("offer", HazelcastConstants.OFFER_OPERATION);
addMapping("peek", HazelcastConstants.PEEK_OPERATION);
addMapping("poll", HazelcastConstants.POLL_OPERATION);
+ addMapping("remainingCapacity", HazelcastConstants.REMAINING_CAPACITY_OPERATION);
// topic
addMapping("publish", HazelcastConstants.PUBLISH_OPERATION);
[3/3] camel git commit: Fixed CS
Posted by ac...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/359bf0e4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/359bf0e4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/359bf0e4
Branch: refs/heads/master
Commit: 359bf0e45a7eef2efdc2d8ad6f275233bef23777
Parents: 2acb2a0
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Jun 14 13:42:36 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Jun 14 13:42:36 2015 +0200
----------------------------------------------------------------------
.../camel/component/hazelcast/queue/HazelcastQueueProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/359bf0e4/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
index 4575439..c814e3c 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
@@ -115,6 +115,6 @@ public class HazelcastQueueProducer extends HazelcastDefaultProducer {
}
private void remainingCapacity(Exchange exchange) {
- exchange.getOut().setBody(this.queue.remainingCapacity());
+ exchange.getOut().setBody(this.queue.remainingCapacity());
}
}
\ No newline at end of file