From 5910654aedb5f629faa13e9be41cbf1155b0090f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 26 Apr 2018 21:06:13 +0200 Subject: [PATCH] Remove ListenerNode/ListenerWalker These classes have been deprecated for three years now, remove them. Change-Id: I3a5af8f0a96b1507b57732f588aa33864ae9c1d5 Signed-off-by: Robert Varga --- .../sal/dom/store/impl/tree/ListenerNode.java | 81 ------------------- .../dom/store/impl/tree/ListenerWalker.java | 38 --------- 2 files changed, 119 deletions(-) delete mode 100644 opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java delete mode 100644 opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java deleted file mode 100644 index fd16117cde..0000000000 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.md.sal.dom.store.impl.tree; - -import com.google.common.base.Preconditions; -import java.util.Collection; -import java.util.Optional; -import org.opendaylight.controller.md.sal.dom.store.impl.DataChangeListenerRegistration; -import org.opendaylight.mdsal.dom.spi.RegistrationTreeNode; -import org.opendaylight.yangtools.concepts.Identifiable; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode; - -/** - * This is a single node within the listener tree. Note that the data returned from - * and instance of this class is guaranteed to have any relevance or consistency - * only as long as the {@link ListenerWalker} instance through which it is reached remains - * unclosed. - * - * @author Robert Varga - * - * @deprecated Use {@link RegistrationTreeNode} instead. - */ -@Deprecated -public class ListenerNode implements StoreTreeNode, Identifiable { - final RegistrationTreeNode> delegate; - - ListenerNode(final RegistrationTreeNode> delegate) { - this.delegate = Preconditions.checkNotNull(delegate); - } - - @Override - public PathArgument getIdentifier() { - return delegate.getIdentifier(); - } - - @Override - public Optional getChild(final PathArgument child) { - final RegistrationTreeNode> c = delegate.getExactChild(child); - if (c == null) { - return Optional.empty(); - } - - return Optional.of(new ListenerNode(c)); - } - - /** - * Return the list of current listeners. This collection is guaranteed - * to be immutable only while the walker, through which this node is - * reachable remains unclosed. - * - * @return the list of current listeners - */ - public Collection> getListeners() { - return delegate.getRegistrations(); - } - - @Override - public int hashCode() { - return delegate.hashCode(); - } - - @Override - public boolean equals(final Object obj) { - if (obj == null || getClass() != obj.getClass()) { - return false; - } - - return delegate.equals(((ListenerNode)obj).delegate); - } - - @Override - public String toString() { - return delegate.toString(); - } -} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java deleted file mode 100644 index 7b8add9037..0000000000 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.md.sal.dom.store.impl.tree; - -import com.google.common.base.Preconditions; -import org.opendaylight.controller.md.sal.dom.store.impl.DataChangeListenerRegistration; -import org.opendaylight.mdsal.dom.spi.RegistrationTreeSnapshot; - -/** - * A walking context, pretty much equivalent to an iterator, but it - * exposes the underlying tree structure. - * - * @author Robert Varga - * - * @deprecated Superseded by {@link RegistrationTreeSnapshot}. - */ -@Deprecated -public class ListenerWalker implements AutoCloseable { - private final RegistrationTreeSnapshot> delegate; - - ListenerWalker(final RegistrationTreeSnapshot> delegate) { - this.delegate = Preconditions.checkNotNull(delegate); - } - - public ListenerNode getRootNode() { - return new ListenerNode(delegate.getRootNode()); - } - - @Override - public void close() { - delegate.close(); - } -} \ No newline at end of file -- 2.36.6