From 7ce6b76f0d546db7d841479932eac3f48dafc017 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 6 Jan 2024 05:09:22 +0100 Subject: [PATCH] Fix BindingStructuralType.isNotAddressable() The check is missing the anydata case, fix that. Change-Id: I73053c24afb69f28b13f42b68fc3a41e2fb78172 Signed-off-by: Robert Varga --- .../mdsal/binding/dom/adapter/BindingStructuralType.java | 2 ++ .../mdsal/binding/dom/adapter/BindingStructuralTypeTest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java index 71aeb9b292..8927cb40e1 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java @@ -11,6 +11,7 @@ import com.google.common.annotations.Beta; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.schema.AnydataNode; import org.opendaylight.yangtools.yang.data.api.schema.AnyxmlNode; import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -128,6 +129,7 @@ public enum BindingStructuralType { private static boolean isNotAddressable(final NormalizedNode normalizedNode) { return normalizedNode instanceof LeafNode || normalizedNode instanceof AnyxmlNode + || normalizedNode instanceof AnydataNode || normalizedNode instanceof LeafSetNode || normalizedNode instanceof LeafSetEntryNode || normalizedNode instanceof UnkeyedListNode diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralTypeTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralTypeTest.java index 18273b5b01..a0638fdd23 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralTypeTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralTypeTest.java @@ -27,6 +27,6 @@ class BindingStructuralTypeTest { @Test void basicTest() { doReturn(normalizedNode).when(dataTreeCandidateNode).dataBefore(); - assertEquals(BindingStructuralType.UNKNOWN, BindingStructuralType.from(dataTreeCandidateNode)); + assertEquals(BindingStructuralType.NOT_ADDRESSABLE, BindingStructuralType.from(dataTreeCandidateNode)); } } \ No newline at end of file -- 2.36.6