From 4bb2014226b8147e97f29eafdaeb7d5f7d009f11 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 8 Jun 2022 16:41:35 +0200 Subject: [PATCH] Use a simple immutable leaf node Remove a bit of redundancy and a reference to NormalizedNodeBuilder. Change-Id: I5a62f1283a449f62c586a403992e3615a64f19a8 Signed-off-by: Robert Varga --- .../rests/utils/ReadDataTransactionUtil.java | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java index 76f0d6f1a2..6923a457cc 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java @@ -51,7 +51,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.UserMapNode; import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.api.schema.builder.ListNodeBuilder; -import org.opendaylight.yangtools.yang.data.api.schema.builder.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.api.schema.builder.NormalizedNodeContainerBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; @@ -194,19 +193,14 @@ public final class ReadDataTransactionUtil { } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); final Object nodeVal = child.body(); - final NormalizedNodeBuilder> leafBuilder = - SchemaAwareBuilders.leafBuilder((LeafSchemaNode) childSchema); if (keys.contains(child.getIdentifier().getNodeType())) { - leafBuilder.withValue(((LeafNode) child).body()); - builder.withChild(leafBuilder.build()); + builder.withChild(ImmutableNodes.leafNode(childSchema.getQName(), child.body())); } else if (trim) { if (defaultVal == null || !defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).body()); - builder.withChild(leafBuilder.build()); + builder.withChild(ImmutableNodes.leafNode(childSchema.getQName(), child.body())); } } else if (defaultVal != null && defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).body()); - builder.withChild(leafBuilder.build()); + builder.withChild(ImmutableNodes.leafNode(childSchema.getQName(), child.body())); } } } @@ -246,16 +240,12 @@ public final class ReadDataTransactionUtil { } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); final Object nodeVal = child.body(); - final NormalizedNodeBuilder> leafBuilder = - SchemaAwareBuilders.leafBuilder((LeafSchemaNode) childSchema); if (trim) { if (defaultVal == null || !defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).body()); - builder.withChild(leafBuilder.build()); + builder.withChild(ImmutableNodes.leafNode(childSchema.getQName(), child.body())); } } else if (defaultVal != null && defaultVal.equals(nodeVal)) { - leafBuilder.withValue(((LeafNode) child).body()); - builder.withChild(leafBuilder.build()); + builder.withChild(ImmutableNodes.leafNode(childSchema.getQName(), child.body())); } } } -- 2.36.6