From d26d9cae29a8dfd192c301ed21f21412a6dde2f3 Mon Sep 17 00:00:00 2001
From: Tom Pantelis <tompantelis@gmail.com>
Date: Fri, 4 May 2018 00:56:32 -0400
Subject: [PATCH] Remove DataChangeListener and friends

AsyncDataChangeEvent is being kept for now as ovsdb still
independently uses it internally.

JIRA: TSC-112

Change-Id: Ia68ac1cdf31dec3645f675442db14b7697d63b64
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---
 .../md/sal/trace/dom/impl/TracingBroker.java  | 33 +++----------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java b/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
index 9d966082ac..8160b4689e 100644
--- a/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
+++ b/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
@@ -15,13 +15,11 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.controller.md.sal.dom.api.ClusteredDOMDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBrokerExtension;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataChangeListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener;
@@ -148,22 +146,13 @@ public class TracingBroker implements TracingDOMDataBroker {
         }
 
         @SuppressWarnings("checkstyle:hiddenField")
-        public boolean subtreesOverlap(YangInstanceIdentifier iid, LogicalDatastoreType store,
-                                                                AsyncDataBroker.DataChangeScope scope) {
+        public boolean subtreesOverlap(YangInstanceIdentifier iid, LogicalDatastoreType store) {
             if (this.store != null && !this.store.equals(store)) {
                 return false;
             }
 
             String otherIidString = toIidCompString(iid);
-            switch (scope) {
-                case BASE:
-                    return isParent(iidString, otherIidString);
-                case ONE: //for now just treat like SUBTREE, even though it's not
-                case SUBTREE:
-                    return isParent(iidString, otherIidString) || isParent(otherIidString, iidString);
-                default:
-                    return false;
-            }
+            return isParent(iidString, otherIidString) || isParent(otherIidString, iidString);
         }
 
         @SuppressWarnings("checkstyle:hiddenField")
@@ -232,14 +221,13 @@ public class TracingBroker implements TracingDOMDataBroker {
         writeWatches.add(watch);
     }
 
-    private boolean isRegistrationWatched(YangInstanceIdentifier iid,
-                                                            LogicalDatastoreType store, DataChangeScope scope) {
+    private boolean isRegistrationWatched(YangInstanceIdentifier iid, LogicalDatastoreType store) {
         if (registrationWatches.isEmpty()) {
             return true;
         }
 
         for (Watch regInterest : registrationWatches) {
-            if (regInterest.subtreesOverlap(iid, store, scope)) {
+            if (regInterest.subtreesOverlap(iid, store)) {
                 return true;
             }
         }
@@ -316,17 +304,6 @@ public class TracingBroker implements TracingDOMDataBroker {
         return new TracingWriteTransaction(delegate.newWriteOnlyTransaction(), this, writeTransactionsRegistry);
     }
 
-    @Override
-    public ListenerRegistration<DOMDataChangeListener> registerDataChangeListener(
-                                                        LogicalDatastoreType store, YangInstanceIdentifier yiid,
-                                                        DOMDataChangeListener listener, DataChangeScope scope) {
-        if (isRegistrationWatched(yiid, store, scope)) {
-            LOG.warn("Registration (registerDataChangeListener) for {} from {}",
-                    toPathString(yiid), getStackSummary());
-        }
-        return delegate.registerDataChangeListener(store, yiid, listener, scope);
-    }
-
     @Override
     public DOMTransactionChain createTransactionChain(TransactionChainListener transactionChainListener) {
         return new TracingTransactionChain(
@@ -355,7 +332,7 @@ public class TracingBroker implements TracingDOMDataBroker {
             public <L extends DOMDataTreeChangeListener> ListenerRegistration<L> registerDataTreeChangeListener(
                     @Nonnull DOMDataTreeIdentifier domDataTreeIdentifier, @Nonnull L listener) {
                 if (isRegistrationWatched(domDataTreeIdentifier.getRootIdentifier(),
-                        domDataTreeIdentifier.getDatastoreType(), DataChangeScope.SUBTREE)) {
+                        domDataTreeIdentifier.getDatastoreType())) {
                     LOG.warn("{} registration (registerDataTreeChangeListener) for {} from {}.",
                             listener instanceof ClusteredDOMDataTreeChangeListener ? "Clustered" : "Non-clustered",
                             toPathString(domDataTreeIdentifier.getRootIdentifier()), getStackSummary());
-- 
2.36.6