You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/04/03 04:15:08 UTC
[1/4] camel git commit: CAMEL-8593 Added the missing log parameter in
JmsEndpoint.configureListenerContainer()
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 2b975957f -> 595d1c534
refs/heads/camel-2.15.x bc44fd751 -> fc4aa78f4
CAMEL-8593 Added the missing log parameter in JmsEndpoint.configureListenerContainer()
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/910e1492
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/910e1492
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/910e1492
Branch: refs/heads/camel-2.15.x
Commit: 910e149280bd2d2d8bafa4946dc02ee9a22d36e3
Parents: bc44fd7
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 3 09:47:21 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 3 10:14:04 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jms/JmsEndpoint.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/910e1492/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
index 21a2dab..8008293 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
@@ -187,10 +187,10 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
public void configureListenerContainer(AbstractMessageListenerContainer listenerContainer, JmsConsumer consumer) {
if (destinationName != null) {
listenerContainer.setDestinationName(destinationName);
- log.debug("Using destinationName: {} on listenerContainer: ", destinationName, listenerContainer);
+ log.debug("Using destinationName: {} on listenerContainer: {}", destinationName, listenerContainer);
} else if (destination != null) {
listenerContainer.setDestination(destination);
- log.debug("Using destination: {} on listenerContainer: ", destinationName, listenerContainer);
+ log.debug("Using destination: {} on listenerContainer: {}", destinationName, listenerContainer);
} else {
DestinationResolver resolver = getDestinationResolver();
if (resolver != null) {
@@ -198,7 +198,7 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
} else {
throw new IllegalArgumentException("Neither destination, destinationName or destinationResolver are specified on this endpoint!");
}
- log.debug("Using destinationResolver: {} on listenerContainer: ", resolver, listenerContainer);
+ log.debug("Using destinationResolver: {} on listenerContainer: {}", resolver, listenerContainer);
}
listenerContainer.setPubSubDomain(pubSubDomain);
[3/4] camel git commit: CAMEL-8593 Added the missing log parameter in
JmsEndpoint.configureListenerContainer()
Posted by ni...@apache.org.
CAMEL-8593 Added the missing log parameter in JmsEndpoint.configureListenerContainer()
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7663ac03
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7663ac03
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7663ac03
Branch: refs/heads/camel-2.14.x
Commit: 7663ac030e190fc03f33131e5e52ac0a49bac6d3
Parents: 2b97595
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 3 09:47:21 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 3 10:14:39 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jms/JmsEndpoint.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7663ac03/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
index af15397..7da1427 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
@@ -168,10 +168,10 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
public void configureListenerContainer(AbstractMessageListenerContainer listenerContainer, JmsConsumer consumer) {
if (destinationName != null) {
listenerContainer.setDestinationName(destinationName);
- log.debug("Using destinationName: {} on listenerContainer: ", destinationName, listenerContainer);
+ log.debug("Using destinationName: {} on listenerContainer: {}", destinationName, listenerContainer);
} else if (destination != null) {
listenerContainer.setDestination(destination);
- log.debug("Using destination: {} on listenerContainer: ", destinationName, listenerContainer);
+ log.debug("Using destination: {} on listenerContainer: {}", destinationName, listenerContainer);
} else {
DestinationResolver resolver = getDestinationResolver();
if (resolver != null) {
@@ -179,7 +179,7 @@ public class JmsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
} else {
throw new IllegalArgumentException("Neither destination, destinationName or destinationResolver are specified on this endpoint!");
}
- log.debug("Using destinationResolver: {} on listenerContainer: ", resolver, listenerContainer);
+ log.debug("Using destinationResolver: {} on listenerContainer: {}", resolver, listenerContainer);
}
listenerContainer.setPubSubDomain(pubSubDomain);
[2/4] camel git commit: CAMEL-8592 Fixed the NPE in
AbstractListAggregationStrategy if empty list
Posted by ni...@apache.org.
CAMEL-8592 Fixed the NPE in AbstractListAggregationStrategy if empty list
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc4aa78f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc4aa78f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc4aa78f
Branch: refs/heads/camel-2.15.x
Commit: fc4aa78f4d982c34f5c1656355507ac323989954
Parents: 910e149
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 3 10:00:21 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 3 10:14:05 2015 +0800
----------------------------------------------------------------------
.../AbstractListAggregationStrategy.java | 2 +-
...omListAggregationStrategyEmptySplitTest.java | 81 ++++++++++++++++++++
2 files changed, 82 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fc4aa78f/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
index ad2ec8e..d4ff93f 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
@@ -62,7 +62,7 @@ public abstract class AbstractListAggregationStrategy<V> implements CompletionAw
@SuppressWarnings("unchecked")
public void onCompletion(Exchange exchange) {
- if (isStoreAsBodyOnCompletion()) {
+ if (exchange != null && isStoreAsBodyOnCompletion()) {
List<V> list = (List<V>) exchange.removeProperty(Exchange.GROUPED_EXCHANGE);
if (list != null) {
exchange.getIn().setBody(list);
http://git-wip-us.apache.org/repos/asf/camel/blob/fc4aa78f/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
new file mode 100644
index 0000000..2bf45ef
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.aggregator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.AbstractListAggregationStrategy;
+
+/**
+ *
+ */
+public class CustomListAggregationStrategyEmptySplitTest extends
+ ContextTestSupport {
+
+ @SuppressWarnings("unchecked")
+ public void testCustomAggregationStrategy() throws Exception {
+ getMockEndpoint("mock:line").expectedBodiesReceived();
+
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedMessageCount(1);
+ result.message(0).body().isInstanceOf(List.class);
+
+ List<String> body = new ArrayList<String>();
+
+ template.sendBody("direct:start", body);
+
+ assertMockEndpointsSatisfied();
+
+ // the list will be stored as the message body by default
+ List<Integer> numbers = result.getExchanges().get(0).getIn()
+ .getBody(List.class);
+ assertNotNull(numbers);
+ assertEquals(0, numbers.size());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .split(body(), new MyListOfNumbersStrategy())
+ .to("mock:line").end().to("mock:result");
+ }
+ };
+ }
+
+ /**
+ * Our strategy is irrelevant as getValue will not be called on an empty
+ * list, however this strategy will group a list of integers.
+ */
+ public final class MyListOfNumbersStrategy extends
+ AbstractListAggregationStrategy<Integer> {
+
+ @Override
+ public Integer getValue(Exchange exchange) {
+ String s = exchange.getIn().getBody(String.class);
+ return Integer.valueOf(s);
+ }
+ }
+
+}
[4/4] camel git commit: CAMEL-8592 Fixed the NPE in
AbstractListAggregationStrategy if empty list
Posted by ni...@apache.org.
CAMEL-8592 Fixed the NPE in AbstractListAggregationStrategy if empty list
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/595d1c53
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/595d1c53
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/595d1c53
Branch: refs/heads/camel-2.14.x
Commit: 595d1c534c4eece5884b00d281e80f2462ec0dc1
Parents: 7663ac0
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 3 10:00:21 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 3 10:14:40 2015 +0800
----------------------------------------------------------------------
.../AbstractListAggregationStrategy.java | 2 +-
...omListAggregationStrategyEmptySplitTest.java | 81 ++++++++++++++++++++
2 files changed, 82 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/595d1c53/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
index ad2ec8e..d4ff93f 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
@@ -62,7 +62,7 @@ public abstract class AbstractListAggregationStrategy<V> implements CompletionAw
@SuppressWarnings("unchecked")
public void onCompletion(Exchange exchange) {
- if (isStoreAsBodyOnCompletion()) {
+ if (exchange != null && isStoreAsBodyOnCompletion()) {
List<V> list = (List<V>) exchange.removeProperty(Exchange.GROUPED_EXCHANGE);
if (list != null) {
exchange.getIn().setBody(list);
http://git-wip-us.apache.org/repos/asf/camel/blob/595d1c53/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
new file mode 100644
index 0000000..2bf45ef
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.aggregator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.AbstractListAggregationStrategy;
+
+/**
+ *
+ */
+public class CustomListAggregationStrategyEmptySplitTest extends
+ ContextTestSupport {
+
+ @SuppressWarnings("unchecked")
+ public void testCustomAggregationStrategy() throws Exception {
+ getMockEndpoint("mock:line").expectedBodiesReceived();
+
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedMessageCount(1);
+ result.message(0).body().isInstanceOf(List.class);
+
+ List<String> body = new ArrayList<String>();
+
+ template.sendBody("direct:start", body);
+
+ assertMockEndpointsSatisfied();
+
+ // the list will be stored as the message body by default
+ List<Integer> numbers = result.getExchanges().get(0).getIn()
+ .getBody(List.class);
+ assertNotNull(numbers);
+ assertEquals(0, numbers.size());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .split(body(), new MyListOfNumbersStrategy())
+ .to("mock:line").end().to("mock:result");
+ }
+ };
+ }
+
+ /**
+ * Our strategy is irrelevant as getValue will not be called on an empty
+ * list, however this strategy will group a list of integers.
+ */
+ public final class MyListOfNumbersStrategy extends
+ AbstractListAggregationStrategy<Integer> {
+
+ @Override
+ public Integer getValue(Exchange exchange) {
+ String s = exchange.getIn().getBody(String.class);
+ return Integer.valueOf(s);
+ }
+ }
+
+}