From b16cea20258ba537db7c0755208c82ab93331ff7 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 8 Apr 2019 11:37:45 +0200 Subject: HONEYCOMB-443: ODL bump to Neon - bumps ODL dependencies to neon - migrates guava optional to java.utils.optional Change-Id: Ibdaa365c7e21a341103aba88dfd67277e40d2969 Signed-off-by: Michal Cmarada --- .../fd/honeycomb/data/impl/ValidableTransaction.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ValidableTransaction.java') diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ValidableTransaction.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ValidableTransaction.java index 0c67f863f..09dde4e70 100644 --- a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ValidableTransaction.java +++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ValidableTransaction.java @@ -17,19 +17,18 @@ package io.fd.honeycomb.data.impl; import com.google.common.annotations.Beta; -import com.google.common.util.concurrent.CheckedFuture; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; +import com.google.common.util.concurrent.FluentFuture; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.netconf.mdsal.connector.DOMDataTransactionValidator; -import org.opendaylight.netconf.mdsal.connector.DOMDataTransactionValidator.ValidationFailedException; /** - * An {@link DOMDataWriteTransaction} than can be validated. + * An {@link DOMDataTreeWriteTransaction} than can be validated. * @see DOMDataTransactionValidator */ @Beta -interface ValidableTransaction extends DOMDataWriteTransaction { +interface ValidableTransaction extends DOMDataTreeWriteTransaction { /** - * Validates state of the data tree associated with the provided {@link DOMDataWriteTransaction}. + * Validates state of the data tree associated with the provided {@link DOMDataTreeWriteTransaction}. * *

The operation should not have any side-effects on the transaction state. * @@ -37,9 +36,8 @@ interface ValidableTransaction extends DOMDataWriteTransaction { * if the state of the transaction has not been changed. * * @return - * a CheckedFuture containing the result of the validate operation. The future blocks until the validation - * operation is complete. A successful validate returns nothing. On failure, the Future will fail - * with a {@link ValidationFailedException} or an exception derived from ValidationFailedException. + * a FluentFuture containing the result of the validate operation. The future blocks until the validation + * operation is complete. A successful validate returns nothing. On failure, the Future will fail. */ - CheckedFuture validate(); + FluentFuture validate(); } -- cgit 1.2.3-korg