Bump MRI upstreams

[netconf.git] / restconf / restconf-common / src / main / java / org / opendaylight / restconf / common / util / OperationsRestconfModule.java

diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsRestconfModule.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsRestconfModule.java
index e4f07543857114a7080ecffd0a8f1b2c81852f89..e9e2ad960d4ccecfd652e29d47de872924fce5cf 100644 (file)
--- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsRestconfModule.java
+++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsRestconfModule.java
@@ -9,21 +9,19 @@ package org.opendaylight.restconf.common.util;
 
 import static java.util.Objects.requireNonNull;
 
-import java.net.URI;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 
 final class OperationsRestconfModule extends AbstractOperationsModule {
     // There is no need to intern this nor add a revision, as we are providing the corresponding context anyway
     static final @NonNull QNameModule NAMESPACE =
-            QNameModule.create(URI.create("urn:ietf:params:xml:ns:yang:ietf-restconf"));
+            QNameModule.create(XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-restconf"));
 
     private final OperationsContainerSchemaNode operations;
 
@@ -48,12 +46,12 @@ final class OperationsRestconfModule extends AbstractOperationsModule {
 
     @Override
     public Collection<DataSchemaNode> getChildNodes() {
-        return Collections.singleton(operations);
+        return List.of(operations);
     }
 
     @Override
-    public Optional<DataSchemaNode> findDataChildByName(final QName name) {
-        return operations.getQName().equals(requireNonNull(name)) ? Optional.of(operations) : Optional.empty();
+    public DataSchemaNode dataChildByName(final QName name) {
+        return operations.getQName().equals(requireNonNull(name)) ? operations : null;
     }
 
     @Override