From 9958ef4e1096731404d3c8060ef8376cd105f8ef Mon Sep 17 00:00:00 2001
From: Tom Pantelis <tompantelis@gmail.com>
Date: Wed, 4 Apr 2018 12:28:05 -0400
Subject: [PATCH] Remove AsyncWriteTransaction#commit

Downstream patches have been merged - safe to remove.

Change-Id: I357aaac04f7569fc42590fbb0ce00459c6c3204a
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---
 .../common/api/data/AsyncReadWriteTransaction.java   |  4 ++--
 .../sal/common/api/data/AsyncWriteTransaction.java   | 12 ------------
 .../impl/AbstractDOMForwardedTransactionFactory.java |  6 +++---
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncReadWriteTransaction.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncReadWriteTransaction.java
index 1ebb5309e8..4905e6bb12 100644
--- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncReadWriteTransaction.java
+++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncReadWriteTransaction.java
@@ -24,14 +24,14 @@ import org.opendaylight.yangtools.concepts.Path;
  * transactions.
  *
  * <p>
- * Applications publish the changes proposed in the transaction by calling {@link #commit}
+ * Applications publish the changes proposed in the transaction by calling {@link #submit}
  * on the transaction. This seals the transaction
  * (preventing any further writes using this transaction) and submits it to be
  * processed and applied to global conceptual data tree.
  *
  * <p>
  * The transaction commit may fail due to a concurrent transaction modifying and committing data in
- * an incompatible way. See {@link #commit()} for more concrete commit failure examples.
+ * an incompatible way. See {@link #submit()} for more concrete commit failure examples.
  *
  * <b>Implementation Note:</b> This interface is not intended to be implemented
  * by users of MD-SAL, but only to be consumed by them.
diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncWriteTransaction.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncWriteTransaction.java
index e98d671426..51bb1db40b 100644
--- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncWriteTransaction.java
+++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncWriteTransaction.java
@@ -9,9 +9,7 @@ package org.opendaylight.controller.md.sal.common.api.data;
 
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
 import org.opendaylight.yangtools.concepts.Path;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 
 /**
  * Write transaction provides mutation capabilities for a data tree.
@@ -334,14 +332,4 @@ public interface AsyncWriteTransaction<P extends Path<P>, D> extends AsyncTransa
      *             if the transaction is not new
      */
     CheckedFuture<Void,TransactionCommitFailedException> submit();
-
-    /**
-     * Deprecated.
-     *
-     * @deprecated Use {@link #submit()} instead.
-     */
-    @Deprecated
-    default ListenableFuture<RpcResult<TransactionStatus>> commit() {
-        throw new UnsupportedOperationException("commit() is deprecated, use submit() instead");
-    }
 }
diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java
index 1b650b35f5..4bb7197869 100644
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java
@@ -72,7 +72,7 @@ abstract class AbstractDOMForwardedTransactionFactory<T extends DOMStoreTransact
      * on transaction created by this factory.
      *
      * @param transaction
-     *            Transaction on which {@link DOMDataWriteTransaction#commit()}
+     *            Transaction on which {@link DOMDataWriteTransaction#submit()}
      *            was invoked.
      * @param cohorts
      *            Iteratable of cohorts for subtransactions associated with
@@ -142,7 +142,7 @@ abstract class AbstractDOMForwardedTransactionFactory<T extends DOMStoreTransact
      * {@link DOMStoreWriteTransaction#delete(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier)} is
      * invoked on
      * selected subtransaction.
-     * </li><li> {@link DOMDataWriteTransaction#commit()} - results in invoking
+     * </li><li> {@link DOMDataWriteTransaction#submit()} - results in invoking
      * {@link DOMStoreWriteTransaction#ready()}, gathering all resulting cohorts
      * and then invoking finalized implementation callback
      * {@link #submit(DOMDataWriteTransaction, Collection)} with transaction which
@@ -207,7 +207,7 @@ abstract class AbstractDOMForwardedTransactionFactory<T extends DOMStoreTransact
      * {@link DOMStoreWriteTransaction#delete(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier)} is
      * invoked on
      * selected subtransaction.
-     * <li> {@link DOMDataWriteTransaction#commit()} - results in invoking
+     * <li> {@link DOMDataWriteTransaction#submit()} - results in invoking
      * {@link DOMStoreWriteTransaction#ready()}, gathering all resulting cohorts
      * and then invoking finalized implementation callback
      * {@link #submit(DOMDataWriteTransaction, Collection)} with transaction which
-- 
2.36.6