From b62499730040256c5be1539f409f4a98b557099e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 28 Mar 2019 11:16:27 +0100 Subject: [PATCH] Remove NormalizedNodePruner.findSchemaNodeForNodePath() DataSchemaContextTree.findChild() provides equivalent functionality, so use that instead of brewing our own. JIRA: CONTROLLER-1887 Change-Id: Ia55ac99ce8fa37daf06ce0e7e1615f1bd0a07123 Signed-off-by: Robert Varga --- .../utils/transformer/NormalizedNodePruner.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePruner.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePruner.java index cacef95d03..64dbc18415 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePruner.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePruner.java @@ -49,7 +49,7 @@ public class NormalizedNodePruner implements NormalizedNodeStreamWriter { private boolean sealed = false; public NormalizedNodePruner(final YangInstanceIdentifier nodePath, final SchemaContext schemaContext) { - nodePathSchemaNode = findSchemaNodeForNodePath(nodePath, schemaContext); + nodePathSchemaNode = DataSchemaContextTree.from(schemaContext).findChild(nodePath).orElse(null); } @SuppressWarnings("unchecked") @@ -255,17 +255,4 @@ public class NormalizedNodePruner implements NormalizedNodeStreamWriter { stack.push(wrapper); return wrapper; } - - private static DataSchemaContextNode findSchemaNodeForNodePath(final YangInstanceIdentifier nodePath, - final SchemaContext schemaContext) { - DataSchemaContextNode schemaNode = DataSchemaContextTree.from(schemaContext).getRoot(); - for (PathArgument arg : nodePath.getPathArguments()) { - schemaNode = schemaNode.getChild(arg); - if (schemaNode == null) { - break; - } - } - - return schemaNode; - } } -- 2.36.6