Make DataNodeContainer.dataChildByName() non-default

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / DataNodeContainer.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java
index eb1a8e7719700298b24d96e1bb0e38ba879cf9e6..d0abdd4fcc53227e5badb06807a9998358024d84 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java
@@ -63,9 +63,7 @@ public interface DataNodeContainer {
      * @return child node of this DataNodeContainer if child with given name is present, null otherwise
      * @throws NullPointerException if {@code name} is null
      */
-    default @Nullable DataSchemaNode dataChildByName(final QName name) {
-        return findDataChildByName(name).orElse(null);
-    }
+    @Nullable DataSchemaNode dataChildByName(QName name);
 
     /**
      * Returns the child node corresponding to the specified name.
@@ -97,7 +95,9 @@ public interface DataNodeContainer {
      * @return child node of this DataNodeContainer if child with given name is present, empty otherwise
      * @throws NullPointerException if {@code name} is null
      */
-    Optional<DataSchemaNode> findDataChildByName(QName name);
+    default Optional<DataSchemaNode> findDataChildByName(final QName name) {
+        return Optional.ofNullable(dataChildByName(name));
+    }
 
     /**
      * Returns the child node corresponding to the specified name.