Narrow Notification.implementedInterface() return type

[mdsal.git] / binding / mdsal-binding-api / src / main / java / org / opendaylight / mdsal / binding / api / NotificationService.java

diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/NotificationService.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/NotificationService.java
index 6ff74ca34159dd8a8d2b5ff8e8b9b2f28500b282..c2cc18eeabacec0e0ec35a2e68749fc4c1fd2642 100644 (file)
--- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/NotificationService.java
+++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/NotificationService.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Executor;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.Notification;
 import org.opendaylight.yangtools.yang.binding.NotificationListener;
 
@@ -110,7 +111,7 @@ public interface NotificationService extends BindingService {
      * @return a {@link Registration} instance that should be used to unregister the listener by invoking the
      *        {@link Registration#close()} method when no longer needed
      */
-    <N extends Notification> @NonNull Registration registerListener(Class<N> type, Listener<N> listener,
+    <N extends Notification<N> & DataObject> @NonNull Registration registerListener(Class<N> type, Listener<N> listener,
         Executor executor);
 
     /**
@@ -126,7 +127,7 @@ public interface NotificationService extends BindingService {
      * @return a {@link Registration} instance that should be used to unregister the listener by invoking the
      *        {@link Registration#close()} method when no longer needed
      */
-    default <N extends Notification> @NonNull Registration registerListener(final Class<N> type,
+    default <N extends Notification<N> & DataObject> @NonNull Registration registerListener(final Class<N> type,
             final Listener<N> listener) {
         return registerListener(type, listener, MoreExecutors.directExecutor());
     }
@@ -139,7 +140,7 @@ public interface NotificationService extends BindingService {
      * @param N Notification type
      */
     @FunctionalInterface
-    interface Listener<N extends Notification> extends EventListener {
+    interface Listener<N extends Notification<N> & DataObject> extends EventListener {
         /**
          * Process a global notification.
          *