From d726d0f173544c8d0078c5f918b5d086f6e85f79 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Mon, 1 Apr 2019 11:39:35 +0200
Subject: 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>
---
 .../main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java    | 6 +++---
 .../main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'l3/utils/src/main/java/io/fd/hc2vpp/l3')

diff --git a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java
index 181baf6fc..3247b6918 100644
--- a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java
+++ b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpAddressReader.java
@@ -18,7 +18,7 @@ package io.fd.hc2vpp.l3.utils.ip.read;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
@@ -112,7 +112,7 @@ public abstract class IpAddressReader extends IpReader {
                     .filter(singleDetail -> ip.equals(arrayToIpv4AddressNoZone(singleDetail.ip)))
                     .collect(RWUtils.singleItemCollector()));
         }
-        return Optional.absent();
+        return Optional.empty();
     }
 
     @Nonnull
@@ -128,7 +128,7 @@ public abstract class IpAddressReader extends IpReader {
                     .filter(singleDetail -> ip.equals(arrayToIpv6AddressNoZone(singleDetail.ip)))
                     .collect(RWUtils.singleItemCollector()));
         }
-        return Optional.absent();
+        return Optional.empty();
     }
 
     @Nonnull
diff --git a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java
index 6eb5fd1b8..05048a427 100644
--- a/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java
+++ b/l3/utils/src/main/java/io/fd/hc2vpp/l3/utils/ip/read/IpNeighbourReader.java
@@ -18,7 +18,7 @@ package io.fd.hc2vpp.l3.utils.ip.read;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
-- 
cgit 1.2.3-korg