You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/10/13 13:44:50 UTC
[5/5] git commit: Avoid openjpa warnings about fields being accessed
directly instead of using the corresponding setter/getter. Conflicts:
components/camel-jpa/src/test/java/org/apache/camel/examples/SendEmail.java
Avoid openjpa warnings about fields being accessed directly instead of using the corresponding setter/getter.
Conflicts:
components/camel-jpa/src/test/java/org/apache/camel/examples/SendEmail.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/97171d28
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/97171d28
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/97171d28
Branch: refs/heads/camel-2.12.x
Commit: 97171d285488e8b59830191efd656a9745421acf
Parents: b4fe0e1
Author: bvahdat <bv...@apache.org>
Authored: Sun Oct 13 12:40:00 2013 +0200
Committer: bvahdat <bv...@apache.org>
Committed: Sun Oct 13 13:10:38 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/examples/MultiSteps.java | 9 +--------
.../java/org/apache/camel/examples/SendEmail.java | 15 ++++++++-------
2 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/97171d28/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java b/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
index 3e8fc51..17c6e82 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
@@ -48,13 +48,6 @@ public class MultiSteps {
setStep(1);
}
- @Override
- public String toString() {
- // TODO: don't make use of the id property here as it could potentially end up
- // with a deadlock through the openjpa generated proxy object of this entity
- return "MultiSteps[step: " + getStep() + " address: " + getAddress() + "]";
- }
-
@Id
@GeneratedValue
public Long getId() {
@@ -88,6 +81,6 @@ public class MultiSteps {
public void goToNextStep() {
setStep(getStep() + 1);
- LOG.info("Invoked the completion complete method. Now updated the step to: " + getStep());
+ LOG.info("Invoked the completion complete method. Now updated the step to: {}", getStep());
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/97171d28/components/camel-jpa/src/test/java/org/apache/camel/examples/SendEmail.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/examples/SendEmail.java b/components/camel-jpa/src/test/java/org/apache/camel/examples/SendEmail.java
index b57098c..e4e0d33 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/examples/SendEmail.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/examples/SendEmail.java
@@ -37,13 +37,6 @@ public class SendEmail {
setAddress(address);
}
- @Override
- public String toString() {
- // TODO: don't make use of the id property here as it could potentially end up
- // with a deadlock through the openjpa generated proxy object of this entity
- return "SendEmail[address: " + getAddress() + "]";
- }
-
@Id
@GeneratedValue
public Long getId() {
@@ -61,4 +54,12 @@ public class SendEmail {
public void setAddress(String address) {
this.address = address;
}
+
+ @PreConsumed
+ public void doBefore() {
+ LOG.info("Invoked the pre consumed method with address {}", getAddress());
+ if ("dummy".equals(getAddress())) {
+ setAddress("dummy@somewhere.org");
+ }
+ }
}