Adopt odlparent-10.0.0/yangtools-8.0.0-SNAPSHOT

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / store / SnapshotBackedWriteTransaction.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
index 926c74618eae49936b30e70b9b58b669f43bca7b..babb8ed003a7061439689b8d4cbe8102f64a3bd7 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
@@ -18,8 +18,8 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeSnapshot;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +62,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
-    public void write(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+    public void write(final YangInstanceIdentifier path, final NormalizedNode data) {
         checkNotReady();
 
         final DataTreeModification tree = mutableTree;
@@ -82,7 +82,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
-    public void merge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+    public void merge(final YangInstanceIdentifier path, final NormalizedNode data) {
         checkNotReady();
 
         final DataTreeModification tree = mutableTree;
@@ -92,7 +92,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
             tree.merge(path, data);
             // FIXME: Add checked exception
         } catch (Exception e) {
-            LOG.error("Tx: {}, failed to write {}:{} in {}", getIdentifier(), path, data, tree, e);
+            LOG.error("Tx: {}, failed to merge {}:{} in {}", getIdentifier(), path, data, tree, e);
             // Rethrow original ones if they are subclasses of RuntimeException or Error
             Throwables.throwIfUnchecked(e);
             // FIXME: Introduce proper checked exception
@@ -127,7 +127,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
      * @param path Path to read
      * @return null if the the transaction has been closed;
      */
-    final Optional<NormalizedNode<?, ?>> readSnapshotNode(final YangInstanceIdentifier path) {
+    final Optional<NormalizedNode> readSnapshotNode(final YangInstanceIdentifier path) {
         return readyImpl == null ? null : mutableTree.readNode(path);
     }