X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2FAbstractWriteTransaction.java;h=d953ef57ff937bff0f3ed8139208e59e681177f0;hb=3ec97cd0a86ad1b79f6854dc6924eb7b06e359a3;hp=7e1f112c4ad4ffc20d0e67a3069f434292c47ef7;hpb=d6fe0f5e53edb5ff3bc90024c984baeab3e788be;p=controller.git

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java
index 7e1f112c4a..d953ef57ff 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java
@@ -9,11 +9,11 @@ package org.opendaylight.controller.md.sal.binding.impl;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FluentFuture;
 import java.util.Map.Entry;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -21,10 +21,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 /**
- *
- * Abstract Base Transaction for transactions which are backed by
- * {@link DOMDataWriteTransaction}
+ * Abstract Base Transaction for transactions which are backed by {@link DOMDataWriteTransaction}.
  */
+@Deprecated
 public abstract class AbstractWriteTransaction<T extends DOMDataWriteTransaction> extends
         AbstractForwardedTransaction<T> {
 
@@ -61,7 +60,6 @@ public abstract class AbstractWriteTransaction<T extends DOMDataWriteTransaction
     }
 
     /**
-     *
      * Ensures list parent if item is list, otherwise noop.
      *
      * <p>
@@ -83,7 +81,7 @@ public abstract class AbstractWriteTransaction<T extends DOMDataWriteTransaction
      * put("/nodes/node/node[key]",domNode);
      * </pre>
      *
-     *
+     * <p>
      * In order to allow that to be inserted if necessary, if we know
      * item is list item, we will try to merge empty MapNode or OrderedNodeMap
      * to ensure list exists.
@@ -104,6 +102,8 @@ public abstract class AbstractWriteTransaction<T extends DOMDataWriteTransaction
     }
 
     /**
+     * Deprecated.
+     *
      * @deprecated Use {@link YangInstanceIdentifier#getParent()} instead.
      */
     @Deprecated
@@ -114,10 +114,6 @@ public abstract class AbstractWriteTransaction<T extends DOMDataWriteTransaction
     /**
      * Subclasses of this class are required to implement creation of parent
      * nodes based on behaviour of their underlying transaction.
-     *
-     * @param store
-     * @param key
-     * @param path
      */
     protected abstract void ensureParentsByMerge(LogicalDatastoreType store,
             YangInstanceIdentifier key, InstanceIdentifier<?> path);
@@ -126,16 +122,15 @@ public abstract class AbstractWriteTransaction<T extends DOMDataWriteTransaction
             final InstanceIdentifier<?> path) {
         Preconditions.checkArgument(!path.isWildcarded(), "Cannot delete wildcarded path %s", path);
 
-        final YangInstanceIdentifier normalized = getCodec().toNormalized(path);
+        final YangInstanceIdentifier normalized = getCodec().toYangInstanceIdentifierBlocking(path);
         getDelegate().delete(store, normalized);
     }
 
-    protected final CheckedFuture<Void,TransactionCommitFailedException> doSubmit() {
-        return getDelegate().submit();
+    protected final FluentFuture<? extends CommitInfo> doCommit() {
+        return getDelegate().commit();
     }
 
     protected final boolean doCancel() {
         return getDelegate().cancel();
     }
-
 }