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 2016/08/16 12:11:56 UTC
[1/6] camel git commit: CAMEL-10245 Added some code comments to avoid
confusion
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 2fa4fd030 -> 199263a1a
refs/heads/master 92ebceef3 -> ab5f6d988
CAMEL-10245 Added some code comments to avoid confusion
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab5f6d98
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab5f6d98
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab5f6d98
Branch: refs/heads/master
Commit: ab5f6d988bbfe5b7d82d906726e1390c92049ccf
Parents: f053f17
Author: Bob Gaudaen <bo...@gmail.com>
Authored: Tue Aug 16 09:49:45 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 16 14:07:53 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/jpa/JpaProducer.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ab5f6d98/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 c8f5483..14fae7c 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
@@ -125,7 +125,16 @@ public class JpaProducer extends DefaultProducer {
private Object remove(final Object entity) {
LOG.debug("remove: {}", entity);
- Object managedEntity = entityManager.contains(entity) ? entity : entityManager.merge(entity);
+ Object managedEntity;
+
+ // First check if entity is attached to the persistence context
+ if (entityManager.contains(entity)) {
+ managedEntity = entity;
+ } else {
+ // If not, merge entity state into context before removing it
+ managedEntity = entityManager.merge(entity);
+ }
+
entityManager.remove(managedEntity);
return managedEntity;
}
[3/6] camel git commit: CAMEL-10245 Fixed JpaProducer remove feature
Posted by da...@apache.org.
CAMEL-10245 Fixed JpaProducer remove feature
Check if entity is managed in current persistence context and merge if needed before removing.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f053f176
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f053f176
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f053f176
Branch: refs/heads/master
Commit: f053f1760d85ea157bae821cad11b6a2f0071f2c
Parents: 4b1db04
Author: Bob Gaudaen <bo...@gmail.com>
Authored: Mon Aug 15 16:31:30 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 16 14:07:53 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jpa/JpaProducer.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f053f176/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 dc73588..c8f5483 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
@@ -124,8 +124,10 @@ public class JpaProducer extends DefaultProducer {
*/
private Object remove(final Object entity) {
LOG.debug("remove: {}", entity);
- entityManager.remove(entity);
- return entity;
+
+ Object managedEntity = entityManager.contains(entity) ? entity : entityManager.merge(entity);
+ entityManager.remove(managedEntity);
+ return managedEntity;
}
});
}
[4/6] camel git commit: CAMEL-10245 Updated JpaProducerRemoveTest to
remove previously persisted entity instead of new entity
Posted by da...@apache.org.
CAMEL-10245 Updated JpaProducerRemoveTest to remove previously persisted entity instead of new entity
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c10ad5b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c10ad5b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c10ad5b9
Branch: refs/heads/camel-2.17.x
Commit: c10ad5b984eb86b2644a47420dd2821cf41ad242
Parents: 2fa4fd0
Author: Bob Gaudaen <bo...@gmail.com>
Authored: Mon Aug 15 16:25:04 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 16 14:11:24 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c10ad5b9/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
index e076522..65dbaa3 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
@@ -51,7 +51,7 @@ public class JpaProducerRemoveTest extends AbstractJpaTest {
mock.reset();
entityManager = emf.createEntityManager();
- template.sendBody("direct:remove", new SendEmail("foo@beer.org"));
+ template.sendBody("direct:remove", persistedEntity);
exchange = mock.getReceivedExchanges().get(0);
persistedEntity = exchange.getIn().getBody(SendEmail.class);
emfindEntity = entityManager.find(SendEmail.class, persistedEntity.getId());
[6/6] camel git commit: CAMEL-10245 Added some code comments to avoid
confusion
Posted by da...@apache.org.
CAMEL-10245 Added some code comments to avoid confusion
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/199263a1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/199263a1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/199263a1
Branch: refs/heads/camel-2.17.x
Commit: 199263a1aa3c9a1c8688906eb9dbb6e7455b5a95
Parents: 3f26b6b
Author: Bob Gaudaen <bo...@gmail.com>
Authored: Tue Aug 16 09:49:45 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 16 14:11:46 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/jpa/JpaProducer.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/199263a1/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 c8f5483..14fae7c 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
@@ -125,7 +125,16 @@ public class JpaProducer extends DefaultProducer {
private Object remove(final Object entity) {
LOG.debug("remove: {}", entity);
- Object managedEntity = entityManager.contains(entity) ? entity : entityManager.merge(entity);
+ Object managedEntity;
+
+ // First check if entity is attached to the persistence context
+ if (entityManager.contains(entity)) {
+ managedEntity = entity;
+ } else {
+ // If not, merge entity state into context before removing it
+ managedEntity = entityManager.merge(entity);
+ }
+
entityManager.remove(managedEntity);
return managedEntity;
}
[2/6] camel git commit: CAMEL-10245 Updated JpaProducerRemoveTest to
remove previously persisted entity instead of new entity
Posted by da...@apache.org.
CAMEL-10245 Updated JpaProducerRemoveTest to remove previously persisted entity instead of new entity
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4b1db04b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4b1db04b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4b1db04b
Branch: refs/heads/master
Commit: 4b1db04b94d8e7122c02a258daea9f0970827a00
Parents: 92ebcee
Author: Bob Gaudaen <bo...@gmail.com>
Authored: Mon Aug 15 16:25:04 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 16 14:07:53 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4b1db04b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
index e076522..65dbaa3 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
@@ -51,7 +51,7 @@ public class JpaProducerRemoveTest extends AbstractJpaTest {
mock.reset();
entityManager = emf.createEntityManager();
- template.sendBody("direct:remove", new SendEmail("foo@beer.org"));
+ template.sendBody("direct:remove", persistedEntity);
exchange = mock.getReceivedExchanges().get(0);
persistedEntity = exchange.getIn().getBody(SendEmail.class);
emfindEntity = entityManager.find(SendEmail.class, persistedEntity.getId());
[5/6] camel git commit: CAMEL-10245 Fixed JpaProducer remove feature
Posted by da...@apache.org.
CAMEL-10245 Fixed JpaProducer remove feature
Check if entity is managed in current persistence context and merge if needed before removing.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3f26b6b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3f26b6b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3f26b6b9
Branch: refs/heads/camel-2.17.x
Commit: 3f26b6b9d1e621f85ee8536b179de99debcd8f8e
Parents: c10ad5b
Author: Bob Gaudaen <bo...@gmail.com>
Authored: Mon Aug 15 16:31:30 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 16 14:11:38 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/jpa/JpaProducer.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3f26b6b9/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 dc73588..c8f5483 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
@@ -124,8 +124,10 @@ public class JpaProducer extends DefaultProducer {
*/
private Object remove(final Object entity) {
LOG.debug("remove: {}", entity);
- entityManager.remove(entity);
- return entity;
+
+ Object managedEntity = entityManager.contains(entity) ? entity : entityManager.merge(entity);
+ entityManager.remove(managedEntity);
+ return managedEntity;
}
});
}