HONEYCOMB-443: ODL bump to Neon

 - bumps ODL dependencies to neon
 - migrates guava optional to java.utils.optional

Change-Id: Ibdaa365c7e21a341103aba88dfd67277e40d2969
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/write/GenericListWriterTest.java b/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/write/GenericListWriterTest.java
index 36ab85eff..d579faad4 100644
--- a/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/write/GenericListWriterTest.java
+++ b/infra/translate-impl/src/test/java/io/fd/honeycomb/translate/impl/write/GenericListWriterTest.java
@@ -70,10 +70,10 @@ public class GenericListWriterTest {
 
         final InstanceIdentifier<IdentifiableDataObject> keyedIdBefore =
                 (InstanceIdentifier<IdentifiableDataObject>) InstanceIdentifier.create(Collections
-                        .singleton(new InstanceIdentifier.IdentifiableItem<>(IdentifiableDataObject.class, beforeKey)));
+                        .singleton(InstanceIdentifier.IdentifiableItem.of(IdentifiableDataObject.class, beforeKey)));
         final InstanceIdentifier<IdentifiableDataObject> keyedIdAfter =
                 (InstanceIdentifier<IdentifiableDataObject>) InstanceIdentifier.create(Collections
-                        .singleton(new InstanceIdentifier.IdentifiableItem<>(IdentifiableDataObject.class, keyAfter)));
+                        .singleton(InstanceIdentifier.IdentifiableItem.of(IdentifiableDataObject.class, keyAfter)));
 
         writer.processModification(DATA_OBJECT_ID, before, after, ctx);
         verify(customizer).updateCurrentAttributes(keyedIdBefore, before, after, ctx);
@@ -117,10 +117,10 @@ public class GenericListWriterTest {
 
         final InstanceIdentifier<IdentifiableDataObject> keyedIdBefore =
             (InstanceIdentifier<IdentifiableDataObject>) InstanceIdentifier.create(Collections
-                .singleton(new InstanceIdentifier.IdentifiableItem<>(IdentifiableDataObject.class, beforeKey)));
+                    .singleton(InstanceIdentifier.IdentifiableItem.of(IdentifiableDataObject.class, beforeKey)));
         final InstanceIdentifier<IdentifiableDataObject> keyedIdAfter =
             (InstanceIdentifier<IdentifiableDataObject>) InstanceIdentifier.create(Collections
-                .singleton(new InstanceIdentifier.IdentifiableItem<>(IdentifiableDataObject.class, keyAfter)));
+                    .singleton(InstanceIdentifier.IdentifiableItem.of(IdentifiableDataObject.class, keyAfter)));
 
         writer.validate(DATA_OBJECT_ID, before, after, ctx);
         verify(validator).validateUpdate(keyedIdBefore, before, after, ctx);