Make Netty-3 dependency optional

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / utils / AbstractBatchedModificationsCursor.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java
index 02f8abb57212e3ac0b05a293c114fbf209239d39..d740461fdf11c9db988d96866f3ec42e26cada29 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java
@@ -7,88 +7,35 @@
  */
 package org.opendaylight.controller.cluster.datastore.utils;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import javax.annotation.Nonnull;
 import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications;
 import org.opendaylight.controller.cluster.datastore.modification.DeleteModification;
 import org.opendaylight.controller.cluster.datastore.modification.MergeModification;
 import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.controller.cluster.datastore.util.AbstractDataTreeModificationCursor;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModificationCursor;
 
 /**
  * Base class for a DataTreeModificationCursor that publishes to BatchedModifications instance(s).
  *
  * @author Thomas Pantelis
  */
-public abstract class AbstractBatchedModificationsCursor implements DataTreeModificationCursor {
-    private final Deque<YangInstanceIdentifier> stack = new ArrayDeque<>();
-
-    protected AbstractBatchedModificationsCursor() {
-        stack.push(YangInstanceIdentifier.EMPTY);
-    }
-
+@Deprecated(since = "9.0.0", forRemoval = true)
+public abstract class AbstractBatchedModificationsCursor extends AbstractDataTreeModificationCursor {
     protected abstract BatchedModifications getModifications();
 
     @Override
-    public void delete(final PathArgument child) {
-        getModifications().addModification(new DeleteModification(stack.peek().node(child)));
-    }
-
-    @Override
-    public void merge(final PathArgument child, final NormalizedNode<?, ?> data) {
-        getModifications().addModification(new MergeModification(stack.peek().node(child), data));
-    }
-
-    @Override
-    public void write(final PathArgument child, final NormalizedNode<?, ?> data) {
-        getModifications().addModification(new WriteModification(stack.peek().node(child), data));
-    }
-
-    @Override
-    public void enter(@Nonnull final PathArgument child) {
-        stack.push(stack.peek().node(child));
-    }
-
-    @Override
-    public void enter(@Nonnull final PathArgument... path) {
-        for (PathArgument arg : path) {
-            enter(arg);
-        }
-    }
-
-    @Override
-    public void enter(@Nonnull final Iterable<PathArgument> path) {
-        for (PathArgument arg : path) {
-            enter(arg);
-        }
-    }
-
-    @Override
-    public void exit() {
-        stack.pop();
-    }
-
-    @Override
-    public void exit(final int depth) {
-        Preconditions.checkArgument(depth < stack.size(), "Stack holds only %s elements, cannot exit %s levels", stack.size(), depth);
-        for (int i = 0; i < depth; ++i) {
-            stack.pop();
-        }
+    public final void delete(final PathArgument child) {
+        getModifications().addModification(new DeleteModification(current().node(child)));
     }
 
     @Override
-    public Optional<NormalizedNode<?, ?>> readNode(@Nonnull final PathArgument child) {
-        throw new UnsupportedOperationException("Not implemented");
+    public final void merge(final PathArgument child, final NormalizedNode data) {
+        getModifications().addModification(new MergeModification(current().node(child), data));
     }
 
     @Override
-    public void close() {
-        // No-op
+    public final void write(final PathArgument child, final NormalizedNode data) {
+        getModifications().addModification(new WriteModification(current().node(child), data));
     }
 }