Make DataNodeContainer.dataChildByName() non-default

[yangtools.git] / yang / yang-data-util / src / main / java / org / opendaylight / yangtools / yang / data / util / ContainerSchemaNodes.java

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java
index 8010b84fbb395a1b1b16c00a40a0d99012e54099..914333a1fb3259034f18d2cc715c8b602444602e 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java
@@ -155,14 +155,14 @@ public final class ContainerSchemaNodes {
         }
 
         @Override
-        public Optional<DataSchemaNode> findDataChildByName(final QName name) {
+        public DataSchemaNode dataChildByName(final QName name) {
             switch (name.getLocalName()) {
                 case "input":
-                    return Optional.of(rpcDefinition.getInput());
+                    return rpcDefinition.getInput();
                 case "output":
-                    return Optional.of(rpcDefinition.getOutput());
+                    return rpcDefinition.getOutput();
                 default:
-                    return Optional.empty();
+                    return null;
             }
         }
 
@@ -220,8 +220,8 @@ public final class ContainerSchemaNodes {
         }
 
         @Override
-        public Optional<DataSchemaNode> findDataChildByName(final QName name) {
-            return Optional.ofNullable(mapNodes.get(requireNonNull(name)));
+        public DataSchemaNode dataChildByName(final QName name) {
+            return mapNodes.get(requireNonNull(name));
         }
 
         @Override