You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/09/10 11:10:43 UTC
[1/4] git commit: CAMEL-6722: binding component - Should start/stop
its child services
Updated Branches:
refs/heads/camel-2.11.x 7965197fa -> ae23e200b
refs/heads/master e45aa788a -> b92d62375
CAMEL-6722: binding component - Should start/stop its child services
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/62b934d7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/62b934d7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/62b934d7
Branch: refs/heads/master
Commit: 62b934d7272b46e97378fa777b9755ae7bb156ee
Parents: e45aa78
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 10 10:25:39 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 10 10:25:39 2013 +0200
----------------------------------------------------------------------
.../camel/component/binding/BindingComponent.java | 3 ++-
.../binding/BindingConsumerProcessor.java | 12 ++++++++++--
.../camel/component/binding/BindingEndpoint.java | 18 +++++++++++++++++-
.../component/binding/BindingNameComponent.java | 1 -
.../camel/component/binding/BindingProducer.java | 12 ++++++++++--
.../processor/binding/DataFormatBinding.java | 14 ++++++++++++--
6 files changed, 51 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/62b934d7/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
index 933ed00..f3497ba 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
@@ -81,10 +81,11 @@ public class BindingComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
Binding bindingValue = getBinding();
ObjectHelper.notNull(bindingValue, "binding");
+
CamelContext camelContext = getCamelContext();
String delegateURI = createDelegateURI(remaining, parameters);
Endpoint delegate = getMandatoryEndpoint(camelContext, delegateURI);
- return new BindingEndpoint(uri, this, bindingValue, delegate);
+ return new BindingEndpoint(uri, this, bindingValue, delegate);
}
protected String createDelegateURI(String remaining, Map<String, Object> parameters) {
http://git-wip-us.apache.org/repos/asf/camel/blob/62b934d7/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java
index 9a3d897..f6d8b80 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.binding;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.ServiceSupport;
@@ -42,11 +43,18 @@ public class BindingConsumerProcessor extends ServiceSupport implements Processo
@Override
protected void doStart() throws Exception {
- ServiceHelper.startService(bindingProcessor);
+ // inject CamelContext
+ if (bindingProcessor instanceof CamelContextAware) {
+ ((CamelContextAware) bindingProcessor).setCamelContext(endpoint.getCamelContext());
+ }
+ if (delegateProcessor instanceof CamelContextAware) {
+ ((CamelContextAware) delegateProcessor).setCamelContext(endpoint.getCamelContext());
+ }
+ ServiceHelper.startServices(bindingProcessor, delegateProcessor);
}
@Override
protected void doStop() throws Exception {
- ServiceHelper.stopService(bindingProcessor);
+ ServiceHelper.stopServices(delegateProcessor, bindingProcessor);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/62b934d7/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
index c45c76e..1c44fb3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.binding;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
@@ -26,6 +27,7 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.Binding;
import org.apache.camel.spi.HasBinding;
import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.ServiceHelper;
/**
* Applies a {@link org.apache.camel.spi.Binding} to an underlying {@link Endpoint} so that the binding processes messages
@@ -67,7 +69,6 @@ public class BindingEndpoint extends DefaultEndpoint implements HasBinding {
return delegate;
}
-
/**
* Applies the {@link Binding} processor to the given exchange before passing it on to the delegateProcessor (either a producer or consumer)
*/
@@ -93,4 +94,19 @@ public class BindingEndpoint extends DefaultEndpoint implements HasBinding {
return answer;
}
+ @Override
+ protected void doStart() throws Exception {
+ // inject CamelContext
+ if (binding instanceof CamelContextAware) {
+ ((CamelContextAware) binding).setCamelContext(getCamelContext());
+ }
+ ServiceHelper.startServices(delegate, binding);
+ super.doStart();
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ ServiceHelper.stopServices(delegate, binding);
+ super.doStop();
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/62b934d7/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java
index 53294d3..211b56b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java
@@ -36,7 +36,6 @@ public class BindingNameComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-
CamelContext camelContext = getCamelContext();
int idx = remaining.indexOf(":");
if (idx <= 0) {
http://git-wip-us.apache.org/repos/asf/camel/blob/62b934d7/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java
index 2bb40eb..4d728e7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.binding;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -34,8 +35,8 @@ public class BindingProducer extends DefaultProducer {
public BindingProducer(BindingEndpoint endpoint) throws Exception {
super(endpoint);
this.endpoint = endpoint;
- bindingProcessor = endpoint.getBinding().createProduceProcessor();
- delegateProducer = endpoint.getDelegate().createProducer();
+ this.bindingProcessor = endpoint.getBinding().createProduceProcessor();
+ this.delegateProducer = endpoint.getDelegate().createProducer();
}
@Override
@@ -45,6 +46,13 @@ public class BindingProducer extends DefaultProducer {
@Override
protected void doStart() throws Exception {
+ // inject CamelContext
+ if (bindingProcessor instanceof CamelContextAware) {
+ ((CamelContextAware) bindingProcessor).setCamelContext(getEndpoint().getCamelContext());
+ }
+ if (delegateProducer instanceof CamelContextAware) {
+ ((CamelContextAware) delegateProducer).setCamelContext(getEndpoint().getCamelContext());
+ }
ServiceHelper.startServices(bindingProcessor, delegateProducer);
super.doStart();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/62b934d7/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java b/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
index dab786e..bd4c597 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
@@ -21,13 +21,14 @@ import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.Binding;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
/**
* Represents a {@link org.apache.camel.spi.Binding} which Marshals the message in the ProduceProcessor and
* Unmarshals the message in the ConsumeProcessor
*/
-public class DataFormatBinding implements Binding {
+public class DataFormatBinding extends ServiceSupport implements Binding {
private DataFormat producerDataFormat;
private DataFormat consumerDataFormat;
@@ -63,7 +64,6 @@ public class DataFormatBinding implements Binding {
setProducerDataFormat(dataFormat);
}
-
public DataFormat getConsumerDataFormat() {
return consumerDataFormat;
}
@@ -79,4 +79,14 @@ public class DataFormatBinding implements Binding {
public void setProducerDataFormat(DataFormat producerDataFormat) {
this.producerDataFormat = producerDataFormat;
}
+
+ @Override
+ protected void doStart() throws Exception {
+ // noop
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ // noop
+ }
}
[2/4] git commit: CAMEL-6718: Marshal should leverage stream caching
if enabled. Thanks to Franz Forsthofer for patch.
Posted by da...@apache.org.
CAMEL-6718: Marshal should leverage stream caching if enabled. Thanks to Franz Forsthofer for patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/224836d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/224836d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/224836d0
Branch: refs/heads/master
Commit: 224836d008449337fc9dad102fa3417186c8aefd
Parents: 62b934d
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 10 10:26:35 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 10 10:26:35 2013 +0200
----------------------------------------------------------------------
.../camel/processor/MarshalProcessor.java | 27 ++++++++++++++++----
1 file changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/224836d0/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
index 2c47081..c26d00a 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Traceable;
+import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorHelper;
@@ -35,7 +36,7 @@ import org.apache.camel.util.ServiceHelper;
* Marshals the body of the incoming message using the given
* <a href="http://camel.apache.org/data-format.html">data format</a>
*
- * @version
+ * @version
*/
public class MarshalProcessor extends ServiceSupport implements AsyncProcessor, Traceable, CamelContextAware {
private CamelContext camelContext;
@@ -52,7 +53,18 @@ public class MarshalProcessor extends ServiceSupport implements AsyncProcessor,
public boolean process(Exchange exchange, AsyncCallback callback) {
ObjectHelper.notNull(dataFormat, "dataFormat");
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ // if stream caching is enabled then use that so we can stream accordingly
+ // for example to overflow to disk for big streams
+ CachedOutputStream cos;
+ ByteArrayOutputStream os;
+ if (exchange.getContext().getStreamCachingStrategy().isEnabled()) {
+ cos = new CachedOutputStream(exchange);
+ os = null;
+ } else {
+ cos = null;
+ os = new ByteArrayOutputStream();
+ }
+
Message in = exchange.getIn();
Object body = in.getBody();
@@ -62,9 +74,14 @@ public class MarshalProcessor extends ServiceSupport implements AsyncProcessor,
out.copyFrom(in);
try {
- dataFormat.marshal(exchange, body, buffer);
- byte[] data = buffer.toByteArray();
- out.setBody(data);
+ dataFormat.marshal(exchange, body, os);
+
+ if (cos != null) {
+ out.setBody(cos.newStreamCache());
+ } else {
+ byte[] data = os.toByteArray();
+ out.setBody(data);
+ }
} catch (Exception e) {
// remove OUT message, as an exception occurred
exchange.setOut(null);
[3/4] git commit: CAMEL-6723: Fixed Message history - Possible
ArrayIndexOutOfBoundsException
Posted by da...@apache.org.
CAMEL-6723: Fixed Message history - Possible ArrayIndexOutOfBoundsException
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b92d6237
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b92d6237
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b92d6237
Branch: refs/heads/master
Commit: b92d62375940af87184634c7946e2d3292fc6ac4
Parents: 224836d
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 10 11:08:16 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 10 11:08:16 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultExchange.java | 9 +++
.../org/apache/camel/processor/Splitter.java | 2 +
.../org/apache/camel/util/ExchangeHelper.java | 11 ++++
.../MessageHistoryCopyExchangeTest.java | 66 ++++++++++++++++++++
4 files changed, 88 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b92d6237/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
index b755b70..2c4a615 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
@@ -26,6 +26,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
+import org.apache.camel.MessageHistory;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.util.ExchangeHelper;
@@ -95,10 +96,18 @@ public final class DefaultExchange implements Exchange {
return exchange;
}
+ @SuppressWarnings("unchecked")
private static Map<String, Object> safeCopy(Map<String, Object> properties) {
if (properties == null) {
return null;
}
+
+ // safe copy message history using a defensive copy
+ List<MessageHistory> history = (List<MessageHistory>) properties.remove(Exchange.MESSAGE_HISTORY);
+ if (history != null) {
+ properties.put(Exchange.MESSAGE_HISTORY, new ArrayList<MessageHistory>(history));
+ }
+
return new ConcurrentHashMap<String, Object>(properties);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b92d6237/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java b/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
index 76b5e02..a9dd334 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
@@ -252,6 +252,8 @@ public class Splitter extends MulticastProcessor implements AsyncProcessor, Trac
Exchange answer = ExchangeHelper.createCopy(exchange, preserveExchangeId);
// we do not want attachments for the splitted sub-messages
answer.getIn().setAttachments(null);
+ // we do not want to copy the message history for splitted sub-messages
+ answer.getProperties().remove(Exchange.MESSAGE_HISTORY);
return answer;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b92d6237/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java b/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
index b6f04d8..bc9943d 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
@@ -16,7 +16,9 @@
*/
package org.apache.camel.util;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
@@ -32,6 +34,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
+import org.apache.camel.MessageHistory;
import org.apache.camel.NoSuchBeanException;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.NoSuchHeaderException;
@@ -813,10 +816,18 @@ public final class ExchangeHelper {
return answer;
}
+ @SuppressWarnings("unchecked")
private static Map<String, Object> safeCopy(Map<String, Object> properties) {
if (properties == null) {
return null;
}
+
+ // safe copy message history using a defensive copy
+ List<MessageHistory> history = (List<MessageHistory>) properties.remove(Exchange.MESSAGE_HISTORY);
+ if (history != null) {
+ properties.put(Exchange.MESSAGE_HISTORY, new ArrayList<MessageHistory>(history));
+ }
+
return new ConcurrentHashMap<String, Object>(properties);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b92d6237/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryCopyExchangeTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryCopyExchangeTest.java b/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryCopyExchangeTest.java
new file mode 100644
index 0000000..3628f87
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryCopyExchangeTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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;
+
+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;
+
+/**
+ * @version
+ */
+public class MessageHistoryCopyExchangeTest extends ContextTestSupport {
+
+ public void testDefensiveCopyOfMessageHistory() throws Exception {
+ MockEndpoint a = getMockEndpoint("mock:a");
+ a.expectedMessageCount(1);
+ MockEndpoint b = getMockEndpoint("mock:b");
+ b.expectedMessageCount(1);
+
+ template.sendBody("seda:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+
+ List listA = (List) a.getReceivedExchanges().get(0).getProperty(Exchange.MESSAGE_HISTORY);
+ List listB = (List) b.getReceivedExchanges().get(0).getProperty(Exchange.MESSAGE_HISTORY);
+
+ assertNotSame(listA, listB);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ context.setMessageHistory(true);
+
+ from("seda:start")
+ .to("log:foo")
+ .to("mock:a")
+ .to("direct:bar")
+ .to("mock:b");
+
+ from("direct:bar")
+ .to("log:bar")
+ .to("mock:bar");
+ }
+ };
+ }
+}
[4/4] git commit: CAMEL-6722: binding component - Should start/stop
its child services
Posted by da...@apache.org.
CAMEL-6722: binding component - Should start/stop its child services
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ae23e200
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ae23e200
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ae23e200
Branch: refs/heads/camel-2.11.x
Commit: ae23e200bba27b2bb840f33f1c37092e41c99402
Parents: 7965197
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 10 10:25:39 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 10 11:09:45 2013 +0200
----------------------------------------------------------------------
.../camel/component/binding/BindingComponent.java | 3 ++-
.../binding/BindingConsumerProcessor.java | 12 ++++++++++--
.../camel/component/binding/BindingEndpoint.java | 18 +++++++++++++++++-
.../component/binding/BindingNameComponent.java | 1 -
.../camel/component/binding/BindingProducer.java | 12 ++++++++++--
.../processor/binding/DataFormatBinding.java | 14 ++++++++++++--
6 files changed, 51 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ae23e200/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
index 933ed00..f3497ba 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
@@ -81,10 +81,11 @@ public class BindingComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
Binding bindingValue = getBinding();
ObjectHelper.notNull(bindingValue, "binding");
+
CamelContext camelContext = getCamelContext();
String delegateURI = createDelegateURI(remaining, parameters);
Endpoint delegate = getMandatoryEndpoint(camelContext, delegateURI);
- return new BindingEndpoint(uri, this, bindingValue, delegate);
+ return new BindingEndpoint(uri, this, bindingValue, delegate);
}
protected String createDelegateURI(String remaining, Map<String, Object> parameters) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ae23e200/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java
index 9a3d897..f6d8b80 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingConsumerProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.binding;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.ServiceSupport;
@@ -42,11 +43,18 @@ public class BindingConsumerProcessor extends ServiceSupport implements Processo
@Override
protected void doStart() throws Exception {
- ServiceHelper.startService(bindingProcessor);
+ // inject CamelContext
+ if (bindingProcessor instanceof CamelContextAware) {
+ ((CamelContextAware) bindingProcessor).setCamelContext(endpoint.getCamelContext());
+ }
+ if (delegateProcessor instanceof CamelContextAware) {
+ ((CamelContextAware) delegateProcessor).setCamelContext(endpoint.getCamelContext());
+ }
+ ServiceHelper.startServices(bindingProcessor, delegateProcessor);
}
@Override
protected void doStop() throws Exception {
- ServiceHelper.stopService(bindingProcessor);
+ ServiceHelper.stopServices(delegateProcessor, bindingProcessor);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ae23e200/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
index c45c76e..1c44fb3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.binding;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
@@ -26,6 +27,7 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.Binding;
import org.apache.camel.spi.HasBinding;
import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.ServiceHelper;
/**
* Applies a {@link org.apache.camel.spi.Binding} to an underlying {@link Endpoint} so that the binding processes messages
@@ -67,7 +69,6 @@ public class BindingEndpoint extends DefaultEndpoint implements HasBinding {
return delegate;
}
-
/**
* Applies the {@link Binding} processor to the given exchange before passing it on to the delegateProcessor (either a producer or consumer)
*/
@@ -93,4 +94,19 @@ public class BindingEndpoint extends DefaultEndpoint implements HasBinding {
return answer;
}
+ @Override
+ protected void doStart() throws Exception {
+ // inject CamelContext
+ if (binding instanceof CamelContextAware) {
+ ((CamelContextAware) binding).setCamelContext(getCamelContext());
+ }
+ ServiceHelper.startServices(delegate, binding);
+ super.doStart();
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ ServiceHelper.stopServices(delegate, binding);
+ super.doStop();
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ae23e200/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java
index 53294d3..211b56b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingNameComponent.java
@@ -36,7 +36,6 @@ public class BindingNameComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-
CamelContext camelContext = getCamelContext();
int idx = remaining.indexOf(":");
if (idx <= 0) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ae23e200/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java
index 2bb40eb..4d728e7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingProducer.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.binding;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -34,8 +35,8 @@ public class BindingProducer extends DefaultProducer {
public BindingProducer(BindingEndpoint endpoint) throws Exception {
super(endpoint);
this.endpoint = endpoint;
- bindingProcessor = endpoint.getBinding().createProduceProcessor();
- delegateProducer = endpoint.getDelegate().createProducer();
+ this.bindingProcessor = endpoint.getBinding().createProduceProcessor();
+ this.delegateProducer = endpoint.getDelegate().createProducer();
}
@Override
@@ -45,6 +46,13 @@ public class BindingProducer extends DefaultProducer {
@Override
protected void doStart() throws Exception {
+ // inject CamelContext
+ if (bindingProcessor instanceof CamelContextAware) {
+ ((CamelContextAware) bindingProcessor).setCamelContext(getEndpoint().getCamelContext());
+ }
+ if (delegateProducer instanceof CamelContextAware) {
+ ((CamelContextAware) delegateProducer).setCamelContext(getEndpoint().getCamelContext());
+ }
ServiceHelper.startServices(bindingProcessor, delegateProducer);
super.doStart();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ae23e200/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java b/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
index dab786e..bd4c597 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/binding/DataFormatBinding.java
@@ -21,13 +21,14 @@ import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.Binding;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
/**
* Represents a {@link org.apache.camel.spi.Binding} which Marshals the message in the ProduceProcessor and
* Unmarshals the message in the ConsumeProcessor
*/
-public class DataFormatBinding implements Binding {
+public class DataFormatBinding extends ServiceSupport implements Binding {
private DataFormat producerDataFormat;
private DataFormat consumerDataFormat;
@@ -63,7 +64,6 @@ public class DataFormatBinding implements Binding {
setProducerDataFormat(dataFormat);
}
-
public DataFormat getConsumerDataFormat() {
return consumerDataFormat;
}
@@ -79,4 +79,14 @@ public class DataFormatBinding implements Binding {
public void setProducerDataFormat(DataFormat producerDataFormat) {
this.producerDataFormat = producerDataFormat;
}
+
+ @Override
+ protected void doStart() throws Exception {
+ // noop
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ // noop
+ }
}