diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-04-01 11:39:35 +0200 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-04-08 13:39:49 +0200 |
| commit | d726d0f173544c8d0078c5f918b5d086f6e85f79 (patch) | |
| tree | 640e65411731b3a25abc2e7949de68dc625cf60e /fib-management/fib-management-impl | |
| parent | 89eeb336aebc92cd34c27b3fa325803c6478a461 (diff) | |
HC2VPP-406: fix build errors after ODL bump to neon
This fixes build issues after ODL bump in Honeycomb (HONEYCOMB-443).
Change-Id: I3bf203dd60d12057595b15ce1ad59302dc14e2a0
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'fib-management/fib-management-impl')
2 files changed, 5 insertions, 5 deletions
diff --git a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizer.java b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizer.java index bd610f994..32a868138 100644 --- a/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizer.java +++ b/fib-management/fib-management-impl/src/main/java/io/fd/hc2vpp/fib/management/read/FibTableCustomizer.java @@ -57,13 +57,13 @@ class FibTableCustomizer implements InitializingListReaderCustomizer<Table, Tabl public List<TableKey> getAllIds(@Nonnull final InstanceIdentifier<Table> instanceIdentifier, @Nonnull final ReadContext readContext) throws ReadFailedException { return Stream.concat(ipv4DumpManager.getDump(instanceIdentifier, readContext.getModificationCache()) - .or(new IpFibDetailsReplyDump()) + .orElse(new IpFibDetailsReplyDump()) .ipFibDetails.stream() .filter(ipFibDetails -> ipFibDetails.tableId >= 0) .map(ipFibDetails -> new TableKey(Ipv4.class, new VniReference((long) ipFibDetails.tableId))) .distinct(), ipv6DumpManager.getDump(instanceIdentifier, readContext.getModificationCache()) - .or(new Ip6FibDetailsReplyDump()) + .orElse(new Ip6FibDetailsReplyDump()) .ip6FibDetails.stream() .filter(ip6FibDetails -> ip6FibDetails.tableId >= 0) .map(ipFibDetails -> new TableKey(Ipv6.class, new VniReference((long) ipFibDetails.tableId)))) @@ -90,7 +90,7 @@ class FibTableCustomizer implements InitializingListReaderCustomizer<Table, Tabl if (tableKey.getAddressFamily().equals(Ipv4.class)) { ipv4DumpManager.getDump(instanceIdentifier, readContext.getModificationCache()) - .or(new IpFibDetailsReplyDump()) + .orElse(new IpFibDetailsReplyDump()) .ipFibDetails.stream() .filter(ipFibDetails -> ipFibDetails.tableId == tableKey.getTableId().getValue().intValue()) .findFirst().ifPresent( @@ -98,7 +98,7 @@ class FibTableCustomizer implements InitializingListReaderCustomizer<Table, Tabl } else { ipv6DumpManager.getDump(instanceIdentifier, readContext.getModificationCache()) - .or(new Ip6FibDetailsReplyDump()) + .orElse(new Ip6FibDetailsReplyDump()) .ip6FibDetails.stream() .filter(ipFibDetails -> ipFibDetails.tableId == tableKey.getTableId().getValue().intValue()) .findFirst().ifPresent( diff --git a/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/FibManagementModuleTest.java b/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/FibManagementModuleTest.java index b1d1c5cde..8389ce57a 100644 --- a/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/FibManagementModuleTest.java +++ b/fib-management/fib-management-impl/src/test/java/io/fd/hc2vpp/fib/management/FibManagementModuleTest.java @@ -43,7 +43,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataBroker; public class FibManagementModuleTest { |