Deprecate sal.core.api.mount.MountProvisionListener

This interface has an exact copy in DOMMountPointListener, deprecate
it and adjust implementations to not require it.

Change-Id: If19a3a34094a9dbbc25665967074a32e562a7dca
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointListenerAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointListenerAdapter.java
index 6861ff9b3cae870b9f06eb6b5b6f175973e8d760..a929af5bcf18951a57c59a5bffd8f7bfd5e2e23e 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointListenerAdapter.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointListenerAdapter.java
@@ -10,7 +10,7 @@ package org.opendaylight.controller.md.sal.binding.impl;
 import com.google.common.base.Optional;
 import org.opendaylight.controller.md.sal.binding.api.MountPointService.MountPointListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.sal.core.api.mount.MountProvisionListener;
+import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -18,10 +18,10 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
 
 final class BindingDOMMountPointListenerAdapter<T extends MountPointListener>
-        implements ListenerRegistration<T>, MountProvisionListener {
+        implements ListenerRegistration<T>, DOMMountPointListener {
 
     private final T listener;
-    private final ListenerRegistration<MountProvisionListener> registration;
+    private final ListenerRegistration<DOMMountPointListener> registration;
     private final BindingToNormalizedNodeCodec codec;
 
     BindingDOMMountPointListenerAdapter(final T listener, final BindingToNormalizedNodeCodec codec,

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java
index 19eea457cc30c9da571f90d304c33999a76a01bc..df0f5b41bf770a7bbdb0ac9077da6fe21ae7d1dd 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java
@@ -9,6 +9,7 @@ package org.opendaylight.controller.md.sal.dom.api;
 
 import com.google.common.base.Optional;
 import org.opendaylight.controller.sal.core.api.mount.MountProvisionListener;
+import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -20,8 +21,11 @@ public interface DOMMountPointService extends DOMService {
 
     DOMMountPointBuilder createMountPoint(YangInstanceIdentifier path);
 
+    @Deprecated
     ListenerRegistration<MountProvisionListener> registerProvisionListener(MountProvisionListener listener);
 
+    ListenerRegistration<DOMMountPointListener> registerProvisionListener(DOMMountPointListener listener);
+
     interface DOMMountPointBuilder {
 
         <T extends DOMService> DOMMountPointBuilder addService(Class<T> type,T impl);

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java
index f368dbba37a22a80f2487f46462c0e16026e8d34..1f7255b48a92be9280790accb81d64d0a3a0e229 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java
@@ -5,8 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.sal.core.api.mount;
 
-public interface MountProvisionListener extends org.opendaylight.mdsal.dom.api.DOMMountPointListener {
+import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
+
+/**
+ * Listener for mountpoint events.
+ *
+ * @deprecated Use {@link DOMMountPointListener} instead.
+ */
+@Deprecated
+public interface MountProvisionListener extends DOMMountPointListener {
+
 }

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java
index 4966348d186d6cc82722ef1274542cdc15c997a8..5fce0f1b371d3f637cf91b5ab648669bc69d3ddb 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java
@@ -34,7 +34,7 @@ public class DOMMountPointServiceImpl implements DOMMountPointService {
         this(new org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl());
     }
 
-    public DOMMountPointServiceImpl(org.opendaylight.mdsal.dom.api.DOMMountPointService delegate) {
+    public DOMMountPointServiceImpl(final org.opendaylight.mdsal.dom.api.DOMMountPointService delegate) {
         this.delegate = delegate;
     }
 
@@ -44,7 +44,7 @@ public class DOMMountPointServiceImpl implements DOMMountPointService {
         return delegateMountPoint.isPresent() ? Optional.of(convert(delegateMountPoint.get())) : Optional.absent();
     }
 
-    private DOMMountPoint convert(final org.opendaylight.mdsal.dom.api.DOMMountPoint from) {
+    private static DOMMountPoint convert(final org.opendaylight.mdsal.dom.api.DOMMountPoint from) {
         return new DOMMountPoint() {
             @Override
             public YangInstanceIdentifier getIdentifier() {
@@ -52,7 +52,7 @@ public class DOMMountPointServiceImpl implements DOMMountPointService {
             }
 
             @Override
-            public <T extends DOMService> Optional<T> getService(Class<T> cls) {
+            public <T extends DOMService> Optional<T> getService(final Class<T> cls) {
                 return from.getService(cls);
             }
 
@@ -67,7 +67,7 @@ public class DOMMountPointServiceImpl implements DOMMountPointService {
             }
 
             @Override
-            public boolean equals(Object obj) {
+            public boolean equals(final Object obj) {
                 if (this == obj) {
                     return true;
                 }
@@ -99,6 +99,11 @@ public class DOMMountPointServiceImpl implements DOMMountPointService {
         };
     }
 
+    @Override
+    public ListenerRegistration<DOMMountPointListener> registerProvisionListener(final DOMMountPointListener listener) {
+        return delegate.registerProvisionListener(listener);
+    }
+
     /**
      * Deprecated.