Rename ListItemNormalization 89/85589/1
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 5 Nov 2019 12:06:28 +0000 (13:06 +0100)
committerRobert Varga <nite@hq.sk>
Tue, 5 Nov 2019 13:09:43 +0000 (13:09 +0000)
This is a confusing name, as it should match the NormalizedNode-speak,
i.e. MapEntry* and UnkeyedListEntry*. This fixes up the names, so it is
clear what node a particular class refers to.

JIRA: YANGTOOLS-1037
Change-Id: I82d57efa13b5571a4d8ca92d81b3c0955811aa7a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit ff6881c0f70e27c4f9a717a3d923afa07a5fe580)

yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java

index f95ff07081349b9d42e43d713d334157f4e19aea..d3b66eba0d5d3f2d4468e1f8ec21f34361f4f4bd 100644 (file)
@@ -131,9 +131,9 @@ abstract class InstanceIdToCompositeNodes<T extends PathArgument> extends Instan
         }
     }
 
-    static final class ListItemNormalization extends DataContainerNormalizationOperation<NodeIdentifierWithPredicates> {
-        ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) {
-            super(identifier, schema);
+    static final class MapEntryNormalization extends DataContainerNormalizationOperation<NodeIdentifierWithPredicates> {
+        MapEntryNormalization(final ListSchemaNode schema) {
+            super(NodeIdentifierWithPredicates.of(schema.getQName()), schema);
         }
 
         @Override
@@ -243,11 +243,11 @@ abstract class InstanceIdToCompositeNodes<T extends PathArgument> extends Instan
     }
 
     static class UnorderedMapMixinNormalization extends InstanceIdToCompositeNodes<NodeIdentifier> {
-        private final ListItemNormalization innerNode;
+        private final MapEntryNormalization innerNode;
 
         UnorderedMapMixinNormalization(final ListSchemaNode list) {
             super(NodeIdentifier.create(list.getQName()));
-            this.innerNode = new ListItemNormalization(NodeIdentifierWithPredicates.of(list.getQName()), list);
+            this.innerNode = new MapEntryNormalization(list);
         }
 
         @Override