Remove sal.core.api.mount.MountProvisionListener

There are no in-tree users, remove this interface.

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

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 df0f5b41bf770a7bbdb0ac9077da6fe21ae7d1dd..0524481ba46f0f0a760e2612e088c4bd6d51c610 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
@@ -8,7 +8,6 @@
 package org.opendaylight.controller.md.sal.dom.api;
 
 import com.google.common.base.Optional;
 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.mdsal.dom.api.DOMMountPointListener;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;


@@ -21,9 +20,6 @@ public interface DOMMountPointService extends DOMService {
 
     DOMMountPointBuilder createMountPoint(YangInstanceIdentifier path);
 
 
     DOMMountPointBuilder createMountPoint(YangInstanceIdentifier path);
 

-    @Deprecated
-    ListenerRegistration<MountProvisionListener> registerProvisionListener(MountProvisionListener listener);
-

     ListenerRegistration<DOMMountPointListener> registerProvisionListener(DOMMountPointListener listener);
 
     interface DOMMountPointBuilder {
     ListenerRegistration<DOMMountPointListener> registerProvisionListener(DOMMountPointListener listener);
 
     interface DOMMountPointBuilder {

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
deleted file mode 100644 (file)
index 1f7255b..0000000
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * 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;
-
-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 5fce0f1b371d3f637cf91b5ab648669bc69d3ddb..90d513aa9cfdada07e7a2ede5433fddfeca1de7e 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
@@ -17,9 +17,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.controller.md.sal.dom.broker.spi.mount.SimpleDOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.controller.md.sal.dom.broker.spi.mount.SimpleDOMMountPoint;

-import org.opendaylight.controller.sal.core.api.mount.MountProvisionListener;

 import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
 import org.opendaylight.mdsal.dom.api.DOMMountPointListener;

-import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;

 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;


@@ -87,18 +85,6 @@ public class DOMMountPointServiceImpl implements DOMMountPointService {
         return new DOMMountPointBuilderImpl(path);
     }
 
         return new DOMMountPointBuilderImpl(path);
     }
 

-    @Override
-    public ListenerRegistration<MountProvisionListener> registerProvisionListener(
-            final MountProvisionListener listener) {
-        final ListenerRegistration<DOMMountPointListener> delegateReg = delegate.registerProvisionListener(listener);
-        return new AbstractListenerRegistration<MountProvisionListener>(listener) {
-            @Override
-            protected void removeRegistration() {
-                delegateReg.close();
-            }
-        };
-    }
-

     @Override
     public ListenerRegistration<DOMMountPointListener> registerProvisionListener(final DOMMountPointListener listener) {
         return delegate.registerProvisionListener(listener);
     @Override
     public ListenerRegistration<DOMMountPointListener> registerProvisionListener(final DOMMountPointListener listener) {
         return delegate.registerProvisionListener(listener);