Bump MRI upstreams

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / rests / services / impl / CreateStreamUtil.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java
index 590bb7bd72c1a97f708f6d55525fd8367d66764a..7922c2675e377d1a258abf9b49544eb9458f6d71 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java
@@ -28,7 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.sal.restconf.event.subscription.rev14070
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
@@ -155,13 +154,11 @@ final class CreateStreamUtil {
      *     are going to be generated.
      */
     private static YangInstanceIdentifier preparePath(final ContainerNode data, final QName qualifiedName) {
-        final Optional<DataContainerChild<? extends PathArgument, ?>> path = data.getChild(
-                new YangInstanceIdentifier.NodeIdentifier(QName.create(
-                        qualifiedName,
-                        RestconfStreamsConstants.STREAM_PATH_PARAM_NAME)));
+        final Optional<DataContainerChild> path = data.findChildByArg(
+                new NodeIdentifier(QName.create(qualifiedName, RestconfStreamsConstants.STREAM_PATH_PARAM_NAME)));
         Object pathValue = null;
         if (path.isPresent()) {
-            pathValue = path.get().getValue();
+            pathValue = path.get().body();
         }
         if (!(pathValue instanceof YangInstanceIdentifier)) {
             LOG.debug("Instance identifier {} was not normalized correctly", qualifiedName);
@@ -182,21 +179,21 @@ final class CreateStreamUtil {
      * @return Parsed enumeration.
      */
     private static <T> T parseEnum(final ContainerNode data, final Class<T> clazz, final String paramName) {
-        final Optional<DataContainerChild<? extends PathArgument, ?>> optAugNode = data.getChild(
+        final Optional<DataContainerChild> optAugNode = data.findChildByArg(
                 RestconfStreamsConstants.SAL_REMOTE_AUG_IDENTIFIER);
         if (optAugNode.isEmpty()) {
             return null;
         }
-        final DataContainerChild<? extends PathArgument, ?> augNode = optAugNode.get();
+        final DataContainerChild augNode = optAugNode.get();
         if (!(augNode instanceof AugmentationNode)) {
             return null;
         }
-        final Optional<DataContainerChild<? extends PathArgument, ?>> enumNode = ((AugmentationNode) augNode).getChild(
+        final Optional<DataContainerChild> enumNode = ((AugmentationNode) augNode).findChildByArg(
                 new NodeIdentifier(QName.create(RestconfStreamsConstants.SAL_REMOTE_AUGMENT, paramName)));
         if (enumNode.isEmpty()) {
             return null;
         }
-        final Object value = enumNode.get().getValue();
+        final Object value = enumNode.get().body();
         if (!(value instanceof String)) {
             return null;
         }