Remove DOMDataTreeReadWriteTransaction.close()

Inheriting from DOMDataTreeReadTransaction was a mistake, read-write
transaction should not have a close() method. Fix that by inheriting
DOMDataTreeReadOperations instead, addressing the associated FIXME.

Change-Id: Ie26e19917bd78acca056c7c79de641b231fa9ea8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeReadWriteTransaction.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeReadWriteTransaction.java
index c5f99fc6022af67b3acec86560373c38a069fab7..b4fcd7e165a090818d901337112a2e820600ecc7 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeReadWriteTransaction.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeReadWriteTransaction.java
@@ -11,20 +11,9 @@ package org.opendaylight.mdsal.dom.api;
  * A transaction that provides read/write access to a logical data store.
  *
  * <p>
- * For more information on usage and examples, please see the documentation in {@link DOMDataTreeReadTransaction}
- * and {@link DOMDataTreeWriteTransaction}.
+ * For more information on usage and examples, please see the documentation in {@link DOMDataTreeWriteTransaction}
+ * and {@link DOMDataTreeReadOperations}.
  */
-// FIXME: 4.0.0: extend DOMDataTreeReadOperations instead of DOMDataTreeReadTransaction
-public interface DOMDataTreeReadWriteTransaction extends DOMDataTreeWriteTransaction, DOMDataTreeReadTransaction {
-    /**
-     * This method is an API design mistake. Users should not use it and use {@link #cancel()} instead. Implementations
-     * should not override it and rely instead of its default implementation, which calls {@link #cancel()}.
-     *
-     * @deprecated Use {@link #cancel()} instead.
-     */
-    @Deprecated
-    @Override
-    default void close() {
-        cancel();
-    }
+public interface DOMDataTreeReadWriteTransaction extends DOMDataTreeWriteTransaction, DOMDataTreeReadOperations {
+
 }