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>

2 files changed, 5 insertions, 5 deletions

diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java
index c997e5c37..00986f43a 100644
--- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/NatModuleTest.java
@@ -45,7 +45,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;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesStateBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java
index 871225a29..86abf0e27 100644
--- a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java
+++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/util/MappingEntryContextTest.java
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import com.google.common.collect.Lists;
 import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
 import io.fd.honeycomb.translate.MappingContext;
@@ -56,7 +56,7 @@ public class MappingEntryContextTest implements Ipv4Translator {
 
     @Test
     public void testAdd() throws Exception {
-        when(mappingCtx.read(any(InstanceIdentifier.class))).thenReturn(Optional.absent());
+        when(mappingCtx.read(any(InstanceIdentifier.class))).thenReturn(Optional.empty());
         final long natId = 7;
         final long entryId = 99;
         final MappingEntry entry = getEntry(natId, "192.168.1.5/32", "17.14.4.6/32");
@@ -116,7 +116,7 @@ public class MappingEntryContextTest implements Ipv4Translator {
         final long entryId = 12;
         final Nat44StaticMappingDetails details = getDetails(entryId, "192.168.1.5", "17.14.4.6");
         final List<Nat44StaticMappingDetails> someDetails = Lists.newArrayList(details);
-        when(mappingCtx.read(MappingEntryContext.getTableId(natId))).thenReturn(Optional.absent());
+        when(mappingCtx.read(MappingEntryContext.getTableId(natId))).thenReturn(Optional.empty());
 
         ctx.findDetailsNat44(someDetails, natId, entryId, mappingCtx);
     }
@@ -150,7 +150,7 @@ public class MappingEntryContextTest implements Ipv4Translator {
         final MappingEntry newEntry = getEntry(newEntryId, "192.168.1.99/32", "17.14.4.99/32");
         final Nat44StaticMappingDetails newDetails = getDetails(newEntryId, "192.168.1.99", "17.14.4.99");
         when(mappingCtx.read(MappingEntryContext.getId(natId, MappingEntryContext.entryToKey(newEntry))))
-                .thenReturn(Optional.absent());
+                .thenReturn(Optional.empty());
 
         when(mappingCtx.read(MappingEntryContext.getTableId(natId)))
                 .thenReturn(Optional.of(new MappingTableBuilder()