Fix bugs after bumping to Fluorine ODL dependencies (HONEYCOMB-433)

Change-Id: I99b630f97144770849679a04efccaf7fc9868cb6
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>

14 files changed, 16 insertions, 16 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java
index 33bd2c841..35cbd9187 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java
@@ -89,7 +89,7 @@ public class InterfaceRoutingCustomizer extends RoutingCustomizer
 
         if (interfaceData.isPresent()) {
             final java.util.Optional<Interface1> augData = java.util.Optional.of(interfaceData.get())
-                    .map(iface -> iface.getAugmentation(Interface1.class));
+                    .map(iface -> iface.augmentation(Interface1.class));
 
             final boolean v4NotPresent =
                     augData.map(Interface1::getIpv4).map(Ipv4::getAddress).map(List::isEmpty).orElse(true);
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java
index 7eeca2435..ea0506ca7 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizer.java
@@ -132,7 +132,7 @@ public class RewriteCustomizer
     private PushTags buildTag(final short index, final Class<? extends Dot1qTagVlanType> tagType, final int vlanId) {
         final PushTagsBuilder tag = new PushTagsBuilder();
         tag.setIndex(index);
-        tag.setKey(new PushTagsKey(index));
+        tag.withKey(new PushTagsKey(index));
         final Dot1qTagBuilder dtag = new Dot1qTagBuilder();
         dtag.setTagType(tagType);
         dtag.setVlanId(new Dot1qVlanId(vlanId));
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java
index 50e866fa0..b6baf3407 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java
@@ -98,7 +98,7 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer
                                 final Dot1qTag.VlanId vlanId) {
         TagBuilder tag = new TagBuilder();
         tag.setIndex(index);
-        tag.setKey(new TagKey(index));
+        tag.withKey(new TagKey(index));
         final Dot1qTagBuilder dtag = new Dot1qTagBuilder();
         dtag.setTagType(tagType);
         dtag.setVlanId(vlanId);
@@ -157,7 +157,7 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer
         checkState(isSubInterface(iface), "Interface returned by the VPP is not a sub-interface");
 
         builder.setIdentifier((long) iface.subId);
-        builder.setKey(new SubInterfaceKey(builder.getIdentifier()));
+        builder.withKey(new SubInterfaceKey(builder.getIdentifier()));
 
         // sub-interface-base-attributes:
         builder.setTags(readTags(iface));
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java
index 0a6537bc0..de890e044 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/AbstractMirroredInterfacesCustomizer.java
@@ -88,7 +88,7 @@ abstract class AbstractMirroredInterfacesCustomizer
                                             ifcContext.getName(detail.swIfIndexFrom, ctx.getMappingContext());
                                     return new MirroredInterfaceBuilder()
                                             .setIfaceRef(interfaceName)
-                                            .setKey(new MirroredInterfaceKey(interfaceName))
+                                            .withKey(new MirroredInterfaceKey(interfaceName))
                                             .setState(SpanState.forValue(detail.state))
                                             .build();
                                 }
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java
index f70f4f5a1..5d84a8d7e 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/InterfaceMirroredInterfacesCustomizer.java
@@ -63,7 +63,7 @@ public class InterfaceMirroredInterfacesCustomizer extends AbstractMirroredInter
                         .stream()
                         .map(mirroredInterface -> new MirroredInterfaceBuilder()
                                 .setState(mirroredInterface.getState())
-                                .setKey(new MirroredInterfaceKey(mirroredInterface.getKey().getIfaceRef()))
+                                .withKey(new MirroredInterfaceKey(mirroredInterface.key().getIfaceRef()))
                                 .setIfaceRef(mirroredInterface.getIfaceRef())
                                 .build())
                         .collect(Collectors.toList()))
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java
index 3cbeceeb3..5b4315719 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/span/SubInterfaceMirroredInterfacesCustomizer.java
@@ -65,7 +65,7 @@ public class SubInterfaceMirroredInterfacesCustomizer extends AbstractMirroredIn
                         Optional.ofNullable(readValue.getMirroredInterface()).orElse(Collections.emptyList())
                                 .stream()
                                 .map(mirroredInterface -> new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev180703.span.attributes.mirrored.interfaces.MirroredInterfaceBuilder()
-                                        .setKey(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev180703.span.attributes.mirrored.interfaces.MirroredInterfaceKey(mirroredInterface.getKey().getIfaceRef()))
+                                        .withKey(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev180703.span.attributes.mirrored.interfaces.MirroredInterfaceKey(mirroredInterface.key().getIfaceRef()))
                                         .setIfaceRef(mirroredInterface.getIfaceRef())
                                         .setState(mirroredInterface.getState())
                                         .build())
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java
index 0ae2a86fe..1723190af 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/BridgeDomainCustomizer.java
@@ -127,7 +127,7 @@ public class BridgeDomainCustomizer extends FutureJVppCustomizer
             checkReferenceExist(id, Optional.ofNullable(after.get().getInterface())
                     .orElse(Collections.emptyList())
                     .stream()
-                    .map(iface -> Optional.ofNullable(iface.getAugmentation(VppInterfaceAugmentation.class))
+                    .map(iface -> Optional.ofNullable(iface.augmentation(VppInterfaceAugmentation.class))
                             .map(VppInterfaceAugmentation::getL2)
                             .map(L2ConfigAttributes::getInterconnection)
                             .orElse(null))
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java
index 772f6bf8e..ed286317b 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizer.java
@@ -97,7 +97,7 @@ public final class L2FibEntryCustomizer extends FutureJVppCustomizer
             }
             builder.setStaticConfig(byteToBoolean(entry.staticMac));
             builder.setPhysAddress(key.getPhysAddress());
-            builder.setKey(key);
+            builder.withKey(key);
         } catch (Exception e) {
             throw new ReadFailedException(id, e);
         }
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java
index c4d8eb607..7c7332d5d 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceCustomizerTest.java
@@ -87,7 +87,7 @@ public class SubInterfaceCustomizerTest extends WriterCustomizerTest {
                                    final Dot1qTag.VlanId vlanId) {
         TagBuilder tag = new TagBuilder();
         tag.setIndex(index);
-        tag.setKey(new TagKey(index));
+        tag.withKey(new TagKey(index));
         final Dot1qTagBuilder dtag = new Dot1qTagBuilder();
         dtag.setTagType(tagType);
         dtag.setVlanId(vlanId);
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/span/MirroredInterfacesCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/span/MirroredInterfacesCustomizerTest.java
index 37a0604a4..92fa5ae0f 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/span/MirroredInterfacesCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/span/MirroredInterfacesCustomizerTest.java
@@ -117,7 +117,7 @@ public class MirroredInterfacesCustomizerTest
     private MirroredInterface mirroredInterface(final String ifaceName, final SpanState state) {
         return new MirroredInterfaceBuilder()
                 .setIfaceRef(ifaceName)
-                .setKey(new MirroredInterfaceKey(ifaceName))
+                .withKey(new MirroredInterfaceKey(ifaceName))
                 .setState(state)
                 .build();
     }
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java
index b785142b0..94397a262 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java
@@ -112,7 +112,7 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest
 
     private ArpTerminationTableEntry generateArpEntry(final IpAddressNoZone ipAddress, final PhysAddress physAddress) {
         final ArpTerminationTableEntryBuilder entry = new ArpTerminationTableEntryBuilder();
-        entry.setKey(new ArpTerminationTableEntryKey(ipAddress, physAddress));
+        entry.withKey(new ArpTerminationTableEntryKey(ipAddress, physAddress));
         entry.setPhysAddress(physAddress);
         entry.setIpAddress(ipAddress);
         return entry.build();
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java
index d856a755d..4201303f4 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/L2FibEntryCustomizerTest.java
@@ -110,7 +110,7 @@ public class L2FibEntryCustomizerTest extends WriterCustomizerTest {
 
     private L2FibEntry generateL2FibFilterEntry(final PhysAddress address) {
         final L2FibEntryBuilder entry = new L2FibEntryBuilder();
-        entry.setKey(new L2FibEntryKey(address));
+        entry.withKey(new L2FibEntryKey(address));
         entry.setPhysAddress(address);
         entry.setStaticConfig(true);
         entry.setBridgedVirtualInterface(false);
@@ -120,7 +120,7 @@ public class L2FibEntryCustomizerTest extends WriterCustomizerTest {
 
     private L2FibEntry generateL2FibForwardEntry(final PhysAddress address) {
         final L2FibEntryBuilder entry = new L2FibEntryBuilder();
-        entry.setKey(new L2FibEntryKey(address));
+        entry.withKey(new L2FibEntryKey(address));
         entry.setPhysAddress(address);
         entry.setStaticConfig(true);
         entry.setBridgedVirtualInterface(false);
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizerTest.java
index b493933e3..5b7cf09f9 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2FibEntryCustomizerTest.java
@@ -100,7 +100,7 @@ public class L2FibEntryCustomizerTest extends ListReaderCustomizerTest<L2FibEntr
         verify(builder).setOutgoingInterface(IFACE_NAME);
         verify(builder).setStaticConfig(false);
         verify(builder).setPhysAddress(address);
-        verify(builder).setKey(new L2FibEntryKey(address));
+        verify(builder).withKey(new L2FibEntryKey(address));
     }
 
     private L2FibTableDetails generateL2FibEntry(final byte[] mac) {
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java
index 1f90280b2..d1fcb17a2 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2state/L2StateTest.java
@@ -202,7 +202,7 @@ public class L2StateTest implements FutureProducer, NamingContextHelper {
 
         assertTrue(read.isPresent());
         assertEquals(readRoot.getBridgeDomain().stream().filter(
-            input -> input.getKey().getName().equals(bdName)).findFirst().get(),
+            input -> input.key().getName().equals(bdName)).findFirst().get(),
             read.get());
     }