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 /srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request | |
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 'srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request')
-rw-r--r-- | srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java index 680216522..7e1a94c3a 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/read/policy/request/PolicyReadRequest.java @@ -104,7 +104,7 @@ public class PolicyReadRequest extends JVppRequest @Nonnull public List<PolicyKey> readAllKeys(@Nonnull InstanceIdentifier<Policy> id, @Nonnull ReadContext ctx) throws ReadFailedException { - return dumpManager.getDump(id, ctx.getModificationCache()).or(STATIC_EMPTY_REPLY).srPoliciesDetails.stream() + return dumpManager.getDump(id, ctx.getModificationCache()).orElse(STATIC_EMPTY_REPLY).srPoliciesDetails.stream() .map(srPoliciesDetails -> arrayToIpv6AddressNoZone(srPoliciesDetails.bsid.addr)) .map(bsid -> parsePolicyKey(ctx, bsid)) .collect(Collectors.toList()); @@ -122,7 +122,7 @@ public class PolicyReadRequest extends JVppRequest Ipv6Address bsid = policyCtx.getPolicyBsid(key.getColor(), key.getEndpoint().getIpv6Address(), ctx.getMappingContext()); - dumpManager.getDump(id, ctx.getModificationCache()).or(STATIC_EMPTY_REPLY).srPoliciesDetails.stream() + dumpManager.getDump(id, ctx.getModificationCache()).orElse(STATIC_EMPTY_REPLY).srPoliciesDetails.stream() .filter(srPoliciesDetails -> arrayToIpv6AddressNoZone(srPoliciesDetails.bsid.addr).getValue() .equals(bsid.getValue())) .findFirst() @@ -212,7 +212,7 @@ public class PolicyReadRequest extends JVppRequest public List<NamedSegmentListKey> readNamedSegmentListKeys(final InstanceIdentifier<NamedSegmentList> id, final ReadContext ctx) throws ReadFailedException { - return dumpManager.getDump(id, ctx.getModificationCache()).or(STATIC_EMPTY_REPLY).srPoliciesDetails.stream() + return dumpManager.getDump(id, ctx.getModificationCache()).orElse(STATIC_EMPTY_REPLY).srPoliciesDetails.stream() .map(srPoliciesDetails -> { String bsid = arrayToIpv6AddressNoZone(srPoliciesDetails.bsid.addr).getValue(); return Arrays.stream(srPoliciesDetails.sidLists).map(srv6SidList -> srv6SidList.weight) @@ -237,7 +237,7 @@ public class PolicyReadRequest extends JVppRequest Preconditions.checkNotNull(bsid, "Weight/Bsid not resolved for Iid: {}", id); builder.setSegments(new SegmentsBuilder().build()); - dumpManager.getDump(id, ctx.getModificationCache()).or(STATIC_EMPTY_REPLY).srPoliciesDetails.stream() + dumpManager.getDump(id, ctx.getModificationCache()).orElse(STATIC_EMPTY_REPLY).srPoliciesDetails.stream() .filter(srPoliciesDetails -> arrayToIpv6AddressNoZone(srPoliciesDetails.bsid.addr).getValue() .equals(bsid)) .forEach(srPoliciesDetails -> Arrays.stream(srPoliciesDetails.sidLists) |