X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yanglib%2Fmdsal-yanglib-rfc8525%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fyanglib%2Frfc8525%2FMountPointContextFactoryImpl.java;h=5af1079128a291d443199d6f0ccb243be3c5054d;hb=0bffa493e7384ae4b67b06d55f60bd8c88ebd4b3;hp=168193a69014a1dec9898f2a4da2c1678ca18e95;hpb=d74f8d151bc07a71b6db7c27431a1a8f338cb3ad;p=mdsal.git diff --git a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/MountPointContextFactoryImpl.java b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/MountPointContextFactoryImpl.java index 168193a690..5af1079128 100644 --- a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/MountPointContextFactoryImpl.java +++ b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/MountPointContextFactoryImpl.java @@ -45,10 +45,11 @@ import org.opendaylight.yangtools.rfc8528.data.api.YangLibraryConstants.Containe import org.opendaylight.yangtools.rfc8528.data.util.AbstractMountPointContextFactory; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; +import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; +import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.parser.api.YangParserException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -178,8 +179,8 @@ final class MountPointContextFactoryImpl extends AbstractMountPointContextFactor @SuppressWarnings("deprecation") private static SourceReference sourceRefFor(final CommonLeafs obj, final Uri uri) { - final var sourceId = RevisionSourceIdentifier.create(obj.getName().getValue(), - LegacyRevisionUtils.toYangCommon(obj.getRevision())); + final var sourceId = new SourceIdentifier(Unqualified.of(obj.getName().getValue()), + LegacyRevisionUtils.toYangCommon(obj.getRevision()).orElse(null)); if (uri != null) { try { return SourceReference.of(sourceId, new URL(uri.getValue())); @@ -222,7 +223,7 @@ final class MountPointContextFactoryImpl extends AbstractMountPointContextFactor private static void fillSource(final List sources, final YangIdentifier sourceName, final Optional revision, final Set uris) { - final var sourceId = RevisionSourceIdentifier.create(sourceName.getValue(), revision); + final var sourceId = new SourceIdentifier(Unqualified.of(sourceName.getValue()), revision.orElse(null)); final SourceReference sourceRef; if (uris != null && uris.isEmpty()) { final var locations = new ArrayList();