Migrate getDataChildByName() users

This method has been deprecated, move to its nullable replacement.

Change-Id: I0c4353701cf423b5c6ae0b52ca5dd96945ceecec
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 0b61ada290c9ab29de20a87cd124be61952f2251..ec0b087204421e1875be7db0ac0159eec48eff2a 100644 (file)
--- 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 3c771227b45f19b159c31a91eb7a480deec7063a..d842fac5a0bd3417a1693d6123c1e9a399fd3ccc 100644 (file)
--- 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<D extends DataObject, T extends Dat
         // was defined.
         DataSchemaNode sameName;
         try {
-            sameName = getSchema().getDataChildByName(origDef.getQName());
+            sameName = getSchema().dataChildByName(origDef.getQName());
         } catch (final IllegalArgumentException e) {
             LOG.trace("Failed to find schema for {}", origDef, e);
             sameName = null;
@@ -296,7 +296,7 @@ public abstract class DataObjectCodecContext<D extends DataObject, T extends Dat
         } else {
             // We are looking for instantiation via uses in other module
             final QName instantiedName = origDef.getQName().bindTo(namespace());
-            final DataSchemaNode potential = getSchema().getDataChildByName(instantiedName);
+            final DataSchemaNode potential = getSchema().dataChildByName(instantiedName);
             // We check if it is really instantiated from same definition as class was derived
             if (potential != null && origDef.equals(SchemaNodeUtils.getRootOriginalIfPossible(potential))) {
                 childSchema = potential;

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java
index 35b537b7d91d32a4900982de85e731d8c4d329ee..3f680bdeebd867df43165bd299d4fc99b5cccaa1 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java
@@ -88,7 +88,7 @@ final class SchemaRootCodecContext<D extends DataObject> 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<D extends DataObject> 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 d3f95ebd1308281325b3fa5c81ee318e9cc41c3e..30989d2c2ce9c9c903191107deb7bb890c0c5c8a 100644 (file)
--- 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 8786f15e6dbf8d25aa7c47e8f662cee235e2cb53..3d092c7b6e07860226f47f64c8114b6f00c8ac04 100644 (file)
--- 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 603624cd8f69e3358b66dec2c662bcacf6569bcf..8aee2609a4f600c530d2debfaa6eb6e37fa56f3e 100644 (file)
--- 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<QName> childNames = new HashSet<>();
         final Set<DataSchemaNode> 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()) {