From 5d39f3539947e4a8906d54a1fceb18ff0af88ba6 Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Mon, 8 Aug 2016 14:26:57 +0200 Subject: [PATCH] Fix list modification with DataTree rooted at MapEntryNode Follow up to d8f0f2b146500275441ab8ba0cd2e1907f4b4ce4 We also need to handle the building of the list when rooted at a MapEntry and return the correct node. Change-Id: I60390e3fee4e34a44ee9f8836c8b9c147047691b Signed-off-by: Tomas Cere --- .../UnorderedMapModificationStrategy.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedMapModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedMapModificationStrategy.java index 4a8e7731fc..a9aee20a53 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedMapModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedMapModificationStrategy.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree; -import static com.google.common.base.Preconditions.checkArgument; - import com.google.common.base.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; @@ -30,14 +30,24 @@ final class UnorderedMapModificationStrategy extends AbstractNodeContainerModifi @SuppressWarnings("rawtypes") @Override protected NormalizedNodeContainerBuilder createBuilder(final NormalizedNode original) { - checkArgument(original instanceof MapNode); - return ImmutableMapNodeBuilder.create((MapNode) original); + // If the DataTree is rooted at a MapEntryNode the original value will be MapEntryNode + // so make sure we can handle this aswell + if (original instanceof MapNode) { + return ImmutableMapNodeBuilder.create((MapNode) original); + } else if (original instanceof MapEntryNode) { + return ImmutableMapEntryNodeBuilder.create((MapEntryNode) original); + } + throw new IllegalArgumentException("MapModification strategy can only handle MapNode or MapEntryNode's, offending node: " + original); } @Override protected NormalizedNode createEmptyValue(final NormalizedNode original) { - checkArgument(original instanceof MapNode); - return ImmutableMapNodeBuilder.create().withNodeIdentifier(((MapNode) original).getIdentifier()).build(); + if (original instanceof MapNode) { + return ImmutableMapNodeBuilder.create().withNodeIdentifier(((MapNode) original).getIdentifier()).build(); + } else if (original instanceof MapEntryNode) { + return ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(((MapEntryNode) original).getIdentifier()).build(); + } + throw new IllegalArgumentException("MapModification strategy can only handle MapNode or MapEntryNode's, offending node: " + original); } @Override -- 2.36.6