From ecd143269fd7ee4031a3191b0a80a19056f1d8dd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 24 Dec 2020 14:21:02 +0100 Subject: [PATCH] Migrate getDataChildByName() users This method has been deprecated, move to its nullable replacement. Change-Id: I0c4353701cf423b5c6ae0b52ca5dd96945ceecec Signed-off-by: Robert Varga --- .../binding/yang/unified/doc/generator/GeneratorImpl.xtend | 4 ++-- .../mdsal/binding/dom/codec/impl/DataObjectCodecContext.java | 4 ++-- .../mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java | 4 ++-- .../mdsal/binding/generator/impl/AbstractTypeGenerator.java | 2 +- .../mdsal/binding/yang/types/AbstractTypeProvider.java | 4 ++-- .../binding/runtime/api/AbstractBindingRuntimeContext.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend index 0b61ada290..ec0b087204 100644 --- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend +++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/GeneratorImpl.xtend @@ -350,7 +350,7 @@ class GeneratorImpl { for (QName pathElement : path.nodeIdentifiers) { val module = ctx.findModule(pathElement.module) if (module.isPresent) { - var foundNode = module.get.getDataChildByName(pathElement) + var foundNode = module.get.dataChildByName(pathElement) if (foundNode === null) { val child = nodes.last if (child instanceof DataNodeContainer) { @@ -1222,7 +1222,7 @@ class GeneratorImpl { for (name : path) { if (parent instanceof DataNodeContainer) { - var SchemaNode node = parent.getDataChildByName(name) + var SchemaNode node = parent.dataChildByName(name) if (node === null && (parent instanceof Module)) { val notifications = (parent as Module).notifications; for (notification : notifications) { diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java index 3c771227b4..d842fac5a0 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java @@ -277,7 +277,7 @@ public abstract class DataObjectCodecContext extends DataContainerCo CacheBuilder.newBuilder().build(new CacheLoader<>() { @Override public DataContainerCodecContext load(final QName qname) { - final DataSchemaNode childSchema = getSchema().getDataChildByName(qname); + final DataSchemaNode childSchema = getSchema().dataChildByName(qname); childNonNull(childSchema, qname, "Argument %s is not valid child of %s", qname, getSchema()); if (childSchema instanceof DataNodeContainer || childSchema instanceof ChoiceSchemaNode) { @SuppressWarnings("unchecked") @@ -188,7 +188,7 @@ final class SchemaRootCodecContext extends DataContainerCo DataContainerCodecContext createDataTreeChildContext(final Class key) { final QName qname = BindingReflections.findQName(key); - final DataSchemaNode childSchema = childNonNull(getSchema().getDataChildByName(qname), key, + final DataSchemaNode childSchema = childNonNull(getSchema().dataChildByName(qname), key, "%s is not top-level item.", key); return DataContainerCodecPrototype.from(key, childSchema, factory()).get(); } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java index d3f95ebd13..30989d2c2c 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java @@ -989,7 +989,7 @@ abstract class AbstractTypeGenerator { if (result instanceof DataNodeContainer) { final QName resultNode = node.bindTo(result.getQName().getModule()); - SchemaNode found = ((DataNodeContainer) result).getDataChildByName(resultNode); + SchemaNode found = ((DataNodeContainer) result).dataChildByName(resultNode); if (found == null) { if (result instanceof ActionNodeContainer) { found = ((ActionNodeContainer) result).findAction(resultNode).orElse(null); diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java index 8786f15e6d..3d092c7b6e 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java @@ -268,9 +268,9 @@ public abstract class AbstractTypeProvider implements TypeProvider { DataSchemaNode dataChildByName; for (QName next : parentNode.getPath().getPathFromRoot()) { if (current == null) { - dataChildByName = schemaContext.getDataChildByName(next); + dataChildByName = schemaContext.dataChildByName(next); } else { - dataChildByName = current.getDataChildByName(next); + dataChildByName = current.dataChildByName(next); } if (dataChildByName == null) { return false; diff --git a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java index 603624cd8f..8aee2609a4 100644 --- a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java +++ b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java @@ -120,7 +120,7 @@ public abstract class AbstractBindingRuntimeContext implements BindingRuntimeCon final Set childNames = new HashSet<>(); final Set realChilds = new HashSet<>(); for (final DataSchemaNode child : origSchema.getChildNodes()) { - final DataSchemaNode dataChildQNname = target.getDataChildByName(child.getQName()); + final DataSchemaNode dataChildQNname = target.dataChildByName(child.getQName()); final String childLocalName = child.getQName().getLocalName(); if (dataChildQNname == null) { for (DataSchemaNode dataSchemaNode : target.getChildNodes()) { -- 2.36.6