From: Tom Pantelis <tompantelis@gmail.com>
Date: Fri, 1 Sep 2017 19:49:20 +0000 (-0400)
Subject: Remove unused DataChangeListener references
X-Git-Tag: release/oxygen~6
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=aedb9f4819b5c5bfc582aadaf030db89666e27e1;p=packetcable.git

Remove unused DataChangeListener references

The DataChangeListener API has been deprecated for a couple releases
with possible removal in Oxygen.

Change-Id: Ie26627e624a01369a50b3468650141f16945a32e
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---

diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/AbstractDataTreeChangeListener.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/AbstractDataTreeChangeListener.java
index 8f5a98b..590156f 100644
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/AbstractDataTreeChangeListener.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/AbstractDataTreeChangeListener.java
@@ -9,33 +9,23 @@
 package org.opendaylight.controller.packetcable.provider;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.opendaylight.controller.packetcable.provider.DataChangeUtils.collectTypeFromMap;
-import static org.opendaylight.controller.packetcable.provider.DataChangeUtils.collectTypeFromSet;
-import static org.opendaylight.controller.packetcable.provider.DataChangeUtils.logChange;
-import static org.opendaylight.controller.packetcable.provider.DataChangeUtils.relativeComplement;
 
 import com.google.common.collect.Maps;
+import java.util.Collection;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.Collection;
-
-import org.eclipse.jdt.annotation.NonNull;
+import javax.annotation.Nonnull;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.packetcable.provider.validation.DataValidator;
 import org.opendaylight.controller.packetcable.provider.validation.ValidationException;
 import org.opendaylight.controller.packetcable.provider.validation.Validator;
-import org.opendaylight.controller.packetcable.provider.validation.ValidatorProvider;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
-
 /**
  * @author rvail
  * @author mmakati
diff --git a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/DataChangeUtils.java b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/DataChangeUtils.java
index ceac675..db642f6 100644
--- a/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/DataChangeUtils.java
+++ b/packetcable-policy-server/src/main/java/org/opendaylight/controller/packetcable/provider/DataChangeUtils.java
@@ -12,10 +12,8 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import java.util.Map;
 import java.util.Set;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
 
 /**
  * @author rvail
@@ -72,48 +70,4 @@ public class DataChangeUtils {
 
         return result;
     }
-
-
-
-    public static void logChange(final Logger logger, final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
-        if (!logger.isDebugEnabled()) {
-            return;
-        }
-
-        StringBuilder sb = new StringBuilder();
-
-        appendMap(sb, "CREATED", change.getCreatedData());
-        appendSet(sb, "REMOVED", change.getRemovedPaths());
-        appendMap(sb, "UPDATED", change.getUpdatedData());
-        appendMap(sb, "ORIGINAL", change.getOriginalData());
-
-        logger.debug("onDataChanged data:\n{}", sb.toString());
-    }
-
-
-    private static <E> void appendSet(StringBuilder sb, String name, Set<E> set) {
-        sb.append("====").append(name).append("====\n");
-        if (set == null || set.isEmpty()) {
-            sb.append("None\n");
-        } else {
-            for (E data : set) {
-                sb.append(data).append("\n");
-                sb.append("----------\n");
-            }
-        }
-        sb.append("===============\n");
-    }
-
-    private static void appendMap(StringBuilder sb, String name, Map<InstanceIdentifier<?>, DataObject> dataMap) {
-        sb.append("====").append(name).append("====\n");
-        if (dataMap == null || dataMap.isEmpty()) {
-            sb.append("None\n");
-        } else {
-            for (Map.Entry<InstanceIdentifier<?>, DataObject> entry : dataMap.entrySet()) {
-                sb.append(entry.getValue()).append("\n");
-                sb.append("----------\n");
-            }
-        }
-        sb.append("===============\n");
-    }
 }