summaryrefslogtreecommitdiffstats
path: root/infra/impl
diff options
context:
space:
mode:
authorMichal Cmarada <michal.cmarada@pantheon.tech>2018-09-25 11:15:35 +0200
committerMichal Cmarada <michal.cmarada@pantheon.tech>2018-09-25 11:22:18 +0200
commit556a0f59abc9b09005d40945bc20948d69e4f98e (patch)
tree76d795ae59aba49521fc4fdc7d65062c946147be /infra/impl
parent46bcceb927b1bce07c1c9517f45470703293eb84 (diff)
Bump ODL dependencies to Fluorine (HONEYCOMB-433)
Change-Id: I142ebd2899272feff00abe7d4bae708f093ee3ec Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
Diffstat (limited to 'infra/impl')
-rw-r--r--infra/impl/pom.xml6
-rw-r--r--infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java13
2 files changed, 13 insertions, 6 deletions
diff --git a/infra/impl/pom.xml b/infra/impl/pom.xml
index 6c23542..937e707 100644
--- a/infra/impl/pom.xml
+++ b/infra/impl/pom.xml
@@ -54,6 +54,12 @@
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>ietf-topology</artifactId>
</dependency>
+ <!--Required by FakeBindingAwareBroker -> BundleContext-->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi-core.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java b/infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java
index c42045f..74001dc 100644
--- a/infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java
+++ b/infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java
@@ -17,9 +17,10 @@
package io.fd.honeycomb.impl;
import com.google.common.base.Optional;
+import javax.annotation.Nonnull;
import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
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.data.api.YangInstanceIdentifier;
@@ -39,17 +40,17 @@ public class EmptyDomMountService implements DOMMountPointService {
}
@Override
- public ListenerRegistration<MountProvisionListener> registerProvisionListener(
- final MountProvisionListener mountProvisionListener) {
- return new ListenerRegistration<MountProvisionListener>() {
+ public ListenerRegistration<DOMMountPointListener> registerProvisionListener(final DOMMountPointListener listener) {
+ return new ListenerRegistration<DOMMountPointListener>() {
@Override
public void close() {
// Noop
}
+ @Nonnull
@Override
- public MountProvisionListener getInstance() {
- return mountProvisionListener;
+ public DOMMountPointListener getInstance() {
+ return listener;
}
};
}