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 2010/12/18 15:51:36 UTC
svn commit: r1050641 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/test/java/org/apache/camel/processor/
components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/
components/camel-jaxb/src/test/java/o...
Author: davsclaus
Date: Sat Dec 18 14:51:35 2010
New Revision: 1050641
URL: http://svn.apache.org/viewvc?rev=1050641&view=rev
Log:
CAMEL-3441: DataFormat now supports Service and CamelContextAware which means its easier to do custom initialization logic in your data formats. CAMEL-3438: Attempt to use classloader from CamelContext with JAXB to fix classloading issues in for example OSGi runtimes.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java?rev=1050641&r1=1050640&r2=1050641&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java Sat Dec 18 14:51:35 2010
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Channel;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -159,6 +160,11 @@ public class DefaultChannel extends Serv
Processor target = nextProcessor;
Processor next;
+ // init CamelContextAware as early as possible on target
+ if (target instanceof CamelContextAware) {
+ ((CamelContextAware) target).setCamelContext(camelContext);
+ }
+
// first wrap the output with the managed strategy if any
InterceptStrategy managed = routeContext.getManagedInterceptStrategy();
if (managed != null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java?rev=1050641&r1=1050640&r2=1050641&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java Sat Dec 18 14:51:35 2010
@@ -18,11 +18,15 @@ package org.apache.camel.processor;
import java.io.ByteArrayOutputStream;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ServiceHelper;
/**
* Marshals the body of the incoming message using the given
@@ -30,7 +34,8 @@ import org.apache.camel.util.ObjectHelpe
*
* @version $Revision$
*/
-public class MarshalProcessor implements Processor, Traceable {
+public class MarshalProcessor extends ServiceSupport implements Processor, Traceable, CamelContextAware {
+ private CamelContext camelContext;
private final DataFormat dataFormat;
public MarshalProcessor(DataFormat dataFormat) {
@@ -62,4 +67,26 @@ public class MarshalProcessor implements
public String getTraceLabel() {
return "marshal[" + dataFormat + "]";
}
+
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ // inject CamelContext on data format
+ if (dataFormat instanceof CamelContextAware) {
+ ((CamelContextAware) dataFormat).setCamelContext(camelContext);
+ }
+ ServiceHelper.startService(dataFormat);
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ ServiceHelper.stopService(dataFormat);
+ }
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java?rev=1050641&r1=1050640&r2=1050641&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java Sat Dec 18 14:51:35 2010
@@ -18,12 +18,16 @@ package org.apache.camel.processor;
import java.io.InputStream;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ServiceHelper;
/**
* Unmarshals the body of the incoming message using the given
@@ -31,7 +35,8 @@ import org.apache.camel.util.ObjectHelpe
*
* @version $Revision$
*/
-public class UnmarshalProcessor implements Processor, Traceable {
+public class UnmarshalProcessor extends ServiceSupport implements Processor, Traceable, CamelContextAware {
+ private CamelContext camelContext;
private final DataFormat dataFormat;
public UnmarshalProcessor(DataFormat dataFormat) {
@@ -64,4 +69,27 @@ public class UnmarshalProcessor implemen
public String getTraceLabel() {
return "unmarshal[" + dataFormat + "]";
}
+
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ // inject CamelContext on data format
+ if (dataFormat instanceof CamelContextAware) {
+ ((CamelContextAware) dataFormat).setCamelContext(camelContext);
+ }
+ ServiceHelper.startService(dataFormat);
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ ServiceHelper.stopService(dataFormat);
+ }
+
}
\ No newline at end of file
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java?rev=1050641&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatServiceTest.java Sat Dec 18 14:51:35 2010
@@ -0,0 +1,112 @@
+/**
+ * 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.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.spi.DataFormat;
+
+/**
+ * Test that data format receives callback if its a service / CamelContextAware
+ *
+ * @version $Revision$
+ */
+public class DataFormatServiceTest extends ContextTestSupport {
+
+ private final MyDataFormat my = new MyDataFormat();
+
+ public void testMarshal() throws Exception {
+ assertEquals(true, my.isStarted());
+ assertSame(context, my.getCamelContext());
+
+ getMockEndpoint("mock:a").expectedBodiesReceived("Hi Camel");
+
+ template.sendBody("direct:a", "Hello World");
+
+ assertMockEndpointsSatisfied();
+
+ context.stop();
+
+ assertEquals(true, my.isStopped());
+ assertSame(context, my.getCamelContext());
+ }
+
+ public void testUnmarshal() throws Exception {
+ assertEquals(true, my.isStarted());
+ assertSame(context, my.getCamelContext());
+
+ getMockEndpoint("mock:b").expectedBodiesReceived("Bye World");
+
+ template.sendBody("direct:b", "Hello World");
+
+ assertMockEndpointsSatisfied();
+
+ context.stop();
+
+ assertEquals(true, my.isStopped());
+ assertSame(context, my.getCamelContext());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:a").marshal(my).to("mock:a");
+ from("direct:b").unmarshal(my).to("mock:b");
+ }
+ };
+ }
+
+ private class MyDataFormat extends ServiceSupport implements DataFormat, CamelContextAware {
+
+ private CamelContext camelContext;
+
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception {
+ stream.write("Hi Camel".getBytes());
+ }
+
+ public Object unmarshal(Exchange exchange, InputStream stream) throws Exception {
+ return "Bye World";
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ // noop
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ // noop
+ }
+ }
+}
Modified: camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java?rev=1050641&r1=1050640&r2=1050641&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java (original)
+++ camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java Sat Dec 18 14:51:35 2010
@@ -21,7 +21,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
@@ -35,10 +34,13 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
/**
* A <a href="http://camel.apache.org/data-format.html">data format</a> ({@link DataFormat})
@@ -46,8 +48,9 @@ import org.apache.camel.util.IOHelper;
*
* @version $Revision$
*/
-public class JaxbDataFormat implements DataFormat {
+public class JaxbDataFormat implements DataFormat, CamelContextAware {
+ private CamelContext camelContext;
private JAXBContext context;
private String contextPath;
private boolean prettyPrint = true;
@@ -237,9 +240,19 @@ public class JaxbDataFormat implements D
this.partClass = partClass;
}
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
protected JAXBContext createContext() throws JAXBException {
if (contextPath != null) {
- return JAXBContext.newInstance(contextPath);
+ ObjectHelper.notNull(camelContext, "CamelContext", this);
+ // use class loader from CamelContext to ensure the JAXB class loading works in various runtimes
+ return JAXBContext.newInstance(contextPath, camelContext.getClass().getClassLoader());
} else {
return JAXBContext.newInstance();
}
Modified: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java?rev=1050641&r1=1050640&r2=1050641&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java (original)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatTest.java Sat Dec 18 14:51:35 2010
@@ -41,7 +41,6 @@ public class DataFormatTest extends Came
@Test
public void testMarshalThenUnmarshalBean() throws Exception {
-
PurchaseOrder bean = new PurchaseOrder();
bean.setName("Beer");
bean.setAmount(23);
@@ -77,7 +76,6 @@ public class DataFormatTest extends Came
assertTrue("There should some sapce between <Person> and <firstName>", indexFirstName - indexPerson > 8);
}
-
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
@@ -91,7 +89,7 @@ public class DataFormatTest extends Came
to("direct:marshalled");
from("direct:marshalled").
- unmarshal().jaxb("org.apache.camel.example").
+ unmarshal(example).//.jaxb("org.apache.camel.example").
to("mock:result");
from("direct:prettyPrint").