Updated Branches: refs/heads/master 3115d05ed -> 6f489f1d8
Fixed the CS error of camel-jpa Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b090b186 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b090b186 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b090b186 Branch: refs/heads/master Commit: b090b186126202480082021bf7ca6727d90f33db Parents: 3115d05 Author: Willem Jiang <ningji...@apache.org> Authored: Thu Aug 22 14:10:18 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Thu Aug 22 14:10:18 2013 +0800 ---------------------------------------------------------------------- .../apache/camel/component/jpa/JpaConsumer.java | 8 ++--- .../apache/camel/component/jpa/JpaEndpoint.java | 16 ++++----- .../apache/camel/component/jpa/JpaProducer.java | 20 +++++------ .../idempotent/jpa/JpaMessageIdRepository.java | 28 +++++++-------- .../component/jpa/AbstractJpaMethodTest.java | 8 ++--- .../org/apache/camel/component/jpa/JpaTest.java | 11 +++--- .../camel/component/jpa/JpaUseMergeTest.java | 2 +- .../component/jpa/JpaWithNamedQueryTest.java | 6 ++-- .../interceptor/JpaTraceEventMessageTest.java | 17 ++++----- .../camel/processor/jpa/AbstractJpaTest.java | 11 +++--- .../jpa/FileConsumerJpaIdempotentTest.java | 25 +++++++------- .../processor/jpa/JpaBatchConsumerTest.java | 16 ++++----- .../camel/processor/jpa/JpaFlushOnSendTest.java | 16 ++++----- .../jpa/JpaIdempotentConsumerTest.java | 36 ++++++++++---------- .../processor/jpa/JpaNonTXRollbackTest.java | 16 ++++----- .../jpa/JpaProducerConcurrentTest.java | 16 ++++----- .../processor/jpa/JpaProducerNoBodyTest.java | 16 ++++----- .../jpa/JpaRouteConsumeLockEntityTest.java | 18 +++++----- .../jpa/JpaRouteMaximumResultsTest.java | 16 ++++----- .../camel/processor/jpa/JpaRouteTest.java | 16 ++++----- .../jpa/JpaRoutemaxMessagesPerPollTest.java | 16 ++++----- .../camel/processor/jpa/JpaTXRollbackTest.java | 16 ++++----- 22 files changed, 176 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java index a4a73e4..b48b871 100644 --- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java +++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java @@ -47,7 +47,7 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer { private static final Logger LOG = LoggerFactory.getLogger(JpaConsumer.class); private final JpaEndpoint endpoint; - private final EntityManager entityManager; + private final EntityManager entityManager; private final TransactionTemplate transactionTemplate; private QueryFactory queryFactory; private DeleteHandler<Object> deleteHandler; @@ -81,9 +81,9 @@ public class JpaConsumer extends ScheduledBatchPollingConsumer { Object messagePolled = transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { - entityManager.joinTransaction(); - - Queue<DataHolder> answer = new LinkedList<DataHolder>(); + entityManager.joinTransaction(); + + Queue<DataHolder> answer = new LinkedList<DataHolder>(); Query query = getQueryFactory().createQuery(entityManager); configureParameters(query); http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java index dc17d3f..78c64d2 100644 --- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java +++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java @@ -250,11 +250,11 @@ public class JpaEndpoint extends ScheduledPollEndpoint { } protected EntityManagerFactory createEntityManagerFactory() { - LocalEntityManagerFactoryBean emfBean = new LocalEntityManagerFactoryBean(); - emfBean.setPersistenceUnitName(persistenceUnit); - emfBean.setJpaPropertyMap(getEntityManagerProperties()); - emfBean.afterPropertiesSet(); - return emfBean.getObject(); + LocalEntityManagerFactoryBean emfBean = new LocalEntityManagerFactoryBean(); + emfBean.setPersistenceUnitName(persistenceUnit); + emfBean.setJpaPropertyMap(getEntityManagerProperties()); + emfBean.afterPropertiesSet(); + return emfBean.getObject(); } protected PlatformTransactionManager createTransactionManager() { @@ -265,15 +265,15 @@ public class JpaEndpoint extends ScheduledPollEndpoint { protected EntityManager getEntityManager() { if (entityManager == null) { - entityManager = getEntityManagerFactory().createEntityManager(); + entityManager = getEntityManagerFactory().createEntityManager(); } return entityManager; } protected TransactionTemplate createTransactionTemplate() { - TransactionTemplate transactionTemplate = new TransactionTemplate(getTransactionManager()); + TransactionTemplate transactionTemplate = new TransactionTemplate(getTransactionManager()); transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED); - transactionTemplate.afterPropertiesSet(); + transactionTemplate.afterPropertiesSet(); return transactionTemplate; } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java index 0f9576a..476ba6d 100644 --- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java +++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java @@ -33,8 +33,8 @@ import org.springframework.transaction.support.TransactionTemplate; * @version */ public class JpaProducer extends DefaultProducer { - private final EntityManager entityManager; - private final TransactionTemplate transactionTemplate; + private final EntityManager entityManager; + private final TransactionTemplate transactionTemplate; private final JpaEndpoint endpoint; private final Expression expression; @@ -50,12 +50,12 @@ public class JpaProducer extends DefaultProducer { exchange.getIn().setHeader(JpaConstants.ENTITYMANAGER, entityManager); final Object values = expression.evaluate(exchange, Object.class); if (values != null) { - transactionTemplate.execute(new TransactionCallback<Object>() { + transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); - if (values.getClass().isArray()) { - Object[] array = (Object[]) values; + if (values.getClass().isArray()) { + Object[] array = (Object[])values; for (int index = 0; index < array.length; index++) { Object managedEntity = save(array[index], entityManager); if (!endpoint.isUsePersist()) { @@ -64,7 +64,7 @@ public class JpaProducer extends DefaultProducer { } } else if (values instanceof Collection) { @SuppressWarnings("unchecked") - Collection<Object> collection = (Collection<Object>) values; + Collection<Object> collection = (Collection<Object>)values; List<Object> managedEntities = new ArrayList<Object>(); for (Object entity : collection) { Object managedEntity = save(entity, entityManager); @@ -77,16 +77,16 @@ public class JpaProducer extends DefaultProducer { } else { Object managedEntity = save(values, entityManager); if (!endpoint.isUsePersist()) { - exchange.getIn().setBody(managedEntity); + exchange.getIn().setBody(managedEntity); } } - + if (endpoint.isFlushOnSend()) { // there may be concurrency so need to join tx before flush entityManager.joinTransaction(); entityManager.flush(); } - + return null; } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java b/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java index a46f61c..78c2084 100644 --- a/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java +++ b/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java @@ -75,9 +75,9 @@ public class JpaMessageIdRepository extends ServiceSupport implements Idempotent // Run this in single transaction. Boolean rc = transactionTemplate.execute(new TransactionCallback<Boolean>() { public Boolean doInTransaction(TransactionStatus arg0) { - entityManager.joinTransaction(); - - List<?> list = query(messageId); + entityManager.joinTransaction(); + + List<?> list = query(messageId); if (list.isEmpty()) { MessageProcessed processed = new MessageProcessed(); processed.setProcessorName(processorName); @@ -99,9 +99,9 @@ public class JpaMessageIdRepository extends ServiceSupport implements Idempotent // Run this in single transaction. Boolean rc = transactionTemplate.execute(new TransactionCallback<Boolean>() { public Boolean doInTransaction(TransactionStatus arg0) { - entityManager.joinTransaction(); - - List<?> list = query(messageId); + entityManager.joinTransaction(); + + List<?> list = query(messageId); if (list.isEmpty()) { return Boolean.FALSE; } else { @@ -116,13 +116,13 @@ public class JpaMessageIdRepository extends ServiceSupport implements Idempotent public boolean remove(final String messageId) { Boolean rc = transactionTemplate.execute(new TransactionCallback<Boolean>() { public Boolean doInTransaction(TransactionStatus arg0) { - entityManager.joinTransaction(); - + entityManager.joinTransaction(); + List<?> list = query(messageId); if (list.isEmpty()) { return Boolean.FALSE; } else { - MessageProcessed processed = (MessageProcessed) list.get(0); + MessageProcessed processed = (MessageProcessed)list.get(0); entityManager.remove(processed); entityManager.flush(); return Boolean.TRUE; @@ -133,10 +133,10 @@ public class JpaMessageIdRepository extends ServiceSupport implements Idempotent } private List<?> query(final String messageId) { - Query query = entityManager.createQuery(QUERY_STRING); - query.setParameter(1, processorName); - query.setParameter(2, messageId); - return query.getResultList(); + Query query = entityManager.createQuery(QUERY_STRING); + query.setParameter(1, processorName); + query.setParameter(2, messageId); + return query.getResultList(); } public boolean confirm(String s) { @@ -155,6 +155,6 @@ public class JpaMessageIdRepository extends ServiceSupport implements Idempotent @Override protected void doStop() throws Exception { - entityManager.close(); + entityManager.close(); } } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java index cbf7e0b..1f6b939 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java @@ -152,7 +152,7 @@ public abstract class AbstractJpaMethodTest extends CamelTestSupport { transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); entityManager.createQuery("delete from " + Customer.class.getName()).executeUpdate(); return null; } @@ -163,15 +163,15 @@ public abstract class AbstractJpaMethodTest extends CamelTestSupport { } protected void save(final Customer customer) { - transactionTemplate.execute(new TransactionCallback<Object>() { + transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); entityManager.persist(customer); entityManager.flush(); return null; } }); - + assertEntitiesInDatabase(1, Customer.class.getName()); assertEntitiesInDatabase(1, Address.class.getName()); } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java index 4f50f6f..7125526 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java @@ -16,9 +16,6 @@ */ package org.apache.camel.component.jpa; -import static org.apache.camel.util.ServiceHelper.startServices; -import static org.apache.camel.util.ServiceHelper.stopServices; - import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -42,6 +39,10 @@ import org.slf4j.LoggerFactory; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; + +import static org.apache.camel.util.ServiceHelper.startServices; +import static org.apache.camel.util.ServiceHelper.stopServices; + /** * @version */ @@ -60,9 +61,9 @@ public class JpaTest extends Assert { @Test public void testProducerInsertsIntoDatabaseThenConsumerFiresMessageExchange() throws Exception { - transactionTemplate.execute(new TransactionCallback<Object>() { + transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); // lets delete any exiting records before the test entityManager.createQuery("delete from " + entityName).executeUpdate(); return null; http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java index 4520dce..1a5fe17 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java @@ -40,7 +40,7 @@ public class JpaUseMergeTest extends AbstractJpaMethodTest { final Customer customer = createDefaultCustomer(); transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); entityManager.persist(customer); entityManager.flush(); return null; http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java index 947949e..85126e4 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java @@ -61,9 +61,9 @@ public class JpaWithNamedQueryTest extends Assert { @Test public void testProducerInsertsIntoDatabaseThenConsumerFiresMessageExchange() throws Exception { - transactionTemplate.execute(new TransactionCallback<Object>() { + transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); // lets delete any exiting records before the test entityManager.createQuery("delete from " + entityName).executeUpdate(); @@ -111,7 +111,7 @@ public class JpaWithNamedQueryTest extends Assert { transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus status) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); // now lets assert that there are still 2 entities left List<?> rows = entityManager.createQuery("select x from MultiSteps x").getResultList(); http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java index 13bc233..41bc36e 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java @@ -50,8 +50,9 @@ public class JpaTraceEventMessageTest extends CamelTestSupport { @Before public void setUp() throws Exception { super.setUp(); - EntityManagerFactory entityManagerFactory = applicationContext.getBean("entityManagerFactory", EntityManagerFactory.class); - transactionTemplate = applicationContext.getBean("transactionTemplate", TransactionTemplate.class); + EntityManagerFactory entityManagerFactory = applicationContext.getBean("entityManagerFactory", + EntityManagerFactory.class); + transactionTemplate = applicationContext.getBean("transactionTemplate", TransactionTemplate.class); entityManager = entityManagerFactory.createEntityManager(); cleanupRepository(); } @@ -94,10 +95,10 @@ public class JpaTraceEventMessageTest extends CamelTestSupport { } private void assertEntityInDB() throws Exception { - List<?> list = entityManager.createQuery(SELECT_ALL_STRING).getResultList(); + List<?> list = entityManager.createQuery(SELECT_ALL_STRING).getResultList(); assertEquals(1, list.size()); - - JpaTraceEventMessage db = (JpaTraceEventMessage) list.get(0); + + JpaTraceEventMessage db = (JpaTraceEventMessage)list.get(0); assertNotNull(db.getId()); assertEquals("direct://start", db.getFromEndpointUri()); assertEquals("mock://result", db.getToNode()); @@ -105,12 +106,12 @@ public class JpaTraceEventMessageTest extends CamelTestSupport { } protected void cleanupRepository() { - transactionTemplate.execute(new TransactionCallback<Object>() { + transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus arg0) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); List<?> list = entityManager.createQuery(SELECT_ALL_STRING).getResultList(); for (Object item : list) { - entityManager.remove(item); + entityManager.remove(item); } entityManager.flush(); return Boolean.TRUE; http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java index ecaf5fe..fd0aac5 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java @@ -44,8 +44,9 @@ public abstract class AbstractJpaTest extends CamelTestSupport { @Before public void setUp() throws Exception { super.setUp(); - EntityManagerFactory entityManagerFactory = applicationContext.getBean("entityManagerFactory", EntityManagerFactory.class); - transactionTemplate = applicationContext.getBean("transactionTemplate", TransactionTemplate.class); + EntityManagerFactory entityManagerFactory = applicationContext.getBean("entityManagerFactory", + EntityManagerFactory.class); + transactionTemplate = applicationContext.getBean("transactionTemplate", TransactionTemplate.class); entityManager = entityManagerFactory.createEntityManager(); cleanupRepository(); } @@ -67,10 +68,10 @@ public abstract class AbstractJpaTest extends CamelTestSupport { protected void cleanupRepository() { transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus arg0) { - entityManager.joinTransaction(); + entityManager.joinTransaction(); List<?> list = entityManager.createQuery(selectAllString()).getResultList(); for (Object item : list) { - entityManager.remove(item); + entityManager.remove(item); } entityManager.flush(); return Boolean.TRUE; @@ -88,4 +89,4 @@ public abstract class AbstractJpaTest extends CamelTestSupport { protected abstract String routeXml(); protected abstract String selectAllString(); - } +} http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java index 124f845..1777d37 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java @@ -58,12 +58,12 @@ public class FileConsumerJpaIdempotentTest extends AbstractJpaTest { protected void cleanupRepository() { transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus arg0) { - entityManager.joinTransaction(); - Query query = entityManager.createQuery(SELECT_ALL_STRING); - query.setParameter(1, PROCESSOR_NAME); + entityManager.joinTransaction(); + Query query = entityManager.createQuery(SELECT_ALL_STRING); + query.setParameter(1, PROCESSOR_NAME); List<?> list = query.getResultList(); for (Object item : list) { - entityManager.remove(item); + entityManager.remove(item); } entityManager.flush(); return Boolean.TRUE; @@ -96,15 +96,14 @@ public class FileConsumerJpaIdempotentTest extends AbstractJpaTest { assertMockEndpointsSatisfied(); } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/fileConsumerJpaIdempotentTest-config.xml"; - } - - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/fileConsumerJpaIdempotentTest-config.xml"; + } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java index e655cec..7b8f071 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java @@ -56,13 +56,13 @@ public class JpaBatchConsumerTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java index 054c1d3..eab574c 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java @@ -57,13 +57,13 @@ public class JpaFlushOnSendTest extends AbstractJpaTest { assertIsInstanceOf(SendEmail.class, list.get(0)); } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java index 319c9a1..7870f18 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.processor.jpa; -import static org.apache.camel.processor.idempotent.jpa.JpaMessageIdRepository.jpaMessageIdRepository; - import java.util.HashSet; import java.util.List; import java.util.Set; @@ -37,6 +35,8 @@ import org.junit.Test; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; +import static org.apache.camel.processor.idempotent.jpa.JpaMessageIdRepository.jpaMessageIdRepository; + /** * @version */ @@ -56,12 +56,12 @@ public class JpaIdempotentConsumerTest extends AbstractJpaTest { protected void cleanupRepository() { transactionTemplate.execute(new TransactionCallback<Object>() { public Object doInTransaction(TransactionStatus arg0) { - entityManager.joinTransaction(); - Query query = entityManager.createQuery(SELECT_ALL_STRING); - query.setParameter(1, PROCESSOR_NAME); + entityManager.joinTransaction(); + Query query = entityManager.createQuery(SELECT_ALL_STRING); + query.setParameter(1, PROCESSOR_NAME); List<?> list = query.getResultList(); for (Object item : list) { - entityManager.remove(item); + entityManager.remove(item); } entityManager.flush(); return Boolean.TRUE; @@ -107,8 +107,8 @@ public class JpaIdempotentConsumerTest extends AbstractJpaTest { // all 3 messages should be in jpa repo Set<String> ids = new HashSet<String>(); Query query = entityManager.createQuery(SELECT_ALL_STRING); - query.setParameter(1, PROCESSOR_NAME); - List<MessageProcessed> list = query.getResultList(); + query.setParameter(1, PROCESSOR_NAME); + List<MessageProcessed> list = query.getResultList(); for (MessageProcessed item : list) { ids.add(item.getMessageId()); } @@ -158,8 +158,8 @@ public class JpaIdempotentConsumerTest extends AbstractJpaTest { // only message 1 and 3 should be in jpa repo Set<String> ids = new HashSet<String>(); Query query = entityManager.createQuery(SELECT_ALL_STRING); - query.setParameter(1, PROCESSOR_NAME); - List<MessageProcessed> list = query.getResultList(); + query.setParameter(1, PROCESSOR_NAME); + List<MessageProcessed> list = query.getResultList(); for (MessageProcessed item : list) { ids.add(item.getMessageId()); } @@ -180,14 +180,14 @@ public class JpaIdempotentConsumerTest extends AbstractJpaTest { }); } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/spring.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/spring.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java index d43db8d..bd9ddc9 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java @@ -86,13 +86,13 @@ public class JpaNonTXRollbackTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java index 086b67e..5678083 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java @@ -85,13 +85,13 @@ public class JpaProducerConcurrentTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java index 3e5d1da..885f4db 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java @@ -49,14 +49,14 @@ public class JpaProducerNoBodyTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java index 1429eaf..55e66c6 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java @@ -49,13 +49,13 @@ public class JpaRouteConsumeLockEntityTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } - - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } + + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java index 86d4d22..dba4d54 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java @@ -55,13 +55,13 @@ public class JpaRouteMaximumResultsTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java index 871fc73..1f26f76 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java @@ -54,13 +54,13 @@ public class JpaRouteTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java index f7b473b..11f0837 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java @@ -52,13 +52,13 @@ public class JpaRoutemaxMessagesPerPollTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/b090b186/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java index a063e18..f1cd1be 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java @@ -81,13 +81,13 @@ public class JpaTXRollbackTest extends AbstractJpaTest { }; } - @Override - protected String routeXml() { - return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; - } + @Override + protected String routeXml() { + return "org/apache/camel/processor/jpa/springJpaRouteTest.xml"; + } - @Override - protected String selectAllString() { - return SELECT_ALL_STRING; - } + @Override + protected String selectAllString() { + return SELECT_ALL_STRING; + } }
