You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2017/04/13 14:52:34 UTC
[2/7] camel git commit: CAMEL-10685: Polish
CAMEL-10685: Polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f248eb44
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f248eb44
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f248eb44
Branch: refs/heads/master
Commit: f248eb4410fa572e2562716f29f714eaba30da78
Parents: ac7bb06
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Thu Apr 13 16:36:24 2017 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Thu Apr 13 16:52:19 2017 +0200
----------------------------------------------------------------------
components/camel-cdi/pom.xml | 14 ++---
.../transaction/JtaTransactionErrorHandler.java | 5 +-
.../JtaTransactionErrorHandlerBuilder.java | 15 +-----
.../cdi/transaction/JtaTransactionPolicy.java | 17 ++----
.../MandatoryJtaTransactionPolicy.java | 2 -
.../transaction/NestedJtaTransactionPolicy.java | 4 --
.../transaction/NeverJtaTransactionPolicy.java | 2 -
.../NotSupportedJtaTransactionPolicy.java | 4 --
.../RequiredJtaTransactionPolicy.java | 3 --
.../RequiresNewJtaTransactionPolicy.java | 4 --
.../SupportsJtaTransactionPolicy.java | 3 --
.../cdi/transaction/TransactedDefinition.java | 1 -
.../transaction/TransactionErrorHandler.java | 56 +++++++-------------
.../TransactionalJtaTransactionPolicy.java | 19 -------
14 files changed, 34 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 9fb19d7..8fb9140 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -115,13 +115,13 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <version>${jta-api-1.2-version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <version>${jta-api-1.2-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<!-- test dependencies -->
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java
index f7b89ee..1df961a 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandler.java
@@ -22,6 +22,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.processor.RedeliveryErrorHandler;
import org.apache.camel.processor.RedeliveryPolicy;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
import org.apache.camel.util.CamelLogger;
@@ -32,7 +33,7 @@ import org.apache.camel.util.CamelLogger;
* done within the transaction which is not appropriate in JTA since every error
* breaks the current transaction.
*/
-public class JtaTransactionErrorHandler extends org.apache.camel.processor.RedeliveryErrorHandler {
+public class JtaTransactionErrorHandler extends RedeliveryErrorHandler {
public JtaTransactionErrorHandler(CamelContext camelContext, Processor output, CamelLogger logger,
Processor redeliveryProcessor, RedeliveryPolicy redeliveryPolicy,
@@ -58,7 +59,5 @@ public class JtaTransactionErrorHandler extends org.apache.camel.processor.Redel
executorService,
null,
onExceptionOccurredProcessor);
-
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
index 4823cc6..3be2d1d 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
@@ -58,32 +58,25 @@ public class JtaTransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilde
@Override
public ErrorHandlerBuilder cloneBuilder() {
-
final JtaTransactionErrorHandlerBuilder answer = new JtaTransactionErrorHandlerBuilder();
cloneBuilder(answer);
return answer;
-
}
@Override
protected void cloneBuilder(DefaultErrorHandlerBuilder other) {
-
super.cloneBuilder(other);
if (other instanceof JtaTransactionErrorHandlerBuilder) {
final JtaTransactionErrorHandlerBuilder otherTx = (JtaTransactionErrorHandlerBuilder) other;
transactionPolicy = otherTx.transactionPolicy;
rollbackLoggingLevel = otherTx.rollbackLoggingLevel;
}
-
}
public Processor createErrorHandler(final RouteContext routeContext, final Processor processor) throws Exception {
-
// resolve policy reference, if given
if (transactionPolicy == null) {
-
if (policyRef != null) {
-
final TransactedDefinition transactedDefinition = new TransactedDefinition();
transactedDefinition.setRef(policyRef);
final Policy policy = transactedDefinition.resolvePolicy(routeContext);
@@ -95,14 +88,11 @@ public class JtaTransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilde
}
transactionPolicy = (JtaTransactionPolicy) policy;
}
-
}
-
}
// try to lookup default policy
if (transactionPolicy == null) {
-
LOG.debug(
"No tranaction policiy configured on TransactionErrorHandlerBuilder. Will try find it in the registry.");
@@ -122,9 +112,8 @@ public class JtaTransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilde
}
if (transactionPolicy != null) {
- LOG.debug("Found TransactionPolicy in registry to use: " + transactionPolicy);
+ LOG.debug("Found TransactionPolicy in registry to use: {}", transactionPolicy);
}
-
}
ObjectHelper.notNull(transactionPolicy, "transactionPolicy", this);
@@ -150,7 +139,6 @@ public class JtaTransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilde
// configure error handler before we can use it
configure(routeContext, answer);
return answer;
-
}
public JtaTransactionErrorHandlerBuilder setTransactionPolicy(final String ref) {
@@ -176,5 +164,4 @@ public class JtaTransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilde
public String toString() {
return "JtaTransactionErrorHandlerBuilder";
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
index 164d190..0917278 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
@@ -53,8 +53,7 @@ public abstract class JtaTransactionPolicy implements TransactedPolicy {
// do not inherit since we create our own
// (otherwise the default error handler would be used two times
// because we inherit it on our own but only in case of a
- // non-transactional
- // error handler)
+ // non-transactional error handler)
definition.setInheritErrorHandler(false);
}
@@ -62,9 +61,7 @@ public abstract class JtaTransactionPolicy implements TransactedPolicy {
@Override
public Processor wrap(RouteContext routeContext, Processor processor) {
-
JtaTransactionErrorHandler answer;
-
// the goal is to configure the error handler builder on the route as a
// transacted error handler,
// either its already a transacted or if not we replace it with a
@@ -84,12 +81,9 @@ public abstract class JtaTransactionPolicy implements TransactedPolicy {
// its a reference to a error handler so lookup the reference
ErrorHandlerBuilderRef builderRef = (ErrorHandlerBuilderRef) builder;
String ref = builderRef.getRef();
- // only lookup if there was explicit an error handler builder
- // configured
- // otherwise its just the "default" that has not explicit been
- // configured
- // and if so then we can safely replace that with our transacted
- // error handler
+ // only lookup if there was explicit an error handler builder configured
+ // otherwise its just the "default" that has not explicit been configured
+ // and if so then we can safely replace that with our transacted error handler
if (ErrorHandlerBuilderRef.isErrorHandlerBuilderConfigured(ref)) {
LOG.debug("Looking up ErrorHandlerBuilder with ref: {}", ref);
builder = (ErrorHandlerBuilder) ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, ref);
@@ -128,7 +122,6 @@ public abstract class JtaTransactionPolicy implements TransactedPolicy {
// return with wrapped transacted error handler
return answer;
-
}
protected JtaTransactionErrorHandler createTransactionErrorHandler(RouteContext routeContext, Processor processor,
@@ -141,12 +134,10 @@ public abstract class JtaTransactionPolicy implements TransactedPolicy {
throw ObjectHelper.wrapRuntimeCamelException(e);
}
return answer;
-
}
@Override
public String toString() {
return getClass().getName();
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
index 44bb539..5adbb8a 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
@@ -28,7 +28,5 @@ public class MandatoryJtaTransactionPolicy extends TransactionalJtaTransactionPo
throw new IllegalStateException(
"Policy 'PROPAGATION_MANDATORY' is configured but no active transaction was found!");
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
index d322235..5e7d804 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
@@ -33,10 +33,8 @@ public class NestedJtaTransactionPolicy extends TransactionalJtaTransactionPolic
Transaction suspendedTransaction = null;
boolean rollback = false;
try {
-
suspendedTransaction = suspendTransaction();
runWithTransaction(runnable, true);
-
} catch (Throwable e) {
rollback = true;
throw e;
@@ -54,7 +52,5 @@ public class NestedJtaTransactionPolicy extends TransactionalJtaTransactionPolic
logger.log(Level.WARNING, "Could not resume outer transaction", e);
}
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
index ad33372..61a5a3f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
@@ -28,7 +28,5 @@ public class NeverJtaTransactionPolicy extends TransactionalJtaTransactionPolicy
throw new IllegalStateException(
"Policy 'PROPAGATION_NEVER' is configured but an active transaction was found!");
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
index 5a0796d..20e9edf 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
@@ -27,14 +27,10 @@ public class NotSupportedJtaTransactionPolicy extends TransactionalJtaTransactio
Transaction suspendedTransaction = null;
try {
-
suspendedTransaction = suspendTransaction();
runnable.run();
-
} finally {
resumeTransaction(suspendedTransaction);
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
index f938a45..fad576d 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
@@ -23,9 +23,6 @@ public class RequiredJtaTransactionPolicy extends TransactionalJtaTransactionPol
@Override
public void run(final Runnable runnable) throws Throwable {
-
runWithTransaction(runnable, !hasActiveTransaction());
-
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
index ab72aa1..84dd20f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
@@ -27,14 +27,10 @@ public class RequiresNewJtaTransactionPolicy extends TransactionalJtaTransaction
Transaction suspendedTransaction = null;
try {
-
suspendedTransaction = suspendTransaction();
runWithTransaction(runnable, true);
-
} finally {
resumeTransaction(suspendedTransaction);
}
-
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
index ee6d85b..04e467e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
@@ -23,9 +23,6 @@ public class SupportsJtaTransactionPolicy extends TransactionalJtaTransactionPol
@Override
public void run(final Runnable runnable) throws Throwable {
-
runnable.run();
-
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactedDefinition.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactedDefinition.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactedDefinition.java
index c09e508..c3d102e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactedDefinition.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactedDefinition.java
@@ -30,5 +30,4 @@ public class TransactedDefinition extends org.apache.camel.model.TransactedDefin
public Policy resolvePolicy(RouteContext routeContext) {
return super.resolvePolicy(routeContext);
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
index 1d2b316..14e4557 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
@@ -79,18 +79,15 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
public TransactionErrorHandler(CamelContext camelContext, Processor output,
ExceptionPolicyStrategy exceptionPolicyStrategy, JtaTransactionPolicy transactionPolicy,
ScheduledExecutorService executorService, LoggingLevel rollbackLoggingLevel) {
-
this.output = output;
this.transactionPolicy = transactionPolicy;
this.rollbackLoggingLevel = rollbackLoggingLevel;
this.transactionKey = ObjectHelper.getIdentityHashCode(transactionPolicy);
setExceptionPolicy(exceptionPolicyStrategy);
-
}
public void process(Exchange exchange) throws Exception {
-
// we have to run this synchronously as a JTA Transaction does *not*
// support using multiple threads to span a transaction
if (exchange.getUnitOfWork().isTransactedBy(transactionKey)) {
@@ -103,11 +100,9 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
// transaction
processInTransaction(exchange);
}
-
}
public boolean process(Exchange exchange, AsyncCallback callback) {
-
// invoke this synchronous method as JTA Transaction does *not*
// support using multiple threads to span a transaction
try {
@@ -119,7 +114,6 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
// notify callback we are done synchronously
callback.done(true);
return true;
-
}
protected void processInTransaction(final Exchange exchange) throws Exception {
@@ -132,12 +126,10 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
try {
// mark the beginning of this transaction boundary
exchange.getUnitOfWork().beginTransactedBy(transactionKey);
-
// do in transaction
logTransactionBegin(redelivered, ids);
doInTransactionTemplate(exchange);
logTransactionCommit(redelivered, ids);
-
} catch (TransactionRolledbackException e) {
// do not set as exception, as its just a dummy exception to force
// spring TX to rollback
@@ -160,13 +152,13 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
// stack trace
Exception cause = exchange.getException();
if (cause != null) {
- log.debug("Transaction rollback (" + transactionKey + ") redelivered(" + redelivered + ") for "
- + ids + " due exchange was marked for rollbackOnlyLast and caught: ", cause);
+ log.debug("Transaction rollback ({}) redelivered({}) for {} "
+ + "due exchange was marked for rollbackOnlyLast and caught: ",
+ transactionKey, redelivered, ids, cause);
} else {
- log.debug(
- "Transaction rollback ({}) redelivered({}) for {} "
- + "due exchange was marked for rollbackOnlyLast",
- new Object[] {transactionKey, redelivered, ids});
+ log.debug("Transaction rollback ({}) redelivered({}) for {} "
+ + "due exchange was marked for rollbackOnlyLast",
+ transactionKey, redelivered, ids);
}
}
// remove caused exception due we was marked as rollback only last
@@ -181,7 +173,6 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
}
protected void doInTransactionTemplate(final Exchange exchange) throws Throwable {
-
// spring transaction template is working best with rollback if you
// throw it a runtime exception
// otherwise it may not rollback messages send to JMS queues etc.
@@ -189,7 +180,6 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
@Override
public void run() throws Throwable {
-
// wrapper exception to throw if the exchange failed
// IMPORTANT: Must be a runtime exception to let Spring regard
// it as to do "rollback"
@@ -220,9 +210,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
throw rce;
}
}
-
});
-
}
/**
@@ -236,13 +224,11 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
* the exchange
*/
protected void processByErrorHandler(final Exchange exchange) {
-
try {
output.process(exchange);
} catch (Throwable e) {
throw new RuntimeCamelException(e);
}
-
}
/**
@@ -251,7 +237,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
private void logTransactionBegin(String redelivered, String ids) {
if (log.isDebugEnabled()) {
log.debug("Transaction begin ({}) redelivered({}) for {})",
- new Object[] {transactionKey, redelivered, ids});
+ transactionKey, redelivered, ids);
}
}
@@ -267,14 +253,14 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
if (rollbackLoggingLevel == LoggingLevel.INFO || rollbackLoggingLevel == LoggingLevel.WARN
|| rollbackLoggingLevel == LoggingLevel.ERROR) {
log.info("Transaction commit ({}) redelivered({}) for {})",
- new Object[] {transactionKey, redelivered, ids});
+ transactionKey, redelivered, ids);
// return after we have logged
return;
}
}
// log non redelivered by default at DEBUG level
- log.debug("Transaction commit ({}) redelivered({}) for {})", new Object[] {transactionKey, redelivered, ids});
+ log.debug("Transaction commit ({}) redelivered({}) for {})", transactionKey, redelivered, ids);
}
/**
@@ -286,42 +272,42 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
} else if (rollbackLoggingLevel == LoggingLevel.ERROR && log.isErrorEnabled()) {
if (rollbackOnly) {
log.error("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
- new Object[] {transactionKey, redelivered, ids});
+ transactionKey, redelivered, ids);
} else {
log.error("Transaction rollback ({}) redelivered({}) for {} caught: {}",
- new Object[] {transactionKey, redelivered, ids, e.getMessage()});
+ transactionKey, redelivered, ids, e.getMessage());
}
} else if (rollbackLoggingLevel == LoggingLevel.WARN && log.isWarnEnabled()) {
if (rollbackOnly) {
log.warn("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
- new Object[] {transactionKey, redelivered, ids});
+ transactionKey, redelivered, ids);
} else {
log.warn("Transaction rollback ({}) redelivered({}) for {} caught: {}",
- new Object[] {transactionKey, redelivered, ids, e.getMessage()});
+ transactionKey, redelivered, ids, e.getMessage());
}
} else if (rollbackLoggingLevel == LoggingLevel.INFO && log.isInfoEnabled()) {
if (rollbackOnly) {
log.info("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
- new Object[] {transactionKey, redelivered, ids});
+ transactionKey, redelivered, ids);
} else {
log.info("Transaction rollback ({}) redelivered({}) for {} caught: {}",
- new Object[] {transactionKey, redelivered, ids, e.getMessage()});
+ transactionKey, redelivered, ids, e.getMessage());
}
} else if (rollbackLoggingLevel == LoggingLevel.DEBUG && log.isDebugEnabled()) {
if (rollbackOnly) {
log.debug("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
- new Object[] {transactionKey, redelivered, ids});
+ transactionKey, redelivered, ids);
} else {
log.debug("Transaction rollback ({}) redelivered({}) for {} caught: {}",
- new Object[] {transactionKey, redelivered, ids, e.getMessage()});
+ transactionKey, redelivered, ids, e.getMessage());
}
} else if (rollbackLoggingLevel == LoggingLevel.TRACE && log.isTraceEnabled()) {
if (rollbackOnly) {
log.trace("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
- new Object[] {transactionKey, redelivered, ids});
+ transactionKey, redelivered, ids);
} else {
log.trace("Transaction rollback ({}) redelivered({}) for {} caught: {}",
- new Object[] {transactionKey, redelivered, ids, e.getMessage()});
+ transactionKey, redelivered, ids, e.getMessage());
}
}
}
@@ -349,8 +335,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
protected void doStop() throws Exception {
// noop, do not stop any services which we only do when shutting down
// as the error handler can be context scoped, and should not stop in
- // case
- // a route stops
+ // case a route stops
}
@Override
@@ -383,5 +368,4 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
log.trace("Prepare shutdown on error handler {}", this);
preparingShutdown = true;
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f248eb44/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
index 9316cd3..188b587 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
@@ -35,7 +35,6 @@ public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPo
private static final Logger LOG = LoggerFactory.getLogger(TransactionalJtaTransactionPolicy.class);
protected void runWithTransaction(final Runnable runnable, final boolean isNew) throws Throwable {
-
if (isNew) {
begin();
}
@@ -55,17 +54,13 @@ public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPo
commit();
}
return;
-
}
private void begin() throws Exception {
-
transactionManager.begin();
-
}
private void commit() throws Exception {
-
try {
transactionManager.commit();
} catch (HeuristicMixedException e) {
@@ -86,35 +81,25 @@ public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPo
rollback(true);
throw e;
}
-
}
protected void rollback(boolean isNew) throws Exception {
-
try {
-
if (isNew) {
transactionManager.rollback();
} else {
transactionManager.setRollbackOnly();
}
-
} catch (Throwable e) {
-
LOG.warn("Could not rollback transaction!", e);
-
}
-
}
protected Transaction suspendTransaction() throws Exception {
-
return transactionManager.suspend();
-
}
protected void resumeTransaction(final Transaction suspendedTransaction) {
-
if (suspendedTransaction == null) {
return;
}
@@ -124,14 +109,10 @@ public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPo
} catch (Throwable e) {
LOG.warn("Could not resume transaction!", e);
}
-
}
protected boolean hasActiveTransaction() throws Exception {
-
return transactionManager.getStatus() != Status.STATUS_MARKED_ROLLBACK
&& transactionManager.getStatus() != Status.STATUS_NO_TRANSACTION;
-
}
-
}