From d703a715c9efd0d01ba24d73111cbb87b6c04c0c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 17 Jan 2022 18:05:46 +0100 Subject: [PATCH 1/1] Disconnect YangParserConfiguration.Builder from concepts concepts.Builder is going away, disconnect it from yang-parser-api. JIRA: YANGTOOLS-1327 Change-Id: I96c7a07f4589927fd4cee799a4a1ec8791d97d62 Signed-off-by: Robert Varga --- .../yang/parser/api/YangParserConfiguration.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserConfiguration.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserConfiguration.java index 3171591201..3514e31293 100644 --- a/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserConfiguration.java +++ b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/YangParserConfiguration.java @@ -15,6 +15,7 @@ import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.concepts.Immutable; +import org.opendaylight.yangtools.concepts.Mutable; /** * A configuration of {@link YangParser} wiring for use with {@link YangParserFactory}. @@ -74,7 +75,7 @@ public final class YangParserConfiguration implements Immutable { return new Builder(); } - public static final class Builder implements org.opendaylight.yangtools.concepts.Builder { + public static final class Builder implements Mutable { private ImportResolutionMode importResolutionMode = ImportResolutionMode.DEFAULT; private boolean retainDeclarationReferences = false; @@ -82,19 +83,23 @@ public final class YangParserConfiguration implements Immutable { // Hidden on purpose } - @Override + /** + * Return a {@link YangParserConfiguration} initialized with contents of this builder. + * + * @return A YangParserConfiguration + */ public YangParserConfiguration build() { return new YangParserConfiguration(importResolutionMode, retainDeclarationReferences); } @Beta public Builder importResolutionMode(final ImportResolutionMode newImportResolutionMode) { - this.importResolutionMode = requireNonNull(newImportResolutionMode); + importResolutionMode = requireNonNull(newImportResolutionMode); return this; } public Builder retainDeclarationReferences(final boolean newRetainDeclarationReferences) { - this.retainDeclarationReferences = newRetainDeclarationReferences; + retainDeclarationReferences = newRetainDeclarationReferences; return this; } } -- 2.36.6