From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 18 Jan 2022 08:08:45 +0000 (+0100)
Subject: Do not use concepts.Builder in parser-rfc7950
X-Git-Tag: v8.0.0~69
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=7148dc747eb580e2e4c6717f2217593e121c845e

Do not use concepts.Builder in parser-rfc7950

The Builder concept is going away, do not use it.

JIRA: YANGTOOLS-1328
Change-Id: If58b3912e5cc6696c306b3140e4ed213d80e2def
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
index d9ebbfe8b3..940cadf4ed 100644
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
@@ -17,7 +17,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.concepts.Mutable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
@@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNa
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 
 @Beta
-public class CustomCrossSourceStatementReactorBuilder implements Builder<CrossSourceStatementReactor> {
+public class CustomCrossSourceStatementReactorBuilder implements Mutable {
     private final ImmutableMap<ModelProcessingPhase, StatementSupportBundle.Builder> reactorSupportBundles;
     private final Map<ValidationBundleType, Collection<StatementDefinition>> reactorValidationBundles = new HashMap<>();
 
@@ -110,7 +110,11 @@ public class CustomCrossSourceStatementReactorBuilder implements Builder<CrossSo
         return this;
     }
 
-    @Override
+    /**
+     * Return a new {@link CrossSourceStatementReactor}.
+     *
+     * @return A CrossSourceStatementReactor
+     */
     public @NonNull CrossSourceStatementReactor build() {
         final StatementSupportBundle initBundle = reactorSupportBundles.get(ModelProcessingPhase.INIT).build();
         final StatementSupportBundle preLinkageBundle = reactorSupportBundles
@@ -132,8 +136,7 @@ public class CustomCrossSourceStatementReactorBuilder implements Builder<CrossSo
                 .setBundle(ModelProcessingPhase.FULL_DECLARATION, fullDeclBundle)
                 .setBundle(ModelProcessingPhase.EFFECTIVE_MODEL, effectiveBundle);
 
-        for (final Entry<ValidationBundleType, Collection<StatementDefinition>> entry : reactorValidationBundles
-                .entrySet()) {
+        for (Entry<ValidationBundleType, Collection<StatementDefinition>> entry : reactorValidationBundles.entrySet()) {
             reactorBuilder.setValidationBundle(entry.getKey(), entry.getValue());
         }