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 2009/06/24 07:29:34 UTC
svn commit: r787909 - in /camel/trunk:
components/camel-jpa/src/main/java/org/apache/camel/component/jpa/
components/camel-jpa/src/test/java/org/apache/camel/component/jpa/
examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/
Author: davsclaus
Date: Wed Jun 24 05:29:33 2009
New Revision: 787909
URL: http://svn.apache.org/viewvc?rev=787909&view=rev
Log:
CAMEL-1735: Fixed camel-example-etl using type converter not having default no arg ctr. Introduced JpaTemplate as a header from camel-jpa in case you need it.
Added:
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConstants.java (with props)
Modified:
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
Added: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConstants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConstants.java?rev=787909&view=auto
==============================================================================
--- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConstants.java (added)
+++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConstants.java Wed Jun 24 05:29:33 2009
@@ -0,0 +1,32 @@
+/**
+ * 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.component.jpa;
+
+/**
+ * JPA constants
+ *
+ * @version $Revision$
+ */
+public final class JpaConstants {
+
+ public static final String JPA_TEMPLATE = "CamelJpaTemplate";
+
+ private JpaConstants() {
+ // utility class
+ }
+
+}
Propchange: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConstants.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java?rev=787909&r1=787908&r2=787909&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java (original)
+++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java Wed Jun 24 05:29:33 2009
@@ -284,6 +284,7 @@
protected Exchange createExchange(Object result) {
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(result);
+ exchange.getIn().setHeader(JpaConstants.JPA_TEMPLATE, endpoint.getTemplate());
return exchange;
}
}
Modified: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java?rev=787909&r1=787908&r2=787909&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java (original)
+++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java Wed Jun 24 05:29:33 2009
@@ -259,6 +259,7 @@
} else {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
+ exchange.getIn().setHeader(JpaConstants.JPA_TEMPLATE, getTemplate());
Object answer = exchange.getIn().getBody(type);
if (answer == null) {
Object defaultValue = exchange.getIn().getBody();
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java?rev=787909&r1=787908&r2=787909&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java Wed Jun 24 05:29:33 2009
@@ -89,6 +89,9 @@
public void process(Exchange e) {
LOG.info("Received exchange: " + e.getIn());
receivedExchange = e;
+ // should have a JpaTemplate
+ JpaTemplate template = e.getIn().getHeader(JpaConstants.JPA_TEMPLATE, JpaTemplate.class);
+ assertNotNull("Should have a JpaTemplate as header", template);
latch.countDown();
}
});
Modified: camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java?rev=787909&r1=787908&r2=787909&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java (original)
+++ camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java Wed Jun 24 05:29:33 2009
@@ -19,9 +19,9 @@
import java.util.List;
import org.apache.camel.Converter;
+import org.apache.camel.Exchange;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.springframework.orm.jpa.JpaTemplate;
/**
@@ -32,24 +32,21 @@
// START SNIPPET: example
@Converter
public class CustomerTransformer {
- private static final transient Log LOG = LogFactory.getLog(CustomerTransformer.class);
- private JpaTemplate template;
- public CustomerTransformer(JpaTemplate template) {
- this.template = template;
- }
+ private static final transient Log LOG = LogFactory.getLog(CustomerTransformer.class);
/**
* A transformation method to convert a person document into a customer
* entity
*/
@Converter
- public CustomerEntity toCustomer(PersonDocument doc) {
+ public CustomerEntity toCustomer(PersonDocument doc, Exchange exchange) {
+ JpaTemplate template = exchange.getIn().getHeader("CamelJpaTemplate", JpaTemplate.class);
+
String user = doc.getUser();
- CustomerEntity customer = findCustomerByName(user);
+ CustomerEntity customer = findCustomerByName(template, user);
// let's convert information from the document into the entity bean
-
customer.setFirstName(doc.getFirstName());
customer.setSurname(doc.getLastName());
customer.setCity(doc.getCity());
@@ -61,7 +58,7 @@
/**
* Finds a customer for the given username, or creates and inserts a new one
*/
- protected CustomerEntity findCustomerByName(String user) {
+ protected CustomerEntity findCustomerByName(JpaTemplate template, String user) {
List<CustomerEntity> list = template.find("select x from " + CustomerEntity.class.getName() + " x where x.userName = ?1", user);
if (list.isEmpty()) {
CustomerEntity answer = new CustomerEntity();