X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fcompat%2FAggregatedNotificationListenerRegistration.java;h=1979b222c8455e30171801ba66eb355bc3238d01;hp=e93109d576a284fa2401a63d05ca10f572cfe6a9;hb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;hpb=2727bea09c83646b6cbd2ef9672d0b7f6cf3b22f

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AggregatedNotificationListenerRegistration.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AggregatedNotificationListenerRegistration.java
index e93109d576..1979b222c8 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AggregatedNotificationListenerRegistration.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AggregatedNotificationListenerRegistration.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.controller.md.sal.binding.compat;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.controller.sal.binding.api.NotificationListener;
 import org.opendaylight.yangtools.yang.binding.Notification;
 
@@ -16,18 +17,22 @@ import org.opendaylight.yangtools.yang.binding.Notification;
  * interfaces at the same time. In order to support correct delivery, we need to maintain per-type registrations
  * which get squashed if a notification which implements multiple interfaces is encountered.
  *
+ * <p>
  * We take care of that by implementing alternate {@link #hashCode()}/{@link #equals(Object)}, which resolve
  * to the backing aggregator.
  *
  * @param <N> Notification type
  * @param <A> Aggregator type
  */
-abstract class AggregatedNotificationListenerRegistration<N extends Notification, A> extends AbstractNotificationListenerRegistration<N> {
+@Deprecated(forRemoval = true)
+abstract class AggregatedNotificationListenerRegistration<N extends Notification, A>
+        extends AbstractNotificationListenerRegistration<N> {
     private final A aggregator;
 
-    protected AggregatedNotificationListenerRegistration(final Class<? extends Notification> type, final NotificationListener<N> listener, final A aggregator) {
+    protected AggregatedNotificationListenerRegistration(final Class<? extends Notification> type,
+            final NotificationListener<N> listener, final A aggregator) {
         super(type, listener);
-        this.aggregator = Preconditions.checkNotNull(aggregator);
+        this.aggregator = requireNonNull(aggregator);
     }
 
     protected A getAggregator() {