From b16cea20258ba537db7c0755208c82ab93331ff7 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Mon, 8 Apr 2019 11:37:45 +0200
Subject: 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>
---
 .../src/main/java/io/fd/honeycomb/translate/util/RWUtils.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java')

diff --git a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java
index 71bcd9def..2bd2de1ec 100644
--- a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java
+++ b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java
@@ -101,7 +101,7 @@ public final class RWUtils {
     @Nonnull
     public static <D extends DataObject & Identifiable<K>, K extends Identifier<D>> InstanceIdentifier.IdentifiableItem<D, K> getCurrentIdItem(
         @Nonnull final InstanceIdentifier<D> id, final K key) {
-        return new InstanceIdentifier.IdentifiableItem<>(id.getTargetType(), key);
+        return InstanceIdentifier.IdentifiableItem.of(id.getTargetType(), key);
     }
 
     /**
@@ -160,7 +160,7 @@ public final class RWUtils {
      */
     @SuppressWarnings("unchecked")
     public static <D extends DataObject> InstanceIdentifier<D> makeIidLastWildcarded(final InstanceIdentifier<D> id) {
-        final InstanceIdentifier.Item<D> wildcardedItem = new InstanceIdentifier.Item<>(id.getTargetType());
+        final InstanceIdentifier.Item<D> wildcardedItem = InstanceIdentifier.Item.of(id.getTargetType());
         final Iterable<InstanceIdentifier.PathArgument> pathArguments = id.getPathArguments();
         return (InstanceIdentifier<D>) InstanceIdentifier.create(
                 Iterables.concat(
@@ -170,7 +170,7 @@ public final class RWUtils {
 
     private static InstanceIdentifier.PathArgument cleanPathArgumentFromKeys(final InstanceIdentifier.PathArgument pathArgument) {
         return pathArgument instanceof InstanceIdentifier.IdentifiableItem<?, ?>
-                ? new InstanceIdentifier.Item<>(pathArgument.getType())
+                ? InstanceIdentifier.Item.of(pathArgument.getType())
                 : pathArgument;
     }
 }
-- 
cgit 1.2.3-korg