From: Robert Varga Date: Tue, 10 Jul 2018 19:04:45 +0000 (+0200) Subject: Remove sal.core.api.mount.MountProvisionListener X-Git-Tag: release/fluorine~42 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5e55825865a186cb4909b5a9d5c2c91571314cd9 Remove sal.core.api.mount.MountProvisionListener There are no in-tree users, remove this interface. Change-Id: I88c1b370db95db1e21bcd14bc21dbadd1f782852 Signed-off-by: Robert Varga --- 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 df0f5b41bf..0524481ba4 100644 --- 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; -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; @@ -21,9 +20,6 @@ public interface DOMMountPointService extends DOMService { DOMMountPointBuilder createMountPoint(YangInstanceIdentifier path); - @Deprecated - ListenerRegistration registerProvisionListener(MountProvisionListener listener); - ListenerRegistration 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 index 1f7255b48a..0000000000 --- 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 5fce0f1b37..90d513aa9c 100644 --- 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.sal.core.api.mount.MountProvisionListener; 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; @@ -87,18 +85,6 @@ public class DOMMountPointServiceImpl implements DOMMountPointService { return new DOMMountPointBuilderImpl(path); } - @Override - public ListenerRegistration registerProvisionListener( - final MountProvisionListener listener) { - final ListenerRegistration delegateReg = delegate.registerProvisionListener(listener); - return new AbstractListenerRegistration(listener) { - @Override - protected void removeRegistration() { - delegateReg.close(); - } - }; - } - @Override public ListenerRegistration registerProvisionListener(final DOMMountPointListener listener) { return delegate.registerProvisionListener(listener);