From 2cb795636626c1a4be6079bac9c48d2dc9b7d106 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 17 Jan 2022 17:28:15 +0100
Subject: [PATCH] Disconnect NormalizedNodeBuilder from Builder

concepts.Builder is going away, disconnect it from
NormalizedNodeBuilder.

Change-Id: I2e4f07a81695f23bc9833708af5905efc8acb5aa
JIRA: YANGTOOLS-1327
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../api/schema/builder/NormalizedNodeBuilder.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/builder/NormalizedNodeBuilder.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/builder/NormalizedNodeBuilder.java
index b85c3553fe..d6ed91cea2 100644
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/builder/NormalizedNodeBuilder.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/builder/NormalizedNodeBuilder.java
@@ -9,17 +9,22 @@ package org.opendaylight.yangtools.yang.data.api.schema.builder;
 
 import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.concepts.Mutable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 @Beta
-public interface NormalizedNodeBuilder<I extends PathArgument, V, R extends NormalizedNode> extends Builder<R> {
+public interface NormalizedNodeBuilder<I extends PathArgument, V, R extends NormalizedNode> extends Mutable {
 
     @NonNull NormalizedNodeBuilder<I, V, R> withValue(V value);
 
     @NonNull NormalizedNodeBuilder<I, V, R> withNodeIdentifier(I nodeIdentifier);
 
-    @Override
-    R build();
+    /**
+     * Return an implementation of the {@link R} NormalizedNode contract.
+     *
+     * @return A built NormalizedNode
+     * @throws IllegalStateException if this builder does not have sufficient state
+     */
+    @NonNull R build();
 }
-- 
2.36.6