X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=data%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2FImmutableNodes.java;fp=data%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2FImmutableNodes.java;h=6f9519efb64b80d92cab18d352a553ab66fe4d93;hb=faf7ce6d1e3acb2af2b846746e8495749301b484;hp=24cf7aabc1bcccd484e144b0cf4c2af048ef8d35;hpb=1fff58dc4bee0df39b9c600f2291f98b18d7dc55;p=yangtools.git diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java index 24cf7aabc1..6f9519efb6 100644 --- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java +++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java @@ -205,7 +205,7 @@ public final class ImmutableNodes { * @return serialized normalized node for provided instance Id */ public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id) { - return fromInstanceId(ctx, id, Optional.empty()); + return fromInstanceIdImpl(ctx, id, Optional.empty()); } /** @@ -216,10 +216,13 @@ public final class ImmutableNodes { * @param deepestElement pre-built deepest child that will be inserted at the last path argument of provided * instance identifier * @return serialized normalized node for provided instance Id with overridden last child. + * @deprecated This method is a historic hack, which has only a single downstream user. It is scheduled for removal + * without a replacement. */ + @Deprecated(since = "7.0.12", forRemoval = true) public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id, final NormalizedNode deepestElement) { - return fromInstanceId(ctx, id, Optional.of(deepestElement)); + return fromInstanceIdImpl(ctx, id, Optional.of(deepestElement)); } /** @@ -231,9 +234,17 @@ public final class ImmutableNodes { * instance identifier * @return serialized normalized node for provided instance Id with (optionally) overridden last child * and (optionally) marked with specific operation attribute. + * @deprecated This method is a historic hack, which has only a single downstream user. It is scheduled for removal + * without a replacement. */ + @Deprecated(since = "7.0.12", forRemoval = true) public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id, final Optional deepestElement) { + return fromInstanceIdImpl(ctx, id, deepestElement); + } + + private static @NonNull NormalizedNode fromInstanceIdImpl(final SchemaContext ctx, final YangInstanceIdentifier id, + final Optional deepestElement) { final PathArgument topLevelElement; final InstanceIdToNodes instanceIdToNodes; final Iterator it = id.getPathArguments().iterator();