From 78162149ce31641891c1afe0d86aa8447e021320 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 17 Jan 2022 17:23:04 +0100
Subject: [PATCH] Decouple YangInstanceIdentifierBuilder from Builder

concepts.Builder is going away, make sure we decouple it.

JIRA: YANGTOOLS-1327
Change-Id: I7a6e47df5f7a2900574aa8f4ff011429f21dd719
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../yangtools/yang/data/api/YangInstanceIdentifier.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
index 9572c88519..a2ff3b598b 100644
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
@@ -41,9 +41,9 @@ import java.util.Set;
 import java.util.function.Function;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.concepts.HierarchicalIdentifier;
 import org.opendaylight.yangtools.concepts.Immutable;
+import org.opendaylight.yangtools.concepts.Mutable;
 import org.opendaylight.yangtools.util.HashCodeBuilder;
 import org.opendaylight.yangtools.util.ImmutableOffsetMap;
 import org.opendaylight.yangtools.util.SingletonSet;
@@ -1049,7 +1049,7 @@ public abstract class YangInstanceIdentifier implements HierarchicalIdentifier<Y
     /**
      * Fluent Builder of Instance Identifier instances.
      */
-    public interface InstanceIdentifierBuilder extends Builder<YangInstanceIdentifier> {
+    public interface InstanceIdentifierBuilder extends Mutable {
         /**
          * Adds a {@link PathArgument} to path arguments of resulting instance identifier.
          *
@@ -1111,7 +1111,6 @@ public abstract class YangInstanceIdentifier implements HierarchicalIdentifier<Y
          *
          * @return {@link YangInstanceIdentifier}
          */
-        @Override
-        YangInstanceIdentifier build();
+        @NonNull YangInstanceIdentifier build();
     }
 }
-- 
2.36.6