X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2FTransactionCommitFailedExceptionMapper.java;h=bbff5dabbbdd37dadffb7dfd3d47a803b5fa62e2;hb=e2607370f5ac443a5a2f1f00f693f82a0b57161d;hp=87bd6c8c6083a089894cca88a8ddac0e323197bc;hpb=1dc26e34f10b751e09c24b4ced676c64b19fa002;p=controller.git
diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java
index 87bd6c8c60..bbff5dabbb 100644
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java
@@ -7,63 +7,32 @@
*/
package org.opendaylight.controller.md.sal.dom.broker.impl;
-import java.util.concurrent.ExecutionException;
-
import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Futures;
+import org.opendaylight.yangtools.util.concurrent.ExceptionMapper;
/**
+ * Utility exception mapper which translates Exception to {@link TransactionCommitFailedException}.
*
- * Utility exception mapper which translates {@link Exception}
- * to {@link TransactionCommitFailedException}.
- *
- * This mapper is intended to be used with {@link Futures#makeChecked(com.google.common.util.concurrent.ListenableFuture, Function)}
- *
- * - if exception is {@link TransactionCommitFailedException} or one of its subclasses returns original exception.
- *
- if exception is {@link ExecutionException} and cause is {@link TransactionCommitFailedException} return cause
- *
- otherwise returns {@link TransactionCommitFailedException} with original exception as a cause.
- *
- *
+ * @see ExceptionMapper
*/
-final class TransactionCommitFailedExceptionMapper implements
- Function {
-
- static final TransactionCommitFailedExceptionMapper PRE_COMMIT_MAPPER = create("canCommit");
+public final class TransactionCommitFailedExceptionMapper extends ExceptionMapper {
- static final TransactionCommitFailedExceptionMapper CAN_COMMIT_ERROR_MAPPER = create("preCommit");
+ public static final TransactionCommitFailedExceptionMapper PRE_COMMIT_MAPPER = create("preCommit");
- static final TransactionCommitFailedExceptionMapper COMMIT_ERROR_MAPPER = create("commit");
+ public static final TransactionCommitFailedExceptionMapper CAN_COMMIT_ERROR_MAPPER = create("canCommit");
- private final String opName;
+ public static final TransactionCommitFailedExceptionMapper COMMIT_ERROR_MAPPER = create("commit");
private TransactionCommitFailedExceptionMapper(final String opName) {
- this.opName = Preconditions.checkNotNull(opName);
+ super(opName, TransactionCommitFailedException.class);
}
- public static final TransactionCommitFailedExceptionMapper create(final String opName) {
+ public static TransactionCommitFailedExceptionMapper create(final String opName) {
return new TransactionCommitFailedExceptionMapper(opName);
}
@Override
- public TransactionCommitFailedException apply(final Exception e) {
- // If excetion is TransactionCommitFailedException
- // we reuse it directly.
- if (e instanceof TransactionCommitFailedException) {
- return (TransactionCommitFailedException) e;
- }
- // If error is ExecutionException which was caused by cause of
- // TransactionCommitFailedException
- // we reuse original cause
- if (e instanceof ExecutionException && e.getCause() instanceof TransactionCommitFailedException) {
- return (TransactionCommitFailedException) e.getCause();
- }
- if (e instanceof InterruptedException) {
- return new TransactionCommitFailedException(opName + " failed - DOMStore was interupted.", e);
- }
- // Otherwise we are using new exception, with original cause
- return new TransactionCommitFailedException(opName + " failed", e);
+ protected TransactionCommitFailedException newWithCause(final String message, final Throwable cause) {
+ return new TransactionCommitFailedException(message, cause);
}
}
\ No newline at end of file