Deprecate ImmutableNodes.fromInstanceId() with deepestElement

[yangtools.git] / data / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / ImmutableNodes.java

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 24cf7aabc1bcccd484e144b0cf4c2af048ef8d35..6f9519efb64b80d92cab18d352a553ab66fe4d93 100644 (file)
--- 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<NormalizedNode> deepestElement) {
+        return fromInstanceIdImpl(ctx, id, deepestElement);
+    }
+
+    private static @NonNull NormalizedNode fromInstanceIdImpl(final SchemaContext ctx, final YangInstanceIdentifier id,
+            final Optional<NormalizedNode> deepestElement) {
         final PathArgument topLevelElement;
         final InstanceIdToNodes<?> instanceIdToNodes;
         final Iterator<PathArgument> it = id.getPathArguments().iterator();