Use Optional.isEmpty()

[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 2658835321d1205ad9c3aa9ef0660325e098ec26..845a3188dd03ee7f1cacbe39f7eaec6b49a71902 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
@@ -94,7 +94,7 @@ public interface DataNodeContainer {
      * @return child node of this DataNodeContainer if child with given name is present, empty otherwise
      * @throws NullPointerException if any argument is null
      */
-    default Optional<DataSchemaNode> findDataChildByName(QName first, QName... others) {
+    default Optional<DataSchemaNode> findDataChildByName(final QName first, final QName... others) {
         Optional<DataSchemaNode> optCurrent = findDataChildByName(first);
         for (QName qname : others) {
             if (optCurrent.isPresent()) {
@@ -181,7 +181,7 @@ public interface DataNodeContainer {
         DataNodeContainer parent = this;
         do {
             final Optional<DataSchemaNode> optChild = parent.findDataTreeChild(requireNonNull(it.next()));
-            if (!optChild.isPresent() || !it.hasNext()) {
+            if (optChild.isEmpty() || !it.hasNext()) {
                 return optChild;
             }