Merge "BUG-2626: activate enunciate only on jdk-1.7"

[controller.git] / opendaylight / md-sal / sal-dom-spi / src / main / java / org / opendaylight / controller / md / sal / dom / spi / ForwardingDOMNotificationService.java

diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java
index 5199a3893bf64c101ee3528b6ebff18f65193d78..b40c428b6b7078d428a8e7772bda9cb2cfb9d05e 100644 (file)
--- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java
+++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java
@@ -10,8 +10,8 @@ package org.opendaylight.controller.md.sal.dom.spi;
 import com.google.common.collect.ForwardingObject;
 import java.util.Collection;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationListener;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationListenerRegistration;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 /**
@@ -23,13 +23,13 @@ public abstract class ForwardingDOMNotificationService extends ForwardingObject
     protected abstract DOMNotificationService delegate();
 
     @Override
-    public DOMNotificationListenerRegistration registerNotificationListener(final DOMNotificationListener listener,
+    public <T extends DOMNotificationListener> ListenerRegistration<T> registerNotificationListener(final T listener,
             final Collection<SchemaPath> types) {
         return delegate().registerNotificationListener(listener, types);
     }
 
     @Override
-    public DOMNotificationListenerRegistration registerNotificationListener(final DOMNotificationListener listener,
+    public <T extends DOMNotificationListener> ListenerRegistration<T> registerNotificationListener(final T listener,
             final SchemaPath... types) {
         return delegate().registerNotificationListener(listener, types);
     }