From: Robert Varga <rovarga@cisco.com>
Date: Mon, 25 Aug 2014 20:13:20 +0000 (+0200)
Subject: Improve TypeProviderImpl.sortTypeDefinitionAccordingDepth()
X-Git-Tag: release/helium~102^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1d33a6993c68c43257f73d9b2c7874a9e7cd6ba6;hp=5f66ed5f0c66b00ffbe1136adb269b97fae8fda6;p=yangtools.git

Improve TypeProviderImpl.sortTypeDefinitionAccordingDepth()

Follow-up patch to . We do not actually need the key, so just use
values() instead of full entries.

Change-Id: Ibb5679bdf0caca140d73eb9ef065db6a58505532
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
index f1864ab1b7..d48046a48b 100644
--- a/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
+++ b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
@@ -1299,9 +1299,10 @@ public final class TypeProviderImpl implements TypeProvider {
             }
             typeDefinitionsConcreteDepth.add(unsortedTypeDefinition);
         }
-        // keys are in ascending order
-        for (Map.Entry<Integer, List<TypeDefinition<?>>> entry : typeDefinitionsDepths.entrySet()) {
-            sortedTypeDefinition.addAll(entry.getValue());
+
+        // SortedMap guarantees order corresponding to keys in ascending order
+        for (List<TypeDefinition<?>> v : typeDefinitionsDepths.values()) {
+            sortedTypeDefinition.addAll(v);
         }
 
         return sortedTypeDefinition;