From b5cfc4d246cba885c2d9450c03db520f2c172e63 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 17 Jan 2022 20:04:04 +0100
Subject: [PATCH] Disconnect CrossSourceStatementReactor.Builder

concepts.Builder is going away, do not use it in
CrossSourceStatementReactor.

JIRA: YANGTOOLS-1328
Change-Id: I45b719963df1909f61446f9b3eacd41970be30d9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../stmt/reactor/CrossSourceStatementReactor.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java
index 20716d9732..c1f969e6be 100644
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java
@@ -18,6 +18,7 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.concepts.Mutable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
@@ -54,7 +55,7 @@ public final class CrossSourceStatementReactor {
         return new BuildAction(supportedTerminology, supportedValidation);
     }
 
-    public static class Builder implements org.opendaylight.yangtools.concepts.Builder<CrossSourceStatementReactor> {
+    public static class Builder implements Mutable {
         private final Map<ValidationBundleType, Collection<?>> validationBundles =
                 new EnumMap<>(ValidationBundleType.class);
         private final Map<ModelProcessingPhase, StatementSupportBundle> bundles =
@@ -71,8 +72,12 @@ public final class CrossSourceStatementReactor {
             return this;
         }
 
-        @Override
-        public CrossSourceStatementReactor build() {
+        /**
+         * Return a {@link CrossSourceStatementReactor} configured with current state of this builder.
+         *
+         * @return A CrossSourceStatementReactor
+         */
+        public @NonNull CrossSourceStatementReactor build() {
             return new CrossSourceStatementReactor(bundles, validationBundles);
         }
     }
@@ -84,7 +89,7 @@ public final class CrossSourceStatementReactor {
 
         BuildAction(final ImmutableMap<ModelProcessingPhase, StatementSupportBundle> supportedTerminology,
                 final ImmutableMap<ValidationBundleType, Collection<?>> supportedValidation) {
-            this.context = new BuildGlobalContext(supportedTerminology, supportedValidation);
+            context = new BuildGlobalContext(supportedTerminology, supportedValidation);
         }
 
         /**
-- 
2.36.6