From 556a0f59abc9b09005d40945bc20948d69e4f98e Mon Sep 17 00:00:00 2001
From: Michal Cmarada <michal.cmarada@pantheon.tech>
Date: Tue, 25 Sep 2018 11:15:35 +0200
Subject: Bump ODL dependencies to Fluorine (HONEYCOMB-433)

Change-Id: I142ebd2899272feff00abe7d4bae708f093ee3ec
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
---
 .../translate/impl/write/GenericListWriter.java          |  2 +-
 .../translate/impl/write/registry/SubtreeWriter.java     | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write')

diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/GenericListWriter.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/GenericListWriter.java
index ff683b810..cc4800a65 100644
--- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/GenericListWriter.java
+++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/GenericListWriter.java
@@ -92,7 +92,7 @@ public final class GenericListWriter<D extends DataObject & Identifiable<K>, K e
         // Make sure the key is present
         if (isWildcarded(id)) {
             return RWUtils.replaceLastInId(id,
-                new InstanceIdentifier.IdentifiableItem<>(id.getTargetType(), current.getKey()));
+                new InstanceIdentifier.IdentifiableItem<>(id.getTargetType(), current.key()));
         } else {
             return id;
         }
diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java
index e510bc33c..bdda21611 100644
--- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java
+++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java
@@ -24,6 +24,7 @@ import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
 import io.fd.honeycomb.translate.write.Writer;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -99,7 +100,20 @@ final class SubtreeWriter<D extends DataObject> implements Writer<D> {
             }
             return false;
         }
-        return handledChildTypes.contains(instanceIdentifier);
+        return handledChildTypes.parallelStream()
+                .filter(childIiD -> instanceIdentifier.getTargetType().equals(childIiD.getTargetType()))
+                .anyMatch(instanceIdentifier1 -> isPathEqual(instanceIdentifier, instanceIdentifier1));
+    }
+
+    private boolean isPathEqual(@Nonnull final InstanceIdentifier<?> iid, final InstanceIdentifier<?> childIiD) {
+        // Verifying path because the same type can be used in several places.
+        Iterator<InstanceIdentifier.PathArgument> pathArguments = iid.getPathArguments().iterator();
+        for (final InstanceIdentifier.PathArgument pathArgument : childIiD.getPathArguments()) {
+            if (!pathArguments.hasNext() || !pathArgument.getType().equals(pathArguments.next().getType())) {
+                return false;
+            }
+        }
+        return true;
     }
 
     @Override
-- 
cgit 1.2.3-korg