diff options
Diffstat (limited to 'lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe')
4 files changed, 9 insertions, 9 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java index a875cfd2f..803d472f6 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeForwardEntryCustomizer.java @@ -18,7 +18,6 @@ package io.fd.hc2vpp.lisp.gpe.translate.read; import static java.lang.String.format; -import com.google.common.base.Optional; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; @@ -44,6 +43,7 @@ import io.fd.jvpp.core.types.GpeLocator; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nonnull; @@ -244,7 +244,7 @@ public class GpeForwardEntryCustomizer extends FutureJVppCustomizer private Stream<Integer> activeVnis(final InstanceIdentifier<GpeEntry> id, final ModificationCache cache) throws ReadFailedException { - final int[] vnis = activeVnisDumpManager.getDump(id, cache).or(() -> { + final int[] vnis = activeVnisDumpManager.getDump(id, cache).orElseGet(() -> { final GpeFwdEntryVnisGetReply reply = new GpeFwdEntryVnisGetReply(); reply.vnis = new int[0]; return reply; diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java index 5d06b4c68..70cfa6d38 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java @@ -170,13 +170,13 @@ public class NativeForwardPathCustomizer extends FutureJVppCustomizer final ModificationCache modificationCache, final DumpCacheManager<GpeNativeFwdRpathsGetReply, Integer> dumpCacheManager) throws ReadFailedException { - return dumpCacheManager.getDump(id, modificationCache, 1).or(DEFAULT_DUMP); + return dumpCacheManager.getDump(id, modificationCache, 1).orElse(DEFAULT_DUMP); } private static GpeNativeFwdRpathsGetReply v6Dump(final @Nonnull InstanceIdentifier<?> id, final ModificationCache modificationCache, final DumpCacheManager<GpeNativeFwdRpathsGetReply, Integer> dumpCacheManager) throws ReadFailedException { - return dumpCacheManager.getDump(id, modificationCache, 0).or(DEFAULT_DUMP); + return dumpCacheManager.getDump(id, modificationCache, 0).orElse(DEFAULT_DUMP); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java index 6fb1f4207..d9b7ca69d 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java @@ -143,7 +143,7 @@ public class NativeForwardPathsTableCustomizer extends FutureJVppCustomizer impl private Stream<Integer> v4FibsStream(final InstanceIdentifier<NativeForwardPathsTable> id, final ReadContext ctx) throws ReadFailedException { - return dumpCacheManagerV4.getDump(id, ctx.getModificationCache()).or(DEFAULT_REPLY_V4) + return dumpCacheManagerV4.getDump(id, ctx.getModificationCache()).orElse(DEFAULT_REPLY_V4) .ipFibDetails.stream() .map(ipFibDetails -> ipFibDetails.tableId); } @@ -151,7 +151,7 @@ public class NativeForwardPathsTableCustomizer extends FutureJVppCustomizer impl private Stream<Integer> v6FibsStream(final InstanceIdentifier<NativeForwardPathsTable> id, final ReadContext ctx) throws ReadFailedException { - return dumpCacheManagerV6.getDump(id, ctx.getModificationCache()).or(DEFAULT_REPLY_V6) + return dumpCacheManagerV6.getDump(id, ctx.getModificationCache()).orElse(DEFAULT_REPLY_V6) .ip6FibDetails.stream() .map(ip6FibDetails -> ip6FibDetails.tableId); } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java index 5415e0fd6..d73abbaee 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/service/GpeStateCheckServiceImpl.java @@ -58,13 +58,13 @@ public final class GpeStateCheckServiceImpl implements GpeStateCheckService, Jvp @Override public void checkGpeEnabledBefore(@Nonnull final WriteContext writeContext) { - checkState(writeContext.readBefore(GPE_FEATURE_CONFIG_ID).or(DISABLED_GPE).isEnable(), + checkState(writeContext.readBefore(GPE_FEATURE_CONFIG_ID).orElse(DISABLED_GPE).isEnable(), "Gpe feature is disabled"); } @Override public void checkGpeEnabledAfter(@Nonnull final WriteContext writeContext) { - checkState(writeContext.readAfter(GPE_FEATURE_CONFIG_ID).or(DISABLED_GPE).isEnable(), + checkState(writeContext.readAfter(GPE_FEATURE_CONFIG_ID).orElse(DISABLED_GPE).isEnable(), "Gpe feature is disabled"); } @@ -73,7 +73,7 @@ public final class GpeStateCheckServiceImpl implements GpeStateCheckService, Jvp try { return byteToBoolean( dumpCacheManager.getDump(GPE_FEATURE_STATE_ID, readContext.getModificationCache()) - .or(DEFAULT_REPLY).gpeStatus); + .orElse(DEFAULT_REPLY).gpeStatus); } catch (ReadFailedException e) { throw new IllegalStateException("Unable to read Gpe feature status", e); } |