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/14 14:53:30 UTC
camel git commit: CAMEL-10685: Use multi-catch exceptions and polish
Repository: camel
Updated Branches:
refs/heads/master 49e1c0111 -> d41194b8b
CAMEL-10685: Use multi-catch exceptions and polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d41194b8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d41194b8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d41194b8
Branch: refs/heads/master
Commit: d41194b8bb822d70f706d9359d6694723cfb034b
Parents: 49e1c01
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Apr 14 16:52:59 2017 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Fri Apr 14 16:53:23 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/cdi/CdiRouteBuilder.java | 4 +---
.../JtaTransactionErrorHandlerBuilder.java | 2 +-
.../cdi/transaction/JtaTransactionPolicy.java | 1 -
.../MandatoryJtaTransactionPolicy.java | 1 -
.../transaction/NeverJtaTransactionPolicy.java | 1 -
.../NotSupportedJtaTransactionPolicy.java | 1 -
.../RequiresNewJtaTransactionPolicy.java | 1 -
.../transaction/TransactionErrorHandler.java | 2 +-
.../TransactionalJtaTransactionPolicy.java | 23 ++------------------
9 files changed, 5 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
index 4c4e445..337351d 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
@@ -21,9 +21,7 @@ import org.apache.camel.cdi.transaction.JtaTransactionErrorHandlerBuilder;
/**
* An extension of the {@link RouteBuilder} to provide some additional helper
- * methods
- *
- * @version
+ * methods.
*/
public abstract class CdiRouteBuilder extends RouteBuilder {
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/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 3be2d1d..6d72aaa 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
@@ -94,7 +94,7 @@ public class JtaTransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilde
// try to lookup default policy
if (transactionPolicy == null) {
LOG.debug(
- "No tranaction policiy configured on TransactionErrorHandlerBuilder. Will try find it in the registry.");
+ "No transaction policy configured on TransactionErrorHandlerBuilder. Will try find it in the registry.");
Map<String, TransactedPolicy> mapPolicy = routeContext.lookupByType(TransactedPolicy.class);
if (mapPolicy != null && mapPolicy.size() == 1) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/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 0917278..f856261 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
@@ -126,7 +126,6 @@ public abstract class JtaTransactionPolicy implements TransactedPolicy {
protected JtaTransactionErrorHandler createTransactionErrorHandler(RouteContext routeContext, Processor processor,
ErrorHandlerBuilder builder) {
-
JtaTransactionErrorHandler answer;
try {
answer = (JtaTransactionErrorHandler) builder.createErrorHandler(routeContext, processor);
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/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 5adbb8a..ef90018 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
@@ -23,7 +23,6 @@ public class MandatoryJtaTransactionPolicy extends TransactionalJtaTransactionPo
@Override
public void run(final Runnable runnable) throws Exception {
-
if (!hasActiveTransaction()) {
throw new IllegalStateException(
"Policy 'PROPAGATION_MANDATORY' is configured but no active transaction was found!");
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/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 61a5a3f..ff1da9f 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
@@ -23,7 +23,6 @@ public class NeverJtaTransactionPolicy extends TransactionalJtaTransactionPolicy
@Override
public void run(final Runnable runnable) throws Exception {
-
if (hasActiveTransaction()) {
throw new IllegalStateException(
"Policy 'PROPAGATION_NEVER' is configured but an active transaction was found!");
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/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 20e9edf..5767b9f 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
@@ -24,7 +24,6 @@ public class NotSupportedJtaTransactionPolicy extends TransactionalJtaTransactio
@Override
public void run(final Runnable runnable) throws Throwable {
-
Transaction suspendedTransaction = null;
try {
suspendedTransaction = suspendTransaction();
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/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 84dd20f..dc3fcc8 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
@@ -24,7 +24,6 @@ public class RequiresNewJtaTransactionPolicy extends TransactionalJtaTransaction
@Override
public void run(final Runnable runnable) throws Throwable {
-
Transaction suspendedTransaction = null;
try {
suspendedTransaction = suspendTransaction();
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/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 14e4557..57245b5 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
@@ -357,7 +357,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
if (!hasNext()) {
return null;
}
- List<Processor> answer = new ArrayList<Processor>(1);
+ List<Processor> answer = new ArrayList<>(1);
answer.add(output);
return answer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d41194b8/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 188b587..3b515c8 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
@@ -40,12 +40,6 @@ public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPo
}
try {
runnable.run();
- } catch (RuntimeException e) {
- rollback(isNew);
- throw e;
- } catch (Error e) {
- rollback(isNew);
- throw e;
} catch (Throwable e) {
rollback(isNew);
throw e;
@@ -53,7 +47,6 @@ public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPo
if (isNew) {
commit();
}
- return;
}
private void begin() throws Exception {
@@ -63,21 +56,9 @@ public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPo
private void commit() throws Exception {
try {
transactionManager.commit();
- } catch (HeuristicMixedException e) {
- throw new CamelException("Unable to commit transaction", e);
- } catch (HeuristicRollbackException e) {
- throw new CamelException("Unable to commit transaction", e);
- } catch (RollbackException e) {
+ } catch (HeuristicMixedException | HeuristicRollbackException | RollbackException | SystemException e) {
throw new CamelException("Unable to commit transaction", e);
- } catch (SystemException e) {
- throw new CamelException("Unable to commit transaction", e);
- } catch (RuntimeException e) {
- rollback(true);
- throw e;
- } catch (Exception e) {
- rollback(true);
- throw e;
- } catch (Error e) {
+ } catch (Exception | Error e) {
rollback(true);
throw e;
}