diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-04-08 11:37:45 +0200 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-04-08 11:37:45 +0200 |
| commit | b16cea20258ba537db7c0755208c82ab93331ff7 (patch) | |
| tree | 8a5a3c87069b9ce700c34323e75ff434e7acae97 /infra/impl/src/main/java/io/fd | |
| parent | 23979469bcf8cd312cb3ec9e9e548003110f68f4 (diff) | |
HONEYCOMB-443: ODL bump to Neon
- bumps ODL dependencies to neon
- migrates guava optional to java.utils.optional
Change-Id: Ibdaa365c7e21a341103aba88dfd67277e40d2969
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'infra/impl/src/main/java/io/fd')
| -rw-r--r-- | infra/impl/src/main/java/io/fd/honeycomb/impl/EmptyDomMountService.java | 8 | ||||
| -rw-r--r-- | infra/impl/src/main/java/io/fd/honeycomb/impl/FakeBindingAwareBroker.java | 2 |
2 files changed, 5 insertions, 5 deletions
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 74001dce3..bb2653b66 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 @@ -16,11 +16,11 @@ package io.fd.honeycomb.impl; -import com.google.common.base.Optional; +import java.util.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.mdsal.dom.api.DOMMountPoint; import org.opendaylight.mdsal.dom.api.DOMMountPointListener; +import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -31,7 +31,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; public class EmptyDomMountService implements DOMMountPointService { @Override public Optional<DOMMountPoint> getMountPoint(final YangInstanceIdentifier yangInstanceIdentifier) { - return Optional.absent(); + return Optional.empty(); } @Override diff --git a/infra/impl/src/main/java/io/fd/honeycomb/impl/FakeBindingAwareBroker.java b/infra/impl/src/main/java/io/fd/honeycomb/impl/FakeBindingAwareBroker.java index c978135cb..4b5cd2584 100644 --- a/infra/impl/src/main/java/io/fd/honeycomb/impl/FakeBindingAwareBroker.java +++ b/infra/impl/src/main/java/io/fd/honeycomb/impl/FakeBindingAwareBroker.java @@ -16,13 +16,13 @@ package io.fd.honeycomb.impl; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; import org.opendaylight.controller.sal.binding.api.BindingAwareService; import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier; +import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.RpcService; |